Browse Source

Merge remote-tracking branch 'alteredq/dev' into dev

Mr.doob 13 years ago
parent
commit
fe7f25a415
2 changed files with 7 additions and 1 deletions
  1. 1 1
      examples/webgl_terrain_dynamic.html
  2. 6 0
      src/core/Math.js

+ 1 - 1
examples/webgl_terrain_dynamic.html

@@ -419,7 +419,7 @@
 
 
 				quadTarget = new THREE.Mesh( plane, new THREE.MeshBasicMaterial( { color: 0xff0000 } ) );
 				quadTarget = new THREE.Mesh( plane, new THREE.MeshBasicMaterial( { color: 0xff0000 } ) );
 				quadTarget.position.z = -500;
 				quadTarget.position.z = -500;
-				sceneRenderTarget.__addObject( quadTarget );
+				sceneRenderTarget.add( quadTarget );
 
 
 				// TERRAIN MESH
 				// TERRAIN MESH
 
 

+ 6 - 0
src/core/Math.js

@@ -59,6 +59,12 @@ THREE.Math = {
 
 
 		return range * ( 0.5 - Math.random() );
 		return range * ( 0.5 - Math.random() );
 
 
+	},
+
+	sign: function ( x ) {
+
+		return ( x < 0 ) ? -1 : ( ( x > 0 ) ? 1 : 0 );
+
 	}
 	}
 
 
 };
 };