DRACOLoader: Update module cleanup/examples.

donmccurdy · Jan 16, 2018 · 537a602 · 537a602
1 parent 1941ca0
commit 537a602
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/examples/js/loaders/draco/DRACOLoader.js b/examples/js/loaders/draco/DRACOLoader.js
@@ -352,18 +352,26 @@ THREE.DRACOLoader.setDecoderPath = function ( path ) {
 THREE.DRACOLoader.setDecoderConfig = function ( config ) {
   var wasmBinary = THREE.DRACOLoader.decoderConfig.wasmBinary;
   THREE.DRACOLoader.decoderConfig = config || {};
-  THREE.DRACOLoader.decoderModulePromise = null;
+  THREE.DRACOLoader.releaseDecoderModule();
 
   // Reuse WASM binary.
   if ( wasmBinary ) THREE.DRACOLoader.decoderConfig.wasmBinary = wasmBinary;
 };
 
- /**
-  * Gets WebAssembly or asm.js singleton instance of DracoDecoderModule
-  * after testing for browser support. Returns Promise that resolves when
-  * module is available.
-  * @return {Promise<{decoder: DracoDecoderModule}>}
-  */
+/**
+ * Releases the singleton DracoDecoderModule instance. Module will be recreated
+ * with the next decoding call.
+ */
+THREE.DRACOLoader.releaseDecoderModule = function () {
+  THREE.DRACOLoader.decoderModulePromise = null;
+};
+
+/**
+ * Gets WebAssembly or asm.js singleton instance of DracoDecoderModule
+ * after testing for browser support. Returns Promise that resolves when
+ * module is available.
+ * @return {Promise<{decoder: DracoDecoderModule}>}
+ */
 THREE.DRACOLoader.getDecoderModule = function () {
   var scope = this;
   var path = THREE.DRACOLoader.decoderPath;

diff --git a/examples/webgl_loader_draco.html b/examples/webgl_loader_draco.html
@@ -90,6 +90,9 @@
 				mesh.receiveShadow = true;
 				scene.add( mesh );
 
+				// Release decoder resources.
+				THREE.DRACOLoader.releaseDecoderModule();
+
 			} );
 
 			// renderer

diff --git a/examples/webgl_loader_gltf_extensions.html b/examples/webgl_loader_gltf_extensions.html
@@ -207,9 +207,8 @@
 
 				loader = new THREE.GLTFLoader();
 
-				var dracoLoader = new THREE.DRACOLoader();
-				dracoLoader.setDecoderPath( 'js/loaders/draco/' );
-				loader.setDRACOLoader( dracoLoader );
+				THREE.DRACOLoader.setDecoderPath( 'js/loaders/draco/' );
+				loader.setDRACOLoader( new THREE.DRACOLoader() );
 
 				for (var i = 0; i < extensionSelect.children.length; i++) {
 					var child = extensionSelect.children[i];