Explorar o código

Removed redundant perPixel assignments.

Mr.doob %!s(int64=11) %!d(string=hai) anos
pai
achega
b267595d40
Modificáronse 2 ficheiros con 16 adicións e 17 borrados
  1. 16 16
      examples/js/UCSCharacter.js
  2. 0 1
      src/materials/MeshPhongMaterial.js

+ 16 - 16
examples/js/UCSCharacter.js

@@ -98,31 +98,31 @@ THREE.UCSCharacter = function() {
 		var materials = [];
 		
 		for ( var i = 0; i < skins.length; i ++ ) {
-			materials[i] = new THREE.MeshLambertMaterial( {"colorDiffuse"  : [0.5880, 0.5880, 0.5880],
-														  "colorAmbient"  : [0.5880, 0.5880, 0.5880],
-														  "colorSpecular"  : [0.5000, 0.5000, 0.5000],
-														  "color" : 0xeeeeee,
-														  "transparency"  : 1.0,
-														  "specularCoef"  : 10.0,
-														  "wireframe" : false,
-														  "vertexColors" : false,
-														  "map" : skins[i]} );
-			materials[i].skinning = true;
-			materials[i].morphTargets = true;
-
-			materials[i].wrapAround = true;
-			materials[i].perPixel = true;
+
+			materials[ i ] = new THREE.MeshLambertMaterial( {
+				color: 0xeeeeee,
+				specular: 10.0,
+				map: skins[ i ],
+				skinning: true,
+				morphTargets: true,
+				wrapAround: true
+			} );
+
 		}
 		
 		return materials;
 	}
 
 	this.checkLoadComplete = function () {
+
 		scope.loadCounter -= 1;
+
 		if ( scope.loadCounter === 0 ) {
+
 			scope.onLoadComplete();
+
 		}
-	}
 
-}
+	}
 
+}

+ 0 - 1
src/materials/MeshPhongMaterial.js

@@ -56,7 +56,6 @@ THREE.MeshPhongMaterial = function ( parameters ) {
 	this.shininess = 30;
 
 	this.metal = false;
-	this.perPixel = true;
 
 	this.wrapAround = false;
 	this.wrapRGB = new THREE.Vector3( 1, 1, 1 );