Skip to content

Commit 61fa656

Browse files
committed
ColladaLoader: Added support for emissive map.
1 parent 09c96d3 commit 61fa656

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

examples/js/loaders/ColladaLoader.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,12 +1529,11 @@ THREE.ColladaLoader.prototype = {
15291529
if ( parameter.texture ) material.specularMap = getTexture( parameter.texture );
15301530
break;
15311531
case 'shininess':
1532-
if ( parameter.float && material.shininess )
1533-
material.shininess = parameter.float;
1532+
if ( parameter.float && material.shininess ) material.shininess = parameter.float;
15341533
break;
15351534
case 'emission':
1536-
if ( parameter.color && material.emissive )
1537-
material.emissive.fromArray( parameter.color );
1535+
if ( parameter.color && material.emissive ) material.emissive.fromArray( parameter.color );
1536+
if ( parameter.texture ) material.emissiveMap = getTexture( parameter.texture );
15381537
break;
15391538

15401539
}

0 commit comments

Comments
 (0)