Merge remote-tracking branch 'evanw/master' into dev

This commit is contained in:
Mr.doob
2011-09-02 04:43:16 +02:00
+1 -1
View File
@@ -302,9 +302,9 @@ THREE.ShaderUtils = {
"void main() {",
"vec4 mPosition = objectMatrix * vec4( position, 1.0 );",
"vViewPosition = cameraPosition - mPosition.xyz;",
"vec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );",
"vViewPosition = -mvPosition.xyz;",
"vNormal = normalize( normalMatrix * normal );",
// tangent and binormal vectors