home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-28 06:15:57 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken uniforms cloning. Fixed broken uqbiquity test.

Browse Source 
TODO: start using uniforms cloning also for MeshShaderMaterials.
This commit is contained in:
alteredq
2010-12-28 14:33:52 +01:00
parent 513563117b
commit ecdbb2ef91
5 changed files with 616 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderers/WebGLRenderer.js
+4 -5
View File
@@ -380,22 +380,21 @@ THREE.WebGLRenderer = function ( parameters ) {
uniforms_dst[ u ] = {};
for ( p in uniforms[ u ] ) {
for ( p in uniforms_src[ u ] ) {
parameter_src = uniforms_src[ u ][ p ];
parameter_dst = uniforms_dst[ u ][ p ];
if ( parameter_src instanceof THREE.Color ||
parameter_src instanceof THREE.Vector3 ||
parameter_src instanceof THREE.Texture ) {
parameter_dst = parameter_src.clone();
uniforms_dst[ u ][ p ] = parameter_src.clone();
} else {
parameter_dst = parameter_src;
uniforms_dst[ u ][ p ] = parameter_src;
}
}
}