Browse Source

finished scope of Ray unit tests, now I just need to make them work.

Ben Houston 12 years ago
parent
commit
dd58a87142
2 changed files with 15 additions and 15 deletions
  1. 1 1
      src/math/Ray.js
  2. 14 14
      test/core/Ray.js

+ 1 - 1
src/math/Ray.js

@@ -149,7 +149,7 @@ THREE.Ray.prototype = {
 			// line is coplanar, return origin
 			// line is coplanar, return origin
 			if( plane.distanceToPoint( this.origin ) == 0 ) {
 			if( plane.distanceToPoint( this.origin ) == 0 ) {
 
 
-				return origin.clone();
+				return this.origin.clone();
 
 
 			}
 			}
 
 

+ 14 - 14
test/core/Ray.js

@@ -4,7 +4,7 @@
 
 
 module( "Ray" );
 module( "Ray" );
 
 
-test( "constructor", function() {
+test( "constructor/equals", function() {
 	var a = new THREE.Ray();
 	var a = new THREE.Ray();
 	ok( a.origin.equals( zero3 ), "Passed!" );
 	ok( a.origin.equals( zero3 ), "Passed!" );
 	ok( a.direction.equals( zero3 ), "Passed!" );
 	ok( a.direction.equals( zero3 ), "Passed!" );
@@ -14,7 +14,7 @@ test( "constructor", function() {
 	ok( a.direction.equals( one3 ), "Passed!" );
 	ok( a.direction.equals( one3 ), "Passed!" );
 });
 });
 
 
-test( "copy", function() {
+test( "copy/equals", function() {
 	var a = new THREE.Ray( zero3, one3 );
 	var a = new THREE.Ray( zero3, one3 );
 	var b = new THREE.Ray().copy( a );
 	var b = new THREE.Ray().copy( a );
 	ok( b.origin.equals( zero3 ), "Passed!" );
 	ok( b.origin.equals( zero3 ), "Passed!" );
@@ -43,7 +43,7 @@ test( "at", function() {
 	ok( a.at( 1 ).equals( new THREE.Vector3( 1, 1, 2 ) ), "Passed!" );
 	ok( a.at( 1 ).equals( new THREE.Vector3( 1, 1, 2 ) ), "Passed!" );
 });
 });
 
 
-test( "recast/recastSelf", function() {
+test( "recast/recastSelf/clone", function() {
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 
 
 	ok( a.recastSelf( 0 ).equals( a ), "Passed!" );
 	ok( a.recastSelf( 0 ).equals( a ), "Passed!" );
@@ -134,23 +134,23 @@ test( "isIntersectionPlane", function() {
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 	
 	
 	// parallel plane behind
 	// parallel plane behind
-	var b = new THREE.Plane( one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ), new THREE.Vector3( 0, 0, 1 ) );
+	var b = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ) );
 	ok( a.isIntersectionPlane( b ), "Passed!" );
 	ok( a.isIntersectionPlane( b ), "Passed!" );
 
 
 	// parallel plane coincident with origin
 	// parallel plane coincident with origin
-	var c = new THREE.Plane( one3.clone().subSelf( new THREE.Vector3( 0, 0, 0 ) ), new THREE.Vector3( 0, 0, 1 ) );
+	var c = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), one3.clone().subSelf( new THREE.Vector3( 0, 0, 0 ) ) );
 	ok( a.isIntersectionPlane( c ), "Passed!" );
 	ok( a.isIntersectionPlane( c ), "Passed!" );
 
 
 	// parallel plane infront
 	// parallel plane infront
-	var d = new THREE.Plane( one3.clone().subSelf( new THREE.Vector3( 0, 0, 1 ) ), new THREE.Vector3( 0, 0, 1 ) );
+	var d = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), one3.clone().subSelf( new THREE.Vector3( 0, 0, 1 ) ) );
 	ok( a.isIntersectionPlane( d ), "Passed!" );
 	ok( a.isIntersectionPlane( d ), "Passed!" );
 
 
 	// perpendical ray that overlaps exactly
 	// perpendical ray that overlaps exactly
-	var e = new THREE.Plane( one3, new THREE.Vector3( 1, 0, 0 ) );
+	var e = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 1, 0, 0 ), one3 );
 	ok( a.isIntersectionPlane( e ), "Passed!" );
 	ok( a.isIntersectionPlane( e ), "Passed!" );
 
 
 	// perpendical ray that doesn't overlap
 	// perpendical ray that doesn't overlap
-	var f = new THREE.Plane( zero3, new THREE.Vector3( 1, 0, 0 ) );
+	var f = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 1, 0, 0 ), zero3 );
 	ok( ! a.isIntersectionPlane( f ), "Passed!" );
 	ok( ! a.isIntersectionPlane( f ), "Passed!" );
 });
 });
 
 
@@ -158,22 +158,22 @@ test( "intersectPlane", function() {
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 	
 	
 	// parallel plane behind
 	// parallel plane behind
-	var b = new THREE.Plane( one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ), new THREE.Vector3( 0, 0, 1 ) );
+	var b = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ) );
 	ok( a.intersectPlane( b ).equals( one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ) ), "Passed!" );
 	ok( a.intersectPlane( b ).equals( one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ) ), "Passed!" );
 
 
 	// parallel plane coincident with origin
 	// parallel plane coincident with origin
-	var c = new THREE.Plane( one3.clone().subSelf( new THREE.Vector3( 0, 0, 0 ) ), new THREE.Vector3( 0, 0, 1 ) );
+	var c = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), one3.clone().subSelf( new THREE.Vector3( 0, 0, 0 ) ) );
 	ok( a.intersectPlane( c ).equals( one3.clone().subSelf( new THREE.Vector3( 0, 0, 0 ) ) ), "Passed!" );
 	ok( a.intersectPlane( c ).equals( one3.clone().subSelf( new THREE.Vector3( 0, 0, 0 ) ) ), "Passed!" );
 
 
 	// parallel plane infront
 	// parallel plane infront
-	var d = new THREE.Plane( one3.clone().subSelf( new THREE.Vector3( 0, 0, 1 ) ), new THREE.Vector3( 0, 0, 1 ) );
+	var d = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), one3.clone().subSelf( new THREE.Vector3( 0, 0, 1 ) ) );
 	ok( a.intersectPlane( d ).equals( one3.clone().subSelf( new THREE.Vector3( 0, 0, 1 ) ) ), "Passed!" );
 	ok( a.intersectPlane( d ).equals( one3.clone().subSelf( new THREE.Vector3( 0, 0, 1 ) ) ), "Passed!" );
 
 
 	// perpendical ray that overlaps exactly
 	// perpendical ray that overlaps exactly
-	var e = new THREE.Plane( one3, new THREE.Vector3( 1, 0, 0 ) );
+	var e = new THREE.Plane().setFromNormalAndCoplanarPoint( one3, new THREE.Vector3( 1, 0, 0 ) );
 	ok( a.intersectPlane( e ) === e.origin, "Passed!" );
 	ok( a.intersectPlane( e ) === e.origin, "Passed!" );
 
 
 	// perpendical ray that doesn't overlap
 	// perpendical ray that doesn't overlap
-	var f = new THREE.Plane( zero3, new THREE.Vector3( 1, 0, 0 ) );
+	var f = new THREE.Plane().setFromNormalAndCoplanarPoint( zero3, new THREE.Vector3( 1, 0, 0 ) );
 	ok( ! a.intersectPlane( f ) === undefined, "Passed!" );
 	ok( ! a.intersectPlane( f ) === undefined, "Passed!" );
-});
+});