Quellcode durchsuchen

Merge branch 'morph_depth' of https://github.com/zz85/three.js into dev

Mr.doob vor 11 Jahren
Ursprung
Commit
d25a1c8fd8
2 geänderte Dateien mit 7 neuen und 2 gelöschten Zeilen
  1. 1 0
      src/materials/MeshDepthMaterial.js
  2. 6 2
      src/renderers/shaders/ShaderLib.js

+ 1 - 0
src/materials/MeshDepthMaterial.js

@@ -20,6 +20,7 @@ THREE.MeshDepthMaterial = function ( parameters ) {
 
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
+	this.morphTargets = false; // need to create key in order for setValues() to work
 
 	this.setValues( parameters );
 

+ 6 - 2
src/renderers/shaders/ShaderLib.js

@@ -488,13 +488,16 @@ THREE.ShaderLib = {
 		},
 
 		vertexShader: [
+
+			THREE.ShaderChunk[ "morphtarget_pars_vertex" ],
 			THREE.ShaderChunk[ "logdepthbuf_pars_vertex" ],
 
 			"void main() {",
 
-			"	gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
-
+				THREE.ShaderChunk[ "morphtarget_vertex" ],
+				THREE.ShaderChunk[ "default_vertex" ],
 				THREE.ShaderChunk[ "logdepthbuf_vertex" ],
+
 			"}"
 
 		].join("\n"),
@@ -504,6 +507,7 @@ THREE.ShaderLib = {
 			"uniform float mNear;",
 			"uniform float mFar;",
 			"uniform float opacity;",
+			
 			THREE.ShaderChunk[ "logdepthbuf_pars_fragment" ],
 
 			"void main() {",