Răsfoiți Sursa

remove UniformsUtils.* use in terrain/dynamic

aardgoose 8 ani în urmă
părinte
comite
6c2627ad2f
3 a modificat fișierele cu 20 adăugiri și 7 ștergeri
  1. 6 5
      examples/js/ShaderTerrain.js
  2. 2 2
      examples/webgl_terrain_dynamic.html
  3. 12 0
      gulpfile.js

+ 6 - 5
examples/js/ShaderTerrain.js

@@ -15,10 +15,8 @@ THREE.ShaderTerrain = {
 
 	'terrain' : {
 
-		uniforms: THREE.UniformsUtils.merge( [
+		uniforms: Object.assign(
 
-			THREE.UniformsLib[ "fog" ],
-			THREE.UniformsLib[ "lights" ],
 
 			{
 
@@ -49,9 +47,12 @@ THREE.ShaderTerrain = {
 
 				"uOffset": { value: new THREE.Vector2( 0, 0 ) }
 
-			}
+			},
+
+			THREE.UniformsLib[ "fog" ],
+			THREE.UniformsLib[ "lights" ]
 
-		] ),
+		),
 
 		fragmentShader: [
 

+ 2 - 2
examples/webgl_terrain_dynamic.html

@@ -304,7 +304,7 @@
 
 				};
 
-				uniformsNormal = THREE.UniformsUtils.clone( normalShader.uniforms );
+				uniformsNormal = Object.assign( {}, normalShader.uniforms );
 
 				uniformsNormal.height.value = 0.05;
 				uniformsNormal.resolution.value.set( rx, ry );
@@ -335,7 +335,7 @@
 
 				var terrainShader = THREE.ShaderTerrain[ "terrain" ];
 
-				uniformsTerrain = THREE.UniformsUtils.clone( terrainShader.uniforms );
+				uniformsTerrain = Object.assign( {}, terrainShader.uniforms );
 
 				uniformsTerrain[ 'tNormal' ].value = normalMap.texture;
 				uniformsTerrain[ 'uNormalScale' ].value = 3.5;

+ 12 - 0
gulpfile.js

@@ -0,0 +1,12 @@
+var gulp    = require( 'gulp' );
+var pump    = require( 'pump' );
+var connect = require( 'gulp-connect' );
+
+
+gulp.task('runserver', function() {
+ 
+	connect.server( { root: '.', port: 8888 } );
+
+});
+
+ gulp.task( 'default', [ 'runserver' ] );