Merge remote-tracking branch 'alteredq/dev' into dev

NINE78 · Sep 21, 2011 · 05b2879 · 05b2879
2 parents 7602900 + fd0fb85
commit 05b2879
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/build/Three.js b/build/Three.js
diff --git a/build/custom/ThreeWebGL.js b/build/custom/ThreeWebGL.js
diff --git a/examples/webgl_materials.html b/examples/webgl_materials.html
@@ -77,7 +77,7 @@
 				//materials.push( new THREE.MeshBasicMaterial( { color: 0xff0000, blending: THREE.SubtractiveBlending } ) );
 
 				materials.push( new THREE.MeshLambertMaterial( { color: 0xdddddd, shading: THREE.SmoothShading } ) );
-				materials.push( new THREE.MeshPhongMaterial( { ambient: 0x030303, color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading } ) );
+				materials.push( new THREE.MeshPhongMaterial( { ambient: 0x030303, color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading, map: THREE.ImageUtils.loadTexture( "textures/planets/earth_specular_2048.jpg" ) } ) );
 				materials.push( new THREE.MeshNormalMaterial( { shading: THREE.SmoothShading } ) );
 				materials.push( new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true } ) );
 

diff --git a/src/renderers/WebGLShaders.js b/src/renderers/WebGLShaders.js
@@ -391,21 +391,24 @@ THREE.ShaderChunk = {
 
 	"#endif",
 
-	"vec4 totalLight = vec4( ambient, opacity );",
+	"vec4 totalDiffuse = vec4( vec3( 0.0 ), opacity );",
+	"vec4 totalSpecular = vec4( ambient, opacity );",
 
 	"#if MAX_DIR_LIGHTS > 0",
 
-		"totalLight += dirDiffuse + dirSpecular;",
+		"totalDiffuse += dirDiffuse;",
+		"totalSpecular += dirSpecular;",
 
 	"#endif",
 
 	"#if MAX_POINT_LIGHTS > 0",
 
-		"totalLight += pointDiffuse + pointSpecular;",
+		"totalDiffuse += pointDiffuse;",
+		"totalSpecular += pointSpecular;",
 
 	"#endif",
 
-	"gl_FragColor = gl_FragColor * totalLight;"
+	"gl_FragColor = gl_FragColor * totalDiffuse + totalSpecular;"
 
 	].join("\n"),