Browse Source

remove Uniforms.Utils.*

aardgoose 8 years ago
parent
commit
ef96ae05ba
2 changed files with 13 additions and 13 deletions
  1. 12 12
      examples/js/ShaderSkin.js
  2. 1 1
      examples/webgl_materials_bumpmap_skin.html

+ 12 - 12
examples/js/ShaderSkin.js

@@ -22,10 +22,7 @@ THREE.ShaderSkin = {
 
 	'skinSimple' : {
 
-		uniforms: THREE.UniformsUtils.merge( [
-
-			THREE.UniformsLib[ "fog" ],
-			THREE.UniformsLib[ "lights" ],
+		uniforms: Object.assign(
 
 			{
 
@@ -51,9 +48,12 @@ THREE.ShaderSkin = {
 
 				"uWrapRGB": { value: new THREE.Vector3( 0.75, 0.375, 0.1875 ) }
 
-			}
+			},
+
+			THREE.UniformsLib[ "fog" ],
+			THREE.UniformsLib[ "lights" ]
 
-		] ),
+		),
 
 		fragmentShader: [
 
@@ -305,10 +305,7 @@ THREE.ShaderSkin = {
 
 	'skin' : {
 
-		uniforms: THREE.UniformsUtils.merge( [
-
-			THREE.UniformsLib[ "fog" ],
-			THREE.UniformsLib[ "lights" ],
+		uniforms: Object.assign(
 
 			{
 
@@ -333,9 +330,12 @@ THREE.ShaderSkin = {
 				"uRoughness": 	  		{ value: 0.15 },
 				"uSpecularBrightness": 	{ value: 0.75 }
 
-			}
+			},
+
+			THREE.UniformsLib[ "fog" ],
+			THREE.UniformsLib[ "lights" ]
 
-		] ),
+		),
 
 		fragmentShader: [
 

+ 1 - 1
examples/webgl_materials_bumpmap_skin.html

@@ -211,7 +211,7 @@
 				var fragmentShader = shader.fragmentShader;
 				var vertexShader = shader.vertexShader;
 
-				var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
+				var uniforms = Object.assign( {}, shader.uniforms );
 
 				uniforms[ "enableBump" ].value = true;
 				uniforms[ "enableSpecular" ].value = true;