Browse Source

Merge pull request #13802 from Mugen87/dev3

ColladaLoader: Added support for emission maps.
Mr.doob 7 years ago
parent
commit
b055746b5f
1 changed files with 3 additions and 4 deletions
  1. 3 4
      examples/js/loaders/ColladaLoader.js

+ 3 - 4
examples/js/loaders/ColladaLoader.js

@@ -1529,12 +1529,11 @@ THREE.ColladaLoader.prototype = {
 						if ( parameter.texture ) material.specularMap = getTexture( parameter.texture );
 						break;
 					case 'shininess':
-						if ( parameter.float && material.shininess )
-							material.shininess = parameter.float;
+						if ( parameter.float && material.shininess ) material.shininess = parameter.float;
 						break;
 					case 'emission':
-						if ( parameter.color && material.emissive )
-							material.emissive.fromArray( parameter.color );
+						if ( parameter.color && material.emissive ) material.emissive.fromArray( parameter.color );
+						if ( parameter.texture ) material.emissiveMap = getTexture( parameter.texture );
 						break;
 
 				}