cleanup of PR.

mrdoob · Mar 31, 2022 · fd04378 · fd04378
1 parent 63a0540
commit fd04378
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/examples/jsm/shaders/VelocityShader.js b/examples/jsm/shaders/VelocityShader.js
@@ -42,6 +42,8 @@ const VelocityShader = {
 uniform mat4 previousProjectionViewMatrix;
 uniform mat4 currentProjectionViewMatrix;
 
+uniform mat4 modelMatrixPrev;
+
 varying vec4 clipPositionCurrent;
 varying vec4 clipPositionPrevious;
 

diff --git a/examples/webgl_materials_channels.html b/examples/webgl_materials_channels.html
@@ -335,7 +335,7 @@
 
 				scene.traverse( function( object ) {
 				    if ( object.isMesh ) {
-				        if ( object.matrixWorldPrevious === undefined ) object.matrixWorldPrevious = new Matrix4();
+				        if ( object.matrixWorldPrevious === undefined ) object.matrixWorldPrevious = new THREE.Matrix4();
 				        object.matrixWorldPrevious.copy( object.matrixWorld );
 				    }
 				} );

diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -1751,7 +1751,6 @@ function WebGLRenderer( parameters = {} ) {
 		p_uniforms.setValue( _gl, 'normalMatrix', object.normalMatrix );
 		p_uniforms.setValue( _gl, 'modelMatrix', object.matrixWorld );
 
-
 		return program;
 
 	}

diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js
@@ -5,7 +5,6 @@ import { Vector3 } from '../../math/Vector3.js';
 import { UniformsLib } from './UniformsLib.js';
 import { Color } from '../../math/Color.js';
 import { Matrix3 } from '../../math/Matrix3.js';
-import { Matrix4 } from '../../math/Matrix4.js';
 
 const ShaderLib = {
 

diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js
@@ -517,7 +517,6 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
 			( parameters.logarithmicDepthBuffer && parameters.rendererExtensionFragDepth ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
 
 			'uniform mat4 modelMatrix;',
-			'uniform mat4 modelMatrixPrev;',
 			'uniform mat4 modelViewMatrix;',
 			'uniform mat4 projectionMatrix;',
 			'uniform mat4 viewMatrix;',