From b267595d402ae01658d20e31feb53eb236a13552 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 29 Jan 2014 18:11:43 +0100 Subject: [PATCH] Removed redundant perPixel assignments. --- examples/js/UCSCharacter.js | 32 +++++++++++++++--------------- src/materials/MeshPhongMaterial.js | 1 - 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/examples/js/UCSCharacter.js b/examples/js/UCSCharacter.js index 9cde4b7cfc..aa8ac84c45 100644 --- a/examples/js/UCSCharacter.js +++ b/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(); + } - } -} + } +} \ No newline at end of file diff --git a/src/materials/MeshPhongMaterial.js b/src/materials/MeshPhongMaterial.js index e240405bfc..05cdeb5289 100644 --- a/src/materials/MeshPhongMaterial.js +++ b/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 ); -- GitLab