Browse Source

Merge pull request #13279 from mrdoob/webglrenderer-uniformsneedupdate

ShaderMaterial: Added uniformsNeedUpdate flag.
Mr.doob 7 years ago
parent
commit
8e9c5f8ea2
2 changed files with 7 additions and 0 deletions
  1. 1 0
      src/materials/ShaderMaterial.js
  2. 6 0
      src/renderers/WebGLRenderer.js

+ 1 - 0
src/materials/ShaderMaterial.js

@@ -63,6 +63,7 @@ function ShaderMaterial( parameters ) {
 	};
 
 	this.index0AttributeName = undefined;
+	this.uniformsNeedUpdate = false;
 
 	if ( parameters !== undefined ) {
 

+ 6 - 0
src/renderers/WebGLRenderer.js

@@ -1931,6 +1931,12 @@ function WebGLRenderer( parameters ) {
 
 		}
 
+		if ( material.isShaderMaterial && material.uniformsNeedUpdate === true ) {
+
+			WebGLUniforms.upload( _gl, materialProperties.uniformsList, m_uniforms, _this );
+			material.uniformsNeedUpdate = false;
+
+		}
 
 		// common matrices