remove excessively long ray-box intersection code + unit tests.

src/math/Ray.js

@@ -77,319 +77,12 @@ THREE.Ray.prototype = {
 
 	},
 
-	/*
-	// Commented out because this does not handle the case of non-intersecting
-	// perpendicular lines
-	closestPointToRay: function ( ray ) {
-
-		// Assumes the lines are normalized
-		// based on algorithm in ILM's Imath Plane class.
-
-	    THREE.Ray.__v1.copy( this.origin ).subSelf( ray.origin );
-	    var c = this.direction.dot( THREE.Ray.__v1 );
-	    var a = ray.direction.dot( this.direction );
-	    var f = ray.direction.dot( THREE.Ray.__v1 );
-	    var num = c - a * f;
-	    var denom = a*a - 1;
-
-	    var absDenom = ( ( denom >= 0 ) ? denom: -denom );
-
-	    if ( absDenom < 1 )
-	    {
-			var absNum = ( ( num >= 0 ) ? num: -num );
-
-			if (absNum >= absDenom * Number.MAX_VALUE ) {
-
-				// Unsure if this is the correct method to handle this case.
-				return this.origin.clone();
-
-		    }
-	    }
-
-	    return this.direction.clone().multiplyScalar( num / denom ).addSelf( this.origin );
-
-	},
-	*/
-
-	/*
-	// Commented out because this does not handle the case of non-intersecting
-	// perpendicular lines
-	distanceToRay: function ( ray ) {		
-
-		THREE.Ray.__v1.copy( this.direction ).crossSelf( ray.direction );
-		THREE.Ray.__v2.copy( ray.origin ).subSelf( this.origin );
-
-
-		var d = THREE.Ray.__v1.dot( THREE.Ray.__v2 );
-		if( d >= 0 ) {
-
-			return d;
-
-		} else {
-
-			// Unsure if this is the correct method to handle this case.
-			return -1;
-
-		}
-	},*/
-
 	isIntersectionSphere: function( sphere ) {
 
 		return ( this.distanceToPoint( sphere.center ) <= sphere.radius );
 
 	},
 
