Przeglądaj źródła

GLTFLoader: Clean up Draco extension.

Don McCurdy 7 lat temu
rodzic
commit
5c33131745

+ 2 - 1
docs/examples/loaders/GLTFLoader.html

@@ -47,7 +47,8 @@
 			var loader = new THREE.GLTFLoader();
 
 			// Optional: Provide a DRACOLoader instance to decode compressed mesh data
-			loader.setDRACOLoader( new THREE.DRACOLoader( undefined, {type: 'js'} ) );
+			THREE.DRACOLoader.setDecoderPath( '/examples/js/loaders/draco' );
+			loader.setDRACOLoader( new THREE.DRACOLoader() );
 
 			// Load a glTF resource
 			loader.load(

+ 18 - 19
examples/js/loaders/GLTFLoader.js

@@ -391,30 +391,30 @@ THREE.GLTFLoader = ( function () {
 
 		this.name = EXTENSIONS.KHR_DRACO_MESH_COMPRESSION;
 		this.dracoLoader = dracoLoader;
-                this.glTFNameToThreeJSName = {
-                  'POSITION' : 'position',
-                  'NORMAL' : 'normal',
-                  'TEXCOORD_0' : 'uv',
-                  'TEXCOORD0' : 'uv',
-                  'TEXCOORD' : 'uv',
-                  'TEXCOORD_1' : 'uv2',
-                  'COLOR_0' : 'color',
-                  'COLOR0' : 'color',
-                  'COLOR' : 'color',
-                  'WEIGHTS_0' : 'skinWeight',
-                  'JOINTS_0' : 'skinIndex'
-                };
+		this.glTFNameToThreeJSName = {
+			'POSITION' : 'position',
+			'NORMAL' : 'normal',
+			'TEXCOORD_0' : 'uv',
+			'TEXCOORD0' : 'uv',
+			'TEXCOORD' : 'uv',
+			'TEXCOORD_1' : 'uv2',
+			'COLOR_0' : 'color',
+			'COLOR0' : 'color',
+			'COLOR' : 'color',
+			'WEIGHTS_0' : 'skinWeight',
+			'JOINTS_0' : 'skinIndex'
+		};
 	}
 
 	GLTFDracoMeshCompressionExtension.prototype.decodePrimitive = function ( primitive, parser ) {
 
 		var dracoLoader = this.dracoLoader;
 		var bufferViewIndex = primitive.extensions[ this.name ].bufferView;
-                var attributesIdMap = primitive.extensions[ this.name ].attributes;
-                var attributeMap = {};
-                for (var attributeName in attributesIdMap) {
-                  attributeMap[this.glTFNameToThreeJSName[attributeName]] = attributesIdMap[attributeName];
-                }
+		var attributesIdMap = primitive.extensions[ this.name ].attributes;
+		var attributeMap = {};
+		for (var attributeName in attributesIdMap) {
+			attributeMap[this.glTFNameToThreeJSName[attributeName]] = attributesIdMap[attributeName];
+		}
 
 		return parser.getDependency( 'bufferView', bufferViewIndex ).then( function ( bufferView ) {
 
@@ -1954,7 +1954,6 @@ THREE.GLTFLoader = ( function () {
 	};
 
 	/**
-	 * [getGeometryAttributes description]
 	 * @param  {THREE.BufferGeometry} geometry
 	 * @param  {GLTF.Primitive} primitiveDef
 	 * @param  {Array<THREE.BufferAttribute>} accessors