Browse Source

Merge pull request #11339 from davidlyons/fbx-materials

FBX Loader bump and normal, use array for multi material
Mr.doob 8 years ago
parent
commit
564ac3022c
1 changed files with 11 additions and 3 deletions
  1. 11 3
      examples/js/loaders/FBXLoader.js

+ 11 - 3
examples/js/loaders/FBXLoader.js

@@ -510,11 +510,19 @@
 					parameters.map = textureMap.get( relationship.ID );
 					break;
 
-				case " \"AmbientColor":
+				case "Bump":
 				case " \"Bump":
+					parameters.bumpMap = textureMap.get( relationship.ID );
+					break;
+
+				case "NormalMap":
+				case " \"NormalMap":
+					parameters.normalMap = textureMap.get( relationship.ID );
+					break;
+
+				case " \"AmbientColor":
 				case " \"EmissiveColor":
 				case "AmbientColor":
-				case "Bump":
 				case "EmissiveColor":
 				default:
 					console.warn( 'Unknown texture application of type ' + type + ', skipping texture' );
@@ -1362,7 +1370,7 @@
 						}
 						if ( materials.length > 1 ) {
 
-							material = new THREE.MultiMaterial( materials );
+							material = materials;
 
 						} else if ( materials.length > 0 ) {