|
@@ -6,13 +6,13 @@ THREE.UniformsUtils = {
|
|
|
|
|
|
merge: function ( uniforms ) {
|
|
|
|
|
|
- var u, p, tmp, merged = {};
|
|
|
+ var merged = {};
|
|
|
|
|
|
- for ( u = 0; u < uniforms.length; u ++ ) {
|
|
|
+ for ( var u = 0; u < uniforms.length; u ++ ) {
|
|
|
|
|
|
- tmp = this.clone( uniforms[ u ] );
|
|
|
+ var tmp = this.clone( uniforms[ u ] );
|
|
|
|
|
|
- for ( p in tmp ) {
|
|
|
+ for ( var p in tmp ) {
|
|
|
|
|
|
merged[ p ] = tmp[ p ];
|
|
|
|
|
@@ -26,15 +26,15 @@ THREE.UniformsUtils = {
|
|
|
|
|
|
clone: function ( uniforms_src ) {
|
|
|
|
|
|
- var u, p, parameter, parameter_src, uniforms_dst = {};
|
|
|
+ var uniforms_dst = {};
|
|
|
|
|
|
- for ( u in uniforms_src ) {
|
|
|
+ for ( var u in uniforms_src ) {
|
|
|
|
|
|
uniforms_dst[ u ] = {};
|
|
|
|
|
|
- for ( p in uniforms_src[ u ] ) {
|
|
|
+ for ( var p in uniforms_src[ u ] ) {
|
|
|
|
|
|
- parameter_src = uniforms_src[ u ][ p ];
|
|
|
+ var parameter_src = uniforms_src[ u ][ p ];
|
|
|
|
|
|
if ( parameter_src instanceof THREE.Color ||
|
|
|
parameter_src instanceof THREE.Vector2 ||
|