瀏覽代碼

GLTFLoader: Clean up.

Mr.doob 9 年之前
父節點
當前提交
14c4ccac19
共有 1 個文件被更改,包括 10 次插入6 次删除
  1. 10 6
      examples/js/loaders/GLTFLoader.js

+ 10 - 6
examples/js/loaders/GLTFLoader.js

@@ -193,18 +193,22 @@ THREE.GLTFLoader.prototype = {
 
 
 			var values = material.values;
 			var values = material.values;
 
 
-			if ( Array.isArray( values.diffuse ) ) _material.color.fromArray( values.diffuse );
-			if ( Array.isArray( values.emission ) ) _material.emissive.fromArray( values.emission );
-			if ( Array.isArray( values.specular ) ) _material.specular.fromArray( values.specular );
+			if ( Array.isArray( values.diffuse ) ) {
 
 
-			if ( values.shininess !== undefined ) _material.shininess = values.shininess;
+					_material.color.fromArray( values.diffuse );
 
 
-			if ( typeof( material.values.diffuse ) === 'string' ) {
+			} else if ( typeof( values.diffuse ) === 'string' ) {
 
 
-				_material.map = library.textures[ material.values.diffuse ];
+					_material.map = library.textures[ values.diffuse ];
 
 
 			}
 			}
 
 
+			if ( Array.isArray( values.emission ) ) _material.emissive.fromArray( values.emission );
+			if ( Array.isArray( values.specular ) ) _material.specular.fromArray( values.specular );
+
+			if ( values.shininess !== undefined ) _material.shininess = values.shininess;
+
+
 			library.materials[ materialId ] = _material;
 			library.materials[ materialId ] = _material;
 
 
 		}
 		}