소스 검색

Merge pull request #17365 from donmccurdy/bug-dracoloader-static-usage

DRACOLoader: Fix remaining calls to removed static methods.
Mr.doob 6 년 전
부모
커밋
70479488ba
3개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 3 2
      editor/js/Loader.js
  2. 2 2
      examples/js/libs/draco/README.md
  3. 3 2
      examples/webgl_materials_cars.html

+ 3 - 2
editor/js/Loader.js

@@ -182,10 +182,11 @@ var Loader = function ( editor ) {
 
 
 					var contents = event.target.result;
 					var contents = event.target.result;
 
 
-					THREE.DRACOLoader.setDecoderPath( '../examples/js/libs/draco/gltf/' );
+					var dracoLoader = new THREE.DRACOLoader();
+					dracoLoader.setDecoderPath( '../examples/js/libs/draco/gltf/' );
 
 
 					var loader = new THREE.GLTFLoader();
 					var loader = new THREE.GLTFLoader();
-					loader.setDRACOLoader( new THREE.DRACOLoader() );
+					loader.setDRACOLoader( dracoLoader );
 					loader.parse( contents, '', function ( result ) {
 					loader.parse( contents, '', function ( result ) {
 
 
 						var scene = result.scene;
 						var scene = result.scene;

+ 2 - 2
examples/js/libs/draco/README.md

@@ -20,9 +20,9 @@ Each file is provided in two variations:
 Either variation may be used with `THREE.DRACOLoader`:
 Either variation may be used with `THREE.DRACOLoader`:
 
 
 ```js
 ```js
-THREE.DRACOLoader.setDecoderPath('path/to/decoders/');
-THREE.DRACOLoader.setDecoderConfig({type: 'js'}); // (Optional) Override detection of WASM support.
 var dracoLoader = new THREE.DRACOLoader();
 var dracoLoader = new THREE.DRACOLoader();
+dracoLoader.setDecoderPath('path/to/decoders/');
+dracoLoader.setDecoderConfig({type: 'js'}); // (Optional) Override detection of WASM support.
 ```
 ```
 
 
 Further [documentation on GitHub](https://github.com/google/draco/tree/master/javascript/example#static-loading-javascript-decoder).
 Further [documentation on GitHub](https://github.com/google/draco/tree/master/javascript/example#static-loading-javascript-decoder).

+ 3 - 2
examples/webgl_materials_cars.html

@@ -140,10 +140,11 @@
 
 
 			function initCar() {
 			function initCar() {
 
 
-				DRACOLoader.setDecoderPath( 'js/libs/draco/gltf/' );
+				var dracoLoader = new DRACOLoader();
+				dracoLoader.setDecoderPath( 'js/libs/draco/gltf/' );
 
 
 				var loader = new GLTFLoader();
 				var loader = new GLTFLoader();
-				loader.setDRACOLoader( new DRACOLoader() );
+				loader.setDRACOLoader( dracoLoader );
 
 
 				loader.load( 'models/gltf/ferrari.glb', function ( gltf ) {
 				loader.load( 'models/gltf/ferrari.glb', function ( gltf ) {