diff --git a/examples/webgl_interactive_instances_gpu.html b/examples/webgl_interactive_instances_gpu.html index 60bef9fb53838bd84f4cda309115502eeab5870f..53740555cc090167fff675eb4d6b60436b7a765c 100644 --- a/examples/webgl_interactive_instances_gpu.html +++ b/examples/webgl_interactive_instances_gpu.html @@ -602,7 +602,7 @@ var vert = document.getElementById( 'vertMaterial' ).textContent; var frag = document.getElementById( 'fragMaterial' ).textContent; - function updateColor( object, camera ) { + function updateColor( object, material, camera ) { this.value.setHex( object.userData.color ); diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index fe27455601aa8b6b77397495d1e3e24086826e60..f558bd0d7ec65b301339ee43f1bd84131772cff4 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -1971,9 +1971,7 @@ function WebGLRenderer( parameters ) { if ( dynUniforms !== null ) { - WebGLUniforms.evalDynamic( - dynUniforms, m_uniforms, object, camera ); - + WebGLUniforms.evalDynamic( dynUniforms, m_uniforms, object, material, camera ); WebGLUniforms.upload( _gl, dynUniforms, m_uniforms, _this ); } diff --git a/src/renderers/webgl/WebGLUniforms.js b/src/renderers/webgl/WebGLUniforms.js index fb936091074c58d842a9997e5ce780a579fb2855..62a3aacacc785e791610d75f8202d2f1bfafc47e 100644 --- a/src/renderers/webgl/WebGLUniforms.js +++ b/src/renderers/webgl/WebGLUniforms.js @@ -575,14 +575,14 @@ WebGLUniforms.splitDynamic = function( seq, values ) { }; -WebGLUniforms.evalDynamic = function( seq, values, object, camera ) { +WebGLUniforms.evalDynamic = function( seq, values, object, material, camera ) { for ( var i = 0, n = seq.length; i !== n; ++ i ) { var v = values[ seq[ i ].id ], f = v.onUpdateCallback; - if ( f !== undefined ) f.call( v, object, camera ); + if ( f !== undefined ) f.call( v, object, material camera ); }