Преглед на файлове

Remove duplicated code in ShaderLib

Joshua Koo преди 11 години
родител
ревизия
158676fe09
променени са 1 файла, в които са добавени 1 реда и са изтрити 64 реда
  1. 1 64
      src/renderers/shaders/ShaderChunk.js

+ 1 - 64
src/renderers/shaders/ShaderChunk.js

@@ -1773,67 +1773,4 @@
 	].join("\n")
 
 
-};
-
-THREE.UniformsUtils = {
-
-	merge: function ( uniforms ) {
-
-		var u, p, tmp, merged = {};
-
-		for ( u = 0; u < uniforms.length; u ++ ) {
-
-			tmp = this.clone( uniforms[ u ] );
-
-			for ( p in tmp ) {
-
-				merged[ p ] = tmp[ p ];
-
-			}
-
-		}
-
-		return merged;
-
-	},
-
-	clone: function ( uniforms_src ) {
-
-		var u, p, parameter, parameter_src, uniforms_dst = {};
-
-		for ( u in uniforms_src ) {
-
-			uniforms_dst[ u ] = {};
-
-			for ( p in uniforms_src[ u ] ) {
-
-				parameter_src = uniforms_src[ u ][ p ];
-
-				if ( parameter_src instanceof THREE.Color ||
-					 parameter_src instanceof THREE.Vector2 ||
-					 parameter_src instanceof THREE.Vector3 ||
-					 parameter_src instanceof THREE.Vector4 ||
-					 parameter_src instanceof THREE.Matrix4 ||
-					 parameter_src instanceof THREE.Texture ) {
-
-					uniforms_dst[ u ][ p ] = parameter_src.clone();
-
-				} else if ( parameter_src instanceof Array ) {
-
-					uniforms_dst[ u ][ p ] = parameter_src.slice();
-
-				} else {
-
-					uniforms_dst[ u ][ p ] = parameter_src;
-
-				}
-
-			}
-
-		}
-
-		return uniforms_dst;
-
-	}
-
-};
+};