Ver Fonte

remove UniformsUtils.*

aardgoose há 8 anos atrás
pai
commit
dc14e3ec01
1 ficheiros alterados com 6 adições e 5 exclusões
  1. 6 5
      examples/js/WaterShader.js

+ 6 - 5
examples/js/WaterShader.js

@@ -9,8 +9,8 @@
 
 
 THREE.ShaderLib[ 'water' ] = {
 THREE.ShaderLib[ 'water' ] = {
 
 
-	uniforms: THREE.UniformsUtils.merge( [
-		THREE.UniformsLib[ "fog" ], {
+	uniforms: Object.assign(
+		 {
 			"normalSampler":    { value: null },
 			"normalSampler":    { value: null },
 			"mirrorSampler":    { value: null },
 			"mirrorSampler":    { value: null },
 			"alpha":            { value: 1.0 },
 			"alpha":            { value: 1.0 },
@@ -22,8 +22,9 @@ THREE.ShaderLib[ 'water' ] = {
 			"sunDirection":     { value: new THREE.Vector3( 0.70707, 0.70707, 0 ) },
 			"sunDirection":     { value: new THREE.Vector3( 0.70707, 0.70707, 0 ) },
 			"eye":              { value: new THREE.Vector3() },
 			"eye":              { value: new THREE.Vector3() },
 			"waterColor":       { value: new THREE.Color( 0x555555 ) }
 			"waterColor":       { value: new THREE.Color( 0x555555 ) }
-		}
-	] ),
+		},
+		THREE.UniformsLib[ "fog" ]
+	),
 
 
 	vertexShader: [
 	vertexShader: [
 		'uniform mat4 textureMatrix;',
 		'uniform mat4 textureMatrix;',
@@ -169,7 +170,7 @@ THREE.Water = function ( renderer, camera, scene, options ) {
 	this.renderTarget2 = new THREE.WebGLRenderTarget( width, height );
 	this.renderTarget2 = new THREE.WebGLRenderTarget( width, height );
 
 
 	var mirrorShader = THREE.ShaderLib[ "water" ];
 	var mirrorShader = THREE.ShaderLib[ "water" ];
-	var mirrorUniforms = THREE.UniformsUtils.clone( mirrorShader.uniforms );
+	var mirrorUniforms = Object.assign( {}, mirrorShader.uniforms );
 
 
 	this.material = new THREE.ShaderMaterial( {
 	this.material = new THREE.ShaderMaterial( {
 		fragmentShader: mirrorShader.fragmentShader,
 		fragmentShader: mirrorShader.fragmentShader,