X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FPlane.hh;h=b39891790f16a6afc682c9e753642cf8015ebd5e;hp=11cd63ec23f2bf7f6517a8b2d5e937eb6f3832f3;hb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e;hpb=99ac607f489023a7aa17bfb046113b0e4a65dab6

diff --git a/src/Moof/Plane.hh b/src/Moof/Plane.hh
index 11cd63e..b398917 100644
--- a/src/Moof/Plane.hh
+++ b/src/Moof/Plane.hh
@@ -66,39 +66,34 @@ struct Plane : public Shape<3>
 		d(scalar) {}
 
 
-	Scalar intersectRay(const Ray<3>& ray, Ray<3>::Intersection& intersection)
+	bool intersectRay(const Ray<3>& ray, Ray<3>::Intersection& hit)
 	{
 		// solve: [(ray.point + t*ray.direction) dot normal] + d = 0
 
-		Scalar denominator = cml::dot(ray.direction, normal);
+		Scalar denom = cml::dot(ray.direction, normal);
 
 		// check for parallel condition
-		if (denominator == SCALAR(0.0))
+		if (denom == SCALAR(0.0))
 		{
 			if (isEqual(cml::dot(ray.point, normal), -d))
 			{
 				// the ray lies on the plane
-				intersection.point = ray.point;
-				intersection.normal.set(0.0, 0.0, 0.0);
-				//intersection.normal = normal;
-				return SCALAR(0.0);
+				hit.distance = SCALAR(0.0);
+				hit.normal.set(0.0, 0.0, 0.0);
+				return true;
 			}
 
 			// no solution
-			return SCALAR(-1.0);
+			return false;
 		}
 
-		Scalar distance = cml::dot(ray.point, normal) + d;
-		Scalar t = -distance / denominator;
-		if (t > SCALAR(0.0))
-		{
-			ray.solve(intersection.point, t);
-
-			if (distance >= 0.0) intersection.normal = normal;
-			else                 intersection.normal = -normal;
-		}
+		Scalar numer = cml::dot(ray.point, normal) + d;
+		hit.distance = -numer / denom;
+		if (hit.distance < SCALAR(0.0)) return false;
 
-		return t;
+		if (numer >= 0.0) hit.normal = normal;
+		else              hit.normal = -normal;
+		return true;
 	}