Browse Source

Updated builds.

Mr.doob 12 years ago
parent
commit
afcfa527a0
2 changed files with 14 additions and 8 deletions
  1. 9 3
      build/three.js
  2. 5 5
      build/three.min.js

+ 9 - 3
build/three.js

@@ -11968,6 +11968,8 @@ THREE.MeshDepthMaterial = function ( parameters ) {
 	this.wireframe = false;
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
 	this.wireframeLinewidth = 1;
 
 
+	this.morphTargets = false;
+
 	this.setValues( parameters );
 	this.setValues( parameters );
 
 
 };
 };
@@ -12011,6 +12013,8 @@ THREE.MeshNormalMaterial = function ( parameters ) {
 	this.wireframe = false;
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
 	this.wireframeLinewidth = 1;
 
 
+	this.morphTargets = false;
+
 	this.setValues( parameters );
 	this.setValues( parameters );
 
 
 };
 };
@@ -17170,12 +17174,14 @@ THREE.ShaderLib = {
 
 
 			"varying vec3 vNormal;",
 			"varying vec3 vNormal;",
 
 
+			THREE.ShaderChunk[ "morphtarget_pars_vertex" ],
+
 			"void main() {",
 			"void main() {",
 
 
-				"vec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );",
 				"vNormal = normalize( normalMatrix * normal );",
 				"vNormal = normalize( normalMatrix * normal );",
 
 
-				"gl_Position = projectionMatrix * mvPosition;",
+				THREE.ShaderChunk[ "morphtarget_vertex" ],
+				THREE.ShaderChunk[ "default_vertex" ],
 
 
 			"}"
 			"}"
 
 
@@ -24369,8 +24375,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 		].join("\n");
 		].join("\n");
 
 
-		var glFragmentShader = getShader( "fragment", prefix_fragment + fragmentShader );
 		var glVertexShader = getShader( "vertex", prefix_vertex + vertexShader );
 		var glVertexShader = getShader( "vertex", prefix_vertex + vertexShader );
+		var glFragmentShader = getShader( "fragment", prefix_fragment + fragmentShader );
 
 
 		_gl.attachShader( program, glVertexShader );
 		_gl.attachShader( program, glVertexShader );
 		_gl.attachShader( program, glFragmentShader );
 		_gl.attachShader( program, glFragmentShader );

File diff suppressed because it is too large
+ 5 - 5
build/three.min.js


Some files were not shown because too many files changed in this diff