浏览代码

only 6 unit tests failing, all related to box.isIntersection.

Ben Houston 12 年之前
父节点
当前提交
0b4bdc7c19
共有 7 个文件被更改,包括 226 次插入241 次删除
  1. 1 1
      src/core/Box2.js
  2. 9 3
      src/core/Box3.js
  3. 91 124
      test/core/Box2.js
  4. 96 91
      test/core/Box3.js
  5. 12 5
      test/core/Constants.js
  6. 7 7
      test/core/Plane.js
  7. 10 10
      test/core/Sphere.js

+ 1 - 1
src/core/Box2.js

@@ -252,7 +252,7 @@ THREE.Box2.prototype = {
 
 	scale: function ( factor ) {
 
-		var sizeDeltaHalf = this.size().multiplyScalar( ( 1 - factor )  * 0.5 );
+		var sizeDeltaHalf = this.size().multiplyScalar( ( factor - 1 )  * 0.5 );
 		this.expandByVector( sizeDeltaHalf );
 
 		return this;

+ 9 - 3
src/core/Box3.js

@@ -11,13 +11,19 @@ THREE.Box3 = function ( min, max ) {
 		this.makeEmpty();
 
 	} else {
+
 		this.min = min.clone();
+
 		if( max === undefined ) {
+
 			this.max = new THREE.Vector3().copy( this.min ); // This is done on purpose so you can make a box using a single point and then expand it.
-		}
-		else {
+
+		} else {
+
 			this.max = max.clone();
+
 		}
+
 	}
 
 };
@@ -271,7 +277,7 @@ THREE.Box3.prototype = {
 
 	scale: function ( factor ) {
 
-		var sizeDeltaHalf = this.size().multiplyScalar( ( 1 - factor )  * 0.5 );
+		var sizeDeltaHalf = this.size().multiplyScalar( ( factor - 1 )  * 0.5 );
 		this.expandByVector( sizeDeltaHalf );
 
 		return this;

+ 91 - 124
test/core/Box2.js

@@ -4,51 +4,40 @@
 
 module( "Box2" );
 
-test( "verifyConstants=beginning", function() {
-	ok( negInf.equals( new THREE.Vector3( -Infinity, -Infinity ) ), "Passed!" );
-	ok( posInf.equals( new THREE.Vector3( Infinity, Infinity ) ), "Passed!" );
-	ok( zero.equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
-	ok( one.equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
-	ok( two.equals( new THREE.Vector3( 2, 2, 2 ) ), "Passed!" );
-});
-
 test( "constructor", function() {
 	var a = new THREE.Box2();
-	ok( a.min.equals( posInf ), "Passed!" );
-	ok( a.max.equals( negInf ), "Passed!" );
+	ok( a.min.equals( posInf2 ), "Passed!" );
+	ok( a.max.equals( negInf2 ), "Passed!" );
 
-	a = new THREE.Box2( zero );
-	ok( a.min.equals( zero ), "Passed!" );
-	ok( a.max.equals( zero ), "Passed!" );
+	a = new THREE.Box2( zero2 );
+	ok( a.min.equals( zero2 ), "Passed!" );
+	ok( a.max.equals( zero2 ), "Passed!" );
 
-	a = new THREE.Box2( zero, one );
-	ok( a.min.equals( zero ), "Passed!" );
-	console.log( "constructor");
-	console.log( a );
-	console.log( one );
-	ok( a.max.equals( one ), "Passed!" );
+	a = new THREE.Box2( zero2, one2 );
+	ok( a.min.equals( zero2 ), "Passed!" );
+	ok( a.max.equals( one2 ), "Passed!" );
 });
 
 
 test( "copy", function() {
-	var a = new THREE.Box2( zero, one );
+	var a = new THREE.Box2( zero2, one2 );
 	var b = new THREE.Box2().copy( a );
-	ok( b.min.equals( zero ), "Passed!" );
-	ok( b.max.equals( one ), "Passed!" );
+	ok( b.min.equals( zero2 ), "Passed!" );
+	ok( b.max.equals( one2 ), "Passed!" );
 
 	// ensure that it is a true copy
-	a.min = zero;
-	a.max = one;
-	ok( b.min.equals( zero ), "Passed!" );
-	ok( b.max.equals( one ), "Passed!" );
+	a.min = zero2;
+	a.max = one2;
+	ok( b.min.equals( zero2 ), "Passed!" );
+	ok( b.max.equals( one2 ), "Passed!" );
 });
 
 test( "set", function() {
 	var a = new THREE.Box2();
 
-	a.set( zero, one )
-	ok( a.min.equals( zero ), "Passed!" );
-	ok( a.max.equals( one ), "Passed!" );
+	a.set( zero2, one2 )
+	ok( a.min.equals( zero2 ), "Passed!" );
+	ok( a.max.equals( one2 ), "Passed!" );
 });
 
 test( "empty/makeEmpty", function() {
@@ -56,7 +45,7 @@ test( "empty/makeEmpty", function() {
 
 	ok( a.empty(), "Passed!" );
 
-	var a = new THREE.Box2( zero, one );
+	var a = new THREE.Box2( zero2, one2 );
 	ok( ! a.empty(), "Passed!" );
 
 	a.makeEmpty();
@@ -64,99 +53,84 @@ test( "empty/makeEmpty", function() {
 });
 
 test( "volume", function() {
-	var a = new THREE.Box2( zero, one );
+	var a = new THREE.Box2( zero2, one2 );
 	ok( a.volume() == 1, "Passed!" );
 
-	a = new THREE.Box2( one.clone().negate(), zero );
+	a = new THREE.Box2( one2.clone().negate(), zero2 );
 	ok( a.volume() == 1, "Passed!" );
 });
 
 test( "center", function() {
-	var a = new THREE.Box2( zero );
+	var a = new THREE.Box2( zero2 );
 
-	ok( a.center().equals( zero ), "Passed!" );
+	ok( a.center().equals( zero2 ), "Passed!" );
 
-	a = new THREE.Box2( zero, one );
-	var midpoint = one.clone().multiplyScalar( 0.5 );
+	a = new THREE.Box2( zero2, one2 );
+	var midpoint = one2.clone().multiplyScalar( 0.5 );
 	ok( a.center().equals( midpoint ), "Passed!" );
 });
 
-test( "verifyConstants1", function() {
-	ok( negInf.equals( new THREE.Vector3( -Infinity, -Infinity ) ), "Passed!" );
-	ok( posInf.equals( new THREE.Vector3( Infinity, Infinity ) ), "Passed!" );
-	ok( zero.equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
-	ok( one.equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
-	ok( two.equals( new THREE.Vector3( 2, 2, 2 ) ), "Passed!" );
-});
-
 test( "size", function() {
-	var a = new THREE.Box2( zero );
+	var a = new THREE.Box2( zero2 );
 
-	ok( a.size().equals( zero ), "Passed!" );
+	ok( a.size().equals( zero2 ), "Passed!" );
 
-	a = new THREE.Box2( zero, one );
-	ok( a.size().equals( one ), "Passed!" );
+	a = new THREE.Box2( zero2, one2 );
+	ok( a.size().equals( one2 ), "Passed!" );
 });
 
 test( "expandByPoint", function() {
-	var a = new THREE.Box2( zero );
+	var a = new THREE.Box2( zero2 );
 
-	a.expandByPoint( zero );
-	ok( a.size().equals( zero ), "Passed!" );
+	a.expandByPoint( zero2 );
+	ok( a.size().equals( zero2 ), "Passed!" );
 
-	a.expandByPoint( one );
-	ok( a.size().equals( one ), "Passed!" );
+	a.expandByPoint( one2 );
+	ok( a.size().equals( one2 ), "Passed!" );
 
-	a.expandByPoint( one.clone().negate() );
-	ok( a.size().equals( one.clone().multiplyScalar( 2 ) ), "Passed!" );
-	console.log( "expandByPoint" );
-	console.log( a );
-	console.log( a.center() );
-	console.log( zero  );
-	ok( a.center().equals( zero ), "Passed!" );
+	a.expandByPoint( one2.clone().negate() );
+	ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
+	ok( a.center().equals( zero2 ), "Passed!" );
 });
 
 test( "expandByVector", function() {
-	var a = new THREE.Box2( zero );
-	console.log( a );
+	var a = new THREE.Box2( zero2 );
 
-	a.expandByVector( zero );
-	console.log( a );
-	ok( a.size().equals( zero ), "Passed!" );
+	a.expandByVector( zero2 );
+	ok( a.size().equals( zero2 ), "Passed!" );
 
-	a.expandByVector( one );
-	console.log( a );
-	ok( a.size().equals( one.clone().multiplyScalar( 2 ) ), "Passed!" );
-	ok( a.center().equals( zero ), "Passed!" );
+	a.expandByVector( one2 );
+	ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
+	ok( a.center().equals( zero2 ), "Passed!" );
 });
 
 test( "expandByScalar", function() {
-	var a = new THREE.Box2( zero );
+	var a = new THREE.Box2( zero2 );
 
 	a.expandByScalar( 0 );
-	ok( a.size().equals( zero ), "Passed!" );
+	ok( a.size().equals( zero2 ), "Passed!" );
 
 	a.expandByScalar( 1 );
-	ok( a.size().equals( one.clone().multiplyScalar( 2 ) ), "Passed!" );
-	ok( a.center().equals( zero ), "Passed!" );
+	ok( a.size().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
+	ok( a.center().equals( zero2 ), "Passed!" );
 });
 
 test( "containsPoint", function() {
-	var a = new THREE.Box2( zero );
+	var a = new THREE.Box2( zero2 );
 
-	ok( a.containsPoint( zero ), "Passed!" );
-	ok( ! a.containsPoint( one ), "Passed!" );
+	ok( a.containsPoint( zero2 ), "Passed!" );
+	ok( ! a.containsPoint( one2 ), "Passed!" );
 
 	a.expandByScalar( 1 );
-	ok( a.containsPoint( zero ), "Passed!" );
-	ok( a.containsPoint( one ), "Passed!" );
-	ok( a.containsPoint( one.clone().negate() ), "Passed!" );
+	ok( a.containsPoint( zero2 ), "Passed!" );
+	ok( a.containsPoint( one2 ), "Passed!" );
+	ok( a.containsPoint( one2.clone().negate() ), "Passed!" );
 });
 
 test( "containsBox", function() {
-	var a = new THREE.Box2( zero );
-	var b = new THREE.Box2( zero, one );
-	var c = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2 );
+	var b = new THREE.Box2( zero2, one2 );
+	var c = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.containsBox( a ), "Passed!" );
 	ok( ! a.containsBox( b ), "Passed!" );
@@ -168,8 +142,8 @@ test( "containsBox", function() {
 });
 
 test( "getParameter", function() {
-	var a = new THREE.Box2( zero, one );
-	var b = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2, one2 );
+	var b = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.getParameter( new THREE.Vector2( 0, 0 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
 	ok( a.getParameter( new THREE.Vector2( 1, 1 ) ).equals( new THREE.Vector2( 1, 1 ) ), "Passed!" );
@@ -180,8 +154,8 @@ test( "getParameter", function() {
 });
 
 test( "clampPoint", function() {
-	var a = new THREE.Box2( zero, zero );
-	var b = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2, zero2 );
+	var b = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.clampPoint( new THREE.Vector2( 0, 0 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
 	ok( a.clampPoint( new THREE.Vector2( 1, 1 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
@@ -195,8 +169,8 @@ test( "clampPoint", function() {
 });
 
 test( "distanceToPoint", function() {
-	var a = new THREE.Box2( zero, zero );
-	var b = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2, zero2 );
+	var b = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.distanceToPoint( new THREE.Vector2( 0, 0 ) ) == 0, "Passed!" );
 	ok( a.distanceToPoint( new THREE.Vector2( 1, 1 ) ) == Math.sqrt( 2 ), "Passed!" );
@@ -210,8 +184,8 @@ test( "distanceToPoint", function() {
 });
 
 test( "distanceToPoint", function() {
-	var a = new THREE.Box2( zero, zero );
-	var b = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2, zero2 );
+	var b = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.distanceToPoint( new THREE.Vector2( 0, 0 ) ) == 0, "Passed!" );
 	ok( a.distanceToPoint( new THREE.Vector2( 1, 1 ) ) == Math.sqrt( 2 ), "Passed!" );
@@ -225,9 +199,9 @@ test( "distanceToPoint", function() {
 });
 
 test( "isIntersection", function() {
-	var a = new THREE.Box2( zero );
-	var b = new THREE.Box2( zero, one );
-	var c = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2 );
+	var b = new THREE.Box2( zero2, one2 );
+	var c = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.isIntersection( a ), "Passed!" );
 	ok( a.isIntersection( b ), "Passed!" );
@@ -249,9 +223,9 @@ test( "isIntersection", function() {
 });
 
 test( "intersect", function() {
-	var a = new THREE.Box2( zero );
-	var b = new THREE.Box2( zero, one );
-	var c = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2 );
+	var b = new THREE.Box2( zero2, one2 );
+	var c = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.clone().intersect( a ).equals( a ), "Passed!" );
 	ok( a.clone().intersect( b ).equals( a ), "Passed!" );
@@ -262,9 +236,9 @@ test( "intersect", function() {
 });
 
 test( "union", function() {
-	var a = new THREE.Box2( zero );
-	var b = new THREE.Box2( zero, one );
-	var c = new THREE.Box2( one.clone().negate(), one );
+	var a = new THREE.Box2( zero2 );
+	var b = new THREE.Box2( zero2, one2 );
+	var c = new THREE.Box2( one2.clone().negate(), one2 );
 
 	ok( a.clone().union( a ).equals( a ), "Passed!" );
 	ok( a.clone().union( b ).equals( b ), "Passed!" );
@@ -273,32 +247,25 @@ test( "union", function() {
 });
 
 test( "translate", function() {
-	var a = new THREE.Box2( zero );
-	var b = new THREE.Box2( zero, one );
-	var c = new THREE.Box2( one.clone().negate(), one );
-	var d = new THREE.Box2( one.clone().negate(), zero );
-
-	ok( a.clone().translate( one ).equals( new THREE.Box2( one, one ) ), "Passed!" );
-	ok( a.clone().translate( one ).translate( one.clone().negate() ).equals( a ), "Passed!" );
-	ok( d.clone().translate( one ).equals( b ), "Passed!" );
-	ok( b.clone().translate( one.clone().negate() ).equals( d ), "Passed!" );
+	var a = new THREE.Box2( zero2 );
+	var b = new THREE.Box2( zero2, one2 );
+	var c = new THREE.Box2( one2.clone().negate(), one2 );
+	var d = new THREE.Box2( one2.clone().negate(), zero2 );
+
+	ok( a.clone().translate( one2 ).equals( new THREE.Box2( one2, one2 ) ), "Passed!" );
+	ok( a.clone().translate( one2 ).translate( one2.clone().negate() ).equals( a ), "Passed!" );
+	ok( d.clone().translate( one2 ).equals( b ), "Passed!" );
+	ok( b.clone().translate( one2.clone().negate() ).equals( d ), "Passed!" );
 });
 
 test( "scale", function() {
-	var a = new THREE.Box2( zero );
-	var b = new THREE.Box2( zero, one );
-	var c = new THREE.Box2( one.clone().negate(), one );
-	var d = new THREE.Box2( one.clone().negate(), zero );
-
-	ok( b.clone().scale( 0 ).equals( a ), "Passed!" );
-	ok( b.clone().scale( 2 ).equals( new THREE.Box2( zero, new THREE.Vector2( 2, 2 ) ) ), "Passed!" );
-	ok( d.clone().scale( 2 ).equals( new THREE.Box2( new THREE.Vector2( 2, 2 ).negate(), zero ) ), "Passed!" );
-});
-
-test( "verifyConstants-end", function() {
-	ok( negInf.equals( new THREE.Vector3( -Infinity, -Infinity ) ), "Passed!" );
-	ok( posInf.equals( new THREE.Vector3( Infinity, Infinity ) ), "Passed!" );
-	ok( zero.equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
-	ok( one.equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
-	ok( two.equals( new THREE.Vector3( 2, 2, 2 ) ), "Passed!" );
+	var a = new THREE.Box2( zero2 );
+	var b = new THREE.Box2( zero2, one2 );
+	var c = new THREE.Box2( one2.clone().negate(), one2 );
+	var d = new THREE.Box2( one2.clone().negate(), zero2 );
+
+	ok( a.clone().scale( 0 ).equals( a ), "Passed!" );
+	ok( c.clone().scale( 0 ).equals( a ), "Passed!" );
+	ok( b.clone().scale( 3 ).equals( new THREE.Box2( new THREE.Vector2( -1, -1, -1 ), new THREE.Vector2( 2, 2, 2 ) ) ), "Passed!" );
+	ok( d.clone().scale( 3 ).equals( new THREE.Box2( new THREE.Vector2( 2, 2, 2 ).negate(), new THREE.Vector2( 1, 1, 1 ) ) ), "Passed!" );
 });

+ 96 - 91
test/core/Box3.js

@@ -6,37 +6,41 @@ module( "Box3" );
 
 test( "constructor", function() {
 	var a = new THREE.Box3();
-	ok( a.min.equals( posInf ), "Passed!" );
-	ok( a.max.equals( negInf ), "Passed!" );
-
-	a = new THREE.Box3( zero );
-	ok( a.min.equals( zero ), "Passed!" );
-	ok( a.max.equals( zero ), "Passed!" );
-
-	a = new THREE.Box3( zero, one );
-	ok( a.min.equals( zero ), "Passed!" );
-	ok( a.max.equals( one ), "Passed!" );
+	console.log( "BOX3: constructor");
+	console.log( a );
+	console.log( negInf3);
+	console.log( posInf3 );
+	ok( a.min.equals( posInf3 ), "Passed!" );
+	ok( a.max.equals( negInf3 ), "Passed!" );
+
+	a = new THREE.Box3( zero3 );
+	ok( a.min.equals( zero3 ), "Passed!" );
+	ok( a.max.equals( zero3 ), "Passed!" );
+
+	a = new THREE.Box3( zero3, one3 );
+	ok( a.min.equals( zero3 ), "Passed!" );
+	ok( a.max.equals( one3 ), "Passed!" );
 });
 
 test( "copy", function() {
-	var a = new THREE.Box3( zero, one );
+	var a = new THREE.Box3( zero3, one3 );
 	var b = new THREE.Box3().copy( a );
-	ok( b.min.equals( zero ), "Passed!" );
-	ok( b.max.equals( one ), "Passed!" );
+	ok( b.min.equals( zero3 ), "Passed!" );
+	ok( b.max.equals( one3 ), "Passed!" );
 
 	// ensure that it is a true copy
-	a.min = zero;
-	a.max = one;
-	ok( b.min.equals( zero ), "Passed!" );
-	ok( b.max.equals( one ), "Passed!" );
+	a.min = zero3;
+	a.max = one3;
+	ok( b.min.equals( zero3 ), "Passed!" );
+	ok( b.max.equals( one3 ), "Passed!" );
 });
 
 test( "set", function() {
 	var a = new THREE.Box3();
 
-	a.set( zero, one )
-	ok( a.min.equals( zero ), "Passed!" );
-	ok( a.max.equals( one ), "Passed!" );
+	a.set( zero3, one3 )
+	ok( a.min.equals( zero3 ), "Passed!" );
+	ok( a.max.equals( one3 ), "Passed!" );
 });
 
 test( "empty/makeEmpty", function() {
@@ -44,7 +48,7 @@ test( "empty/makeEmpty", function() {
 
 	ok( a.empty(), "Passed!" );
 
-	var a = new THREE.Box3( zero, one );
+	var a = new THREE.Box3( zero3, one3 );
 	ok( ! a.empty(), "Passed!" );
 
 	a.makeEmpty();
@@ -52,81 +56,81 @@ test( "empty/makeEmpty", function() {
 });
 
 test( "volume", function() {
-	var a = new THREE.Box3( zero, one );
+	var a = new THREE.Box3( zero3, one3 );
 	ok( a.volume() == 1, "Passed!" );
 });
 
 test( "center", function() {
-	var a = new THREE.Box3( zero );
+	var a = new THREE.Box3( zero3 );
 
-	ok( a.center().equals( zero ), "Passed!" );
+	ok( a.center().equals( zero3 ), "Passed!" );
 
-	a = new THREE.Box3( zero, one );
-	var midpoint = one.clone().multiplyScalar( 0.5 );
+	a = new THREE.Box3( zero3, one3 );
+	var midpoint = one3.clone().multiplyScalar( 0.5 );
 	ok( a.center().equals( midpoint ), "Passed!" );
 });
 
 test( "size", function() {
-	var a = new THREE.Box3( zero );
+	var a = new THREE.Box3( zero3 );
 
-	ok( a.size().equals( zero ), "Passed!" );
+	ok( a.size().equals( zero3 ), "Passed!" );
 
-	a = new THREE.Box3( zero, one );
-	ok( a.size().equals( one ), "Passed!" );
+	a = new THREE.Box3( zero3, one3 );
+	ok( a.size().equals( one3 ), "Passed!" );
 });
 
 test( "expandByPoint", function() {
-	var a = new THREE.Box3( zero );
+	var a = new THREE.Box3( zero3 );
 
-	a.expandByPoint( zero );
-	ok( a.size().equals( zero ), "Passed!" );
+	a.expandByPoint( zero3 );
+	ok( a.size().equals( zero3 ), "Passed!" );
 
-	a.expandByPoint( one );
-	ok( a.size().equals( one ), "Passed!" );
+	a.expandByPoint( one3 );
+	ok( a.size().equals( one3 ), "Passed!" );
 
-	a.expandByPoint( one.clone().negate() );
-	ok( a.size().equals( one.clone().multiplyScalar( 2 ) ), "Passed!" );
-	ok( a.center().equals( zero ), "Passed!" );
+	a.expandByPoint( one3.clone().negate() );
+	ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
+	ok( a.center().equals( zero3 ), "Passed!" );
 });
 
 test( "expandByVector", function() {
-	var a = new THREE.Box3( zero );
+	var a = new THREE.Box3( zero3 );
 
-	a.expandByVector( zero );
-	ok( a.size().equals( zero ), "Passed!" );
+	a.expandByVector( zero3 );
+	ok( a.size().equals( zero3 ), "Passed!" );
 
-	a.expandByVector( one );
-	ok( a.size().equals( one.clone().multiplyScalar( 2 ) ), "Passed!" );
-	ok( a.center().equals( zero ), "Passed!" );
+	a.expandByVector( one3 );
+	ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
+	ok( a.center().equals( zero3 ), "Passed!" );
 });
 
 test( "expandByScalar", function() {
-	var a = new THREE.Box3( zero );
+	var a = new THREE.Box3( zero3 );
 
 	a.expandByScalar( 0 );
-	ok( a.size().equals( zero ), "Passed!" );
+	ok( a.size().equals( zero3 ), "Passed!" );
 
 	a.expandByScalar( 1 );
-	ok( a.size().equals( one.clone().multiplyScalar( 2 ) ), "Passed!" );
-	ok( a.center().equals( zero ), "Passed!" );
+	ok( a.size().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
+	ok( a.center().equals( zero3 ), "Passed!" );
 });
 
 test( "containsPoint", function() {
-	var a = new THREE.Box3( zero );
+	var a = new THREE.Box3( zero3 );
 
-	ok( a.containsPoint( zero ), "Passed!" );
-	ok( ! a.containsPoint( one ), "Passed!" );
+	ok( a.containsPoint( zero3 ), "Passed!" );
+	ok( ! a.containsPoint( one3 ), "Passed!" );
 
 	a.expandByScalar( 1 );
-	ok( a.containsPoint( zero ), "Passed!" );
-	ok( a.containsPoint( one ), "Passed!" );
-	ok( a.containsPoint( one.clone().negate() ), "Passed!" );
+	ok( a.containsPoint( zero3 ), "Passed!" );
+	ok( a.containsPoint( one3 ), "Passed!" );
+	ok( a.containsPoint( one3.clone().negate() ), "Passed!" );
 });
 
 test( "containsBox", function() {
-	var a = new THREE.Box3( zero );
-	var b = new THREE.Box3( zero, one );
-	var c = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3 );
+	var b = new THREE.Box3( zero3, one3 );
+	var c = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.containsBox( a ), "Passed!" );
 	ok( ! a.containsBox( b ), "Passed!" );
@@ -138,8 +142,8 @@ test( "containsBox", function() {
 });
 
 test( "getParameter", function() {
-	var a = new THREE.Box3( zero, one );
-	var b = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3, one3 );
+	var b = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.getParameter( new THREE.Vector3( 0, 0, 0 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 	ok( a.getParameter( new THREE.Vector3( 1, 1, 1 ) ).equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
@@ -150,8 +154,8 @@ test( "getParameter", function() {
 });
 
 test( "clampPoint", function() {
-	var a = new THREE.Box3( zero, one );
-	var b = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3, zero3 );
+	var b = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.clampPoint( new THREE.Vector3( 0, 0, 0 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 	ok( a.clampPoint( new THREE.Vector3( 1, 1, 1 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
@@ -165,8 +169,8 @@ test( "clampPoint", function() {
 });
 
 test( "distanceToPoint", function() {
-	var a = new THREE.Box3( zero, one );
-	var b = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3, zero3  );
+	var b = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.distanceToPoint( new THREE.Vector3( 0, 0, 0 ) ) == 0, "Passed!" );
 	ok( a.distanceToPoint( new THREE.Vector3( 1, 1, 1 ) ) == Math.sqrt( 3 ), "Passed!" );
@@ -180,8 +184,8 @@ test( "distanceToPoint", function() {
 });
 
 test( "distanceToPoint", function() {
-	var a = new THREE.Box3( zero, one );
-	var b = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3, zero3  );
+	var b = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.distanceToPoint( new THREE.Vector3( 0, 0, 0 ) ) == 0, "Passed!" );
 	ok( a.distanceToPoint( new THREE.Vector3( 1, 1, 1 ) ) == Math.sqrt( 3 ), "Passed!" );
@@ -195,9 +199,9 @@ test( "distanceToPoint", function() {
 });
 
 test( "isIntersection", function() {
-	var a = new THREE.Box3( zero );
-	var b = new THREE.Box3( zero, one );
-	var c = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3 );
+	var b = new THREE.Box3( zero3, one3 );
+	var c = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.isIntersection( a ), "Passed!" );
 	ok( a.isIntersection( b ), "Passed!" );
@@ -215,9 +219,9 @@ test( "isIntersection", function() {
 });
 
 test( "intersect", function() {
-	var a = new THREE.Box3( zero );
-	var b = new THREE.Box3( zero, one );
-	var c = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3 );
+	var b = new THREE.Box3( zero3, one3 );
+	var c = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.clone().intersect( a ).equals( a ), "Passed!" );
 	ok( a.clone().intersect( b ).equals( a ), "Passed!" );
@@ -228,9 +232,9 @@ test( "intersect", function() {
 });
 
 test( "union", function() {
-	var a = new THREE.Box3( zero );
-	var b = new THREE.Box3( zero, one );
-	var c = new THREE.Box3( one.clone().negate(), one );
+	var a = new THREE.Box3( zero3 );
+	var b = new THREE.Box3( zero3, one3 );
+	var c = new THREE.Box3( one3.clone().negate(), one3 );
 
 	ok( a.clone().union( a ).equals( a ), "Passed!" );
 	ok( a.clone().union( b ).equals( b ), "Passed!" );
@@ -239,24 +243,25 @@ test( "union", function() {
 });
 
 test( "translate", function() {
-	var a = new THREE.Box3( zero );
-	var b = new THREE.Box3( zero, one );
-	var c = new THREE.Box3( one.clone().negate(), one );
-	var d = new THREE.Box3( one.clone().negate(), zero );
-
-	ok( a.clone().translate( one ).equals( new THREE.Box3( one, one ) ), "Passed!" );
-	ok( a.clone().translate( one ).translate( one.clone().negate() ).equals( a ), "Passed!" );
-	ok( d.clone().translate( one ).equals( b ), "Passed!" );
-	ok( b.clone().translate( one.clone().negate() ).equals( d ), "Passed!" );
+	var a = new THREE.Box3( zero3 );
+	var b = new THREE.Box3( zero3, one3 );
+	var c = new THREE.Box3( one3.clone().negate(), one3 );
+	var d = new THREE.Box3( one3.clone().negate(), zero3 );
+
+	ok( a.clone().translate( one3 ).equals( new THREE.Box3( one3, one3 ) ), "Passed!" );
+	ok( a.clone().translate( one3 ).translate( one3.clone().negate() ).equals( a ), "Passed!" );
+	ok( d.clone().translate( one3 ).equals( b ), "Passed!" );
+	ok( b.clone().translate( one3.clone().negate() ).equals( d ), "Passed!" );
 });
 
 test( "scale", function() {
-	var a = new THREE.Box3( zero );
-	var b = new THREE.Box3( zero, one );
-	var c = new THREE.Box3( one.clone().negate(), one );
-	var d = new THREE.Box3( one.clone().negate(), zero );
-
-	ok( b.clone().scale( 0 ).equals( a ), "Passed!" );
-	ok( b.clone().scale( 2 ).equals( new THREE.Box3( zero, new THREE.Vector3( 2, 2, 2 ) ) ), "Passed!" );
-	ok( d.clone().scale( 2 ).equals( new THREE.Box3( new THREE.Vector3( 2, 2, 2 ).negate(), zero ) ), "Passed!" );
+	var a = new THREE.Box3( zero3 );
+	var b = new THREE.Box3( zero3, one3 );
+	var c = new THREE.Box3( one3.clone().negate(), one3 );
+	var d = new THREE.Box3( one3.clone().negate(), zero3 );
+
+	ok( a.clone().scale( 0 ).equals( a ), "Passed!" );
+	ok( c.clone().scale( 0 ).equals( a ), "Passed!" );
+	ok( b.clone().scale( 3 ).equals( new THREE.Box3( new THREE.Vector3( -1, -1, -1 ), new THREE.Vector3( 2, 2, 2 ) ) ), "Passed!" );
+	ok( d.clone().scale( 3 ).equals( new THREE.Box3( new THREE.Vector3( 2, 2, 2 ).negate(), new THREE.Vector3( 1, 1, 1 ) ) ), "Passed!" );
 });

+ 12 - 5
test/core/Constants.js

@@ -7,9 +7,16 @@ var y = 3;
 var z = 4;
 var w = 5;
 
-var negInf = new THREE.Vector3( -Infinity, -Infinity );
-var posInf = new THREE.Vector3( Infinity, Infinity );
+var negInf2 = new THREE.Vector2( -Infinity, -Infinity );
+var posInf2 = new THREE.Vector2( Infinity, Infinity );
 
-var zero = new THREE.Vector3();
-var one = new THREE.Vector3( 1, 1, 1 );
-var two = new THREE.Vector3( 2, 2, 2 );
+var zero2 = new THREE.Vector2();
+var one2 = new THREE.Vector2( 1, 1 );
+var two2 = new THREE.Vector2( 2, 2 );
+
+var negInf3 = new THREE.Vector3( -Infinity, -Infinity, -Infinity );
+var posInf3 = new THREE.Vector3( Infinity, Infinity, Infinity );
+
+var zero3 = new THREE.Vector3();
+var one3 = new THREE.Vector3( 1, 1, 1 );
+var two3 = new THREE.Vector3( 2, 2, 2 );

+ 7 - 7
test/core/Plane.js

@@ -11,13 +11,13 @@ test( "constructor", function() {
 	ok( a.normal.z == 0, "Passed!" );
 	ok( a.constant == 0, "Passed!" );
 
-	a = new THREE.Plane( one, 0 );
+	a = new THREE.Plane( one3, 0 );
 	ok( a.normal.x == 1, "Passed!" );
 	ok( a.normal.y == 1, "Passed!" );
 	ok( a.normal.z == 1, "Passed!" );
 	ok( a.constant == 0, "Passed!" );
 
-	a = new THREE.Plane( one, 1 );
+	a = new THREE.Plane( one3, 1 );
 	ok( a.normal.x == 1, "Passed!" );
 	ok( a.normal.y == 1, "Passed!" );
 	ok( a.normal.z == 1, "Passed!" );
@@ -72,18 +72,18 @@ test( "setComponents", function() {
 });
 
 test( "setFromNormalAndCoplanarPoint", function() {
-	var a = new THREE.Plane().setFromNormalAndCoplanarPoint( one, zero );
+	var a = new THREE.Plane().setFromNormalAndCoplanarPoint( one3, zero3 );
 	
-	ok( a.normal.equals( one ), "Passed!" );
+	ok( a.normal.equals( one3 ), "Passed!" );
 	ok( a.constant == 0, "Passed!" );
 });
 
 test( "flip", function() {
-	var a = new THREE.Plane( one, 0 );
+	var a = new THREE.Plane( one3, 0 );
 	
-	ok( a.normal.equals( one ), "Passed!" );
+	ok( a.normal.equals( one3 ), "Passed!" );
 	a.flip();
-	ok( a.normal.negate().equals( one ), "Passed!" );
+	ok( a.normal.negate().equals( one3 ), "Passed!" );
 });
 
 test( "normalize", function() {

+ 10 - 10
test/core/Sphere.js

@@ -6,34 +6,34 @@ module( "Sphere" );
 
 test( "constructor", function() {
 	var a = new THREE.Sphere();
-	ok( a.center.equals( zero ), "Passed!" );
+	ok( a.center.equals( zero3 ), "Passed!" );
 	ok( a.radius == 0, "Passed!" );
 
-	a = new THREE.Sphere( one, 1 );
-	ok( a.center.equals( one ), "Passed!" );
+	a = new THREE.Sphere( one3, 1 );
+	ok( a.center.equals( one3 ), "Passed!" );
 	ok( a.radius == 1, "Passed!" );
 });
 
 test( "copy", function() {
-	var a = new THREE.Sphere( one, 1 );
+	var a = new THREE.Sphere( one3, 1 );
 	var b = new THREE.Sphere().copy( a );
 
-	ok( b.center.equals( one ), "Passed!" );
+	ok( b.center.equals( one3 ), "Passed!" );
 	ok( b.radius == 1, "Passed!" );
 
 	// ensure that it is a true copy
-	a.center = zero;
+	a.center = zero3;
 	a.radius = 0;
-	ok( b.center.equals( one ), "Passed!" );
+	ok( b.center.equals( one3 ), "Passed!" );
 	ok( b.radius == 1, "Passed!" );
 });
 
 test( "set", function() {
 	var a = new THREE.Sphere();
-	ok( a.center.equals( zero ), "Passed!" );
+	ok( a.center.equals( zero3 ), "Passed!" );
 	ok( a.radius == 0, "Passed!" );
 
-	a.set( one, 1 )
-	ok( a.center.equals( one ), "Passed!" );
+	a.set( one3, 1 )
+	ok( a.center.equals( one3 ), "Passed!" );
 	ok( a.radius == 1, "Passed!" );
 });