提交 ecdbb2ef 编写于 作者: A alteredq

Fixed broken uniforms cloning. Fixed broken uqbiquity test.

TODO: start using uniforms cloning also for MeshShaderMaterials.
上级 51356311
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -61,6 +61,8 @@
<script type="text/javascript" src="../src/materials/mappings/SphericalRefractionMapping.js"></script>
<script type="text/javascript" src="../src/materials/mappings/UVMapping.js"></script>
<script type="text/javascript" src="../src/scenes/Scene.js"></script>
<script type="text/javascript" src="../src/scenes/Fog.js"></script>
<script type="text/javascript" src="../src/scenes/FogExp2.js"></script>
<script type="text/javascript" src="../src/renderers/Projector.js"></script>
<script type="text/javascript" src="../src/renderers/DOMRenderer.js"></script>
<script type="text/javascript" src="../src/renderers/CanvasRenderer.js"></script>
......
......@@ -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;
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册