-	isIntersectionBox: function( box ) {
-
-		// this is very slow, this is just an initial implementation
-		return ( this.intersectBox( box ) !== undefined );
-
-	},
-
-	intersectBox: function( box ) {
-		// based on intersects from ImathBoxAlgo from ILM's Imath library
-		//
-		// Intersect a ray, r, with a box, b, and compute the intersection
-		// point, ip:
-		//
-		// isIntersectionBox() returns
-		//     - true if the ray starts inside the box or if the
-		//       ray starts outside and intersects the box
-		//     - false if the ray starts outside the box and intersects it,
-		//       but the intersection is behind the ray's origin.
-		//     - false if the ray starts outside and does not intersect it
-		//
-		// The intersection point is
-		//     - the ray's origin if the ray starts inside the box
-		//     - a point on one of the faces of the box if the ray
-		//       starts outside the box
-		//     - undefined when intersect() returns false
-
-		// No ray intersects an empty box
-		if(  box.empty() ) {
-			return false;
-		}
-
-		// The ray starts inside the box
-		if(  box.containsPoint( this.origin ) ) {
-			return this.origin;
-		}
-
-		// The ray starts outside the box.  Between one and three "frontfacing"
-		// sides of the box are oriented towards the ray, and between one and
-		// three "backfacing" sides are oriented away from the ray.
-		// We intersect the ray with the planes that contain the sides of the
-		// box, and compare the distances between ray's origin and the ray-plane
-		// intersections.
-		// The ray intersects the box if the most distant frontfacing intersection
-		// is nearer than the nearest backfacing intersection.  If the ray does
-		// intersect the box, then the most distant frontfacing ray-plane
-		// intersection is the ray-box intersection.
-		var TMAX = Infinity;
-		var tFrontMax = -1;
-		var tBackMin = TMAX;
-		var t, d;
-		var ip = new THREE.Vector3();
-
-		// Minimum and maximum X sides.
-		if( this.direction.x > 0 ) {
-			if( this.origin.x > box.max.x ) {
-			    return undefined;
-			}
-
-			d = box.max.x - this.origin.x;
-
-			if( this.direction.x > 1 || d < TMAX * this.direction.x ) {
-				t = d / this.direction.x;
-				if( tBackMin > t) {
-					tBackMin = t;
-				}
-			}
-
-			if( this.origin.x <= box.min.x ) {
-
-			    d = box.min.x - this.origin.x;
-			    t = (this.direction.x > 1 || d < TMAX * this.direction.x)? d / this.direction.x: TMAX;
-
-			    if( tFrontMax < t) {
-					tFrontMax = t;
-
-					ip.set(
-						box.min.x,
-						THREE.Math.clamp( this.origin.y + t * this.direction.y, box.min.y, box.max.y),
-						THREE.Math.clamp( this.origin.z + t * this.direction.z, box.min.z, box.max.z) );
-			    }
-			}
-		} else if( this.direction.x < 0 ) {
-			if( this.origin.x < box.min.x ) {
-				return undefined;
-			}
-
-			d = box.min.x - this.origin.x;
-
-			if( this.direction.x < -1 || d > TMAX * this.direction.x ) {
-			    t = d / this.direction.x;
-
-			    if( tBackMin > t ) {
-					tBackMin = t;
-				}
-			}
-
-			if( this.origin.x >= box.max.x ) {
-			    d = box.max.x - this.origin.x;
-				t = (this.direction.x < -1 || d > TMAX * this.direction.x)? d / this.direction.x: TMAX;
-
-				if( tFrontMax < t ) {
-					tFrontMax = t;
-
-					ip.set (
-						box.max.x,
-						THREE.Math.clamp( this.origin.y + t * this.direction.y, box.min.y, box.max.y),
-						THREE.Math.clamp( this.origin.z + t * this.direction.z, box.min.z, box.max.z) );
-				}
-			}
-		} else { // this.direction.x == 0
-
-			if( this.origin.x < box.min.x || this.origin.x > box.max.x ) {
-			    return undefined;
-			}
-		}
-
-		// Minimum and maximum Y sides.
-		if( this.direction.y > 0 ) {
-			if( this.origin.y > box.max.y ) {
-				return undefined;
-			}
-
-			d = box.max.y - this.origin.y;
-
-			if( this.direction.y > 1 || d < TMAX * this.direction.y ) {
-				t = d / this.direction.y;
-
-				if( tBackMin > t) {
-					tBackMin = t;
-				}
-			}
-
-			if( this.origin.y <= box.min.y ) {
-				d = box.min.y - this.origin.y;
-				t = (this.direction.y > 1 || d < TMAX * this.direction.y)? d / this.direction.y: TMAX;
-
-		    if( tFrontMax < t ) {
-				tFrontMax = t;
-
-				ip.set(
-					THREE.Math.clamp( this.origin.x + t * this.direction.x, box.min.x, box.max.x),
-					box.min.y,
-					THREE.Math.clamp( this.origin.z + t * this.direction.z, box.min.z, box.max.z) );
-				}
-			}
-		} else if( this.direction.y < 0 ) {
-			if( this.origin.y < box.min.y ) {
-				return undefined;
-		    }
-
-			d = box.min.y - this.origin.y;
-
-			if( this.direction.y < -1 || d > TMAX * this.direction.y ) {
-				t = d / this.direction.y;
-
-				if( tBackMin > t ) {
-					tBackMin = t;
-				}
-			}
-
-			if( this.origin.y >= box.max.y ) {
-			    d = box.max.y - this.origin.y;
-			    t = (this.direction.y < -1 || d > TMAX * this.direction.y)? d / this.direction.y: TMAX;
-
-			    if( tFrontMax < t) {
-					tFrontMax = t;
-
-					ip.set(
-						THREE.Math.clamp( this.origin.x + t * this.direction.x, box.min.x, box.max.x),
-						box.max.y,
-						THREE.Math.clamp( this.origin.z + t * this.direction.z, box.min.z, box.max.z) );
-				}
-			}
-		} else {	// this.direction.y == 0
-
-			if( this.origin.y < box.min.y || this.origin.y > box.max.y) {
-				return undefined;
-		    }
-		}
-
-		// Minimum and maximum Z sides.
-		if( this.direction.z > 0) {
-			if( this.origin.z > box.max.z ) {
-				return undefined;
-			}
-
-			d = box.max.z - this.origin.z;
-
-			if(  this.direction.z > 1 || d < TMAX * this.direction.z ) {
-			    t = d / this.direction.z;
-
-			    if( tBackMin > t ) {
-					tBackMin = t;
-				}
-			}
-
-			if( this.origin.z <= box.min.z ) {
-				d = box.min.z - this.origin.z;
-				t = (this.direction.z > 1 || d < TMAX * this.direction.z)? d / this.direction.z: TMAX;
-
-				if( tFrontMax < t ) {
-					tFrontMax = t;
-
-					ip.set(
-						THREE.Math.clamp( this.origin.x + t * this.direction.x, box.min.x, box.max.x ),
-						THREE.Math.clamp( this.origin.y + t * this.direction.y, box.min.y, box.max.y ),
-						box.min.z );
-			    }
-			}
-		} else if( this.direction.z < 0 ) {
-			if( this.origin.z < box.min.z ) {
-				return undefined;
-		    }
-
-			d = box.min.z - this.origin.z;
-
-			if( this.direction.z < -1 || d > TMAX * this.direction.z ) {
-				t = d / this.direction.z;
-
-				if( tBackMin > t ) {
-					tBackMin = t;
-				}
-			}
-
-			if( this.origin.z >= box.max.z ) {
-				d = box.max.z - this.origin.z;
-				t = (this.direction.z < -1 || d > TMAX * this.direction.z)? d / this.direction.z: TMAX;
-
-				if( tFrontMax < t ) {
-					tFrontMax = t;
-
-					ip.set(
-						THREE.Math.clamp( this.origin.x + t * this.direction.x, box.min.x, box.max.x),
-						THREE.Math.clamp( this.origin.y + t * this.direction.y, box.min.y, box.max.y),
-						box.max.z );
-				}
-			}
-		} else {	// this.direction.z == 0
-			if( this.origin.z < box.min.z || this.origin.z > box.max.z ) {
-				return undefined;
-		    }
-		}
-
-		if( tFrontMax <= tBackMin ) {
-			return ip;
-		}
-
-		return undefined;
-
-	},
-
 	isIntersectionPlane: function ( plane ) {
 
 		// check if the line and plane are non-perpendicular, if they

test/core/Ray.js

@@ -98,44 +98,6 @@ test( "distanceToPoint", function() {
 	ok( c == 0, "Passed!" );
 });
 
-/*
-test( "distanceToRay", function() {
-	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
-	
-	// parallel ray
-	var b = new THREE.Ray( zero3, new THREE.Vector3( 0, 0, 1 ) );
-	console.log( a );
-	console.log( b );
-	console.log( a.distanceToRay( b ) );
-	console.log( a.closestPointToRay( b ) );
-	ok( a.distanceToRay( b ) == Math.sqrt( 2 ), "Passed!" );
-
-	// perpendical ray that intersects
-	var c = new THREE.Ray( one3, new THREE.Vector3( 1, 0, 0 ) );
-	ok( a.distanceToRay( c ) == 0, "Passed!" );
-
-	// perpendical ray that doesn't intersects
-	var d = new THREE.Ray( one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ), new THREE.Vector3( 1, 0, 0 ) );
-	ok( a.distanceToRay( d ) == 1, "Passed!" );
-});
-
-test( "closestPointToRay", function() {
-	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
-	
-	// parallel ray
-	var b = new THREE.Ray( zero3, new THREE.Vector3( 0, 0, 1 ) );
-	ok( a.closestPointToRay( b ).equals( one3 ), "Passed!" );
-
-	// perpendical ray that intersects
-	var c = new THREE.Ray( one3, new THREE.Vector3( 1, 0, 0 ) );
-	ok( a.closestPointToRay( c ).equals( zero3 ), "Passed!" );
-
-	// perpendical ray that doesn't intersects
-	var d = new THREE.Ray( one3.clone().subSelf( new THREE.Vector3( 0, 0, -1 ) ), new THREE.Vector3( 1, 0, 0 ) );
-	ok( a.closestPointToRay( d ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
-});
-*/
-
 test( "isIntersectionSphere", function() {
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
 	var b = new THREE.Sphere( zero3, 0.5 );
@@ -151,24 +113,6 @@ test( "isIntersectionSphere", function() {
 	ok( ! a.isIntersectionSphere( f ), "Passed!" );
 });
 
-test( "isIntersectionBox", function() {
-	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
-	var b = new THREE.Box3( zero3, one3 );
-	var c = new THREE.Box3( one3.clone().negate(), zero3 );
-
-	ok( a.isIntersectionBox( b ), "Passed!" );
-	ok( ! a.isIntersectionBox( c ), "Passed!" );
-});
-
-test( "intersectBox", function() {
-	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );
-	var b = new THREE.Box3( zero3, one3 );
-	var c = new THREE.Box3( one3.clone().negate(), zero3 );
-
-	ok( a.intersectBox( b ).equals( one3 ), "Passed!" );
-	ok( a.intersectBox( c ) === undefined, "Passed!" );
-});
-
 test( "isIntersectionPlane", function() {
 	var a = new THREE.Ray( one3, new THREE.Vector3( 0, 0, 1 ) );