瀏覽代碼

ColladaLoader: Clean up diffuse parsing.

Mr.doob 9 年之前
父節點
當前提交
f077b1cb79
共有 1 個文件被更改,包括 7 次插入2 次删除
  1. 7 2
      examples/js/loaders/ColladaLoader.js

+ 7 - 2
examples/js/loaders/ColladaLoader.js

@@ -3775,6 +3775,13 @@ THREE.ColladaLoader = function () {
 		props[ 'shading' ] = preferredShading;
 		props[ 'side' ] = this.effect.doubleSided ? THREE.DoubleSide : THREE.FrontSide;
 
+		if ( props.diffuse !== undefined ) {
+
+			props.color = props.diffuse;
+			delete props.diffuse;
+
+		}
+
 		switch ( this.type ) {
 
 			case 'constant':
@@ -3786,14 +3793,12 @@ THREE.ColladaLoader = function () {
 			case 'phong':
 			case 'blinn':
 
-				if (props.diffuse != undefined) props.color = props.diffuse;
 				this.material = new THREE.MeshPhongMaterial( props );
 				break;
 
 			case 'lambert':
 			default:
 
-				if (props.diffuse != undefined) props.color = props.diffuse;
 				this.material = new THREE.MeshLambertMaterial( props );
 				break;