From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 20 May 2013 16:33:20 +0000 (+0300)
Subject: Record distance in SurfacePoint
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c135ff2480f4e2aaf05b0206631bb0e1b5d73fad;p=libs%2Fmath.git

Record distance in SurfacePoint
---

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 7d363f2..10c28d5 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -83,7 +83,6 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 
 	LinAl::Vector<T, D> half_dim = dimensions/T(2);
 	unsigned n = 0;
-	T first_depth = T();
 	for(unsigned i=0; i<D; ++i)
 	{
 		if(!ray.get_direction()[i])
@@ -108,9 +107,9 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 					points[n].position = p;
 					points[n].normal = LinAl::Vector<T, D>();
 					points[n].normal[i] = j;
-					if(n==0)
-						first_depth = x;
-					else if(n==1 && x<first_depth)
+					points[n].distance = x;
+
+					if(n==1 && x<points[0].distance)
 						std::swap(points[0], points[1]);
 				}
 
diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index ed2b49f..48fdb8a 100644
--- a/source/geometry/hypersphere.h
+++ b/source/geometry/hypersphere.h
@@ -96,6 +96,7 @@ inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, Surfa
 			{
 				points[n].position = ray.get_start()+ray.get_direction()*x;
 				points[n].normal = normalize(points[n].position);
+				points[n].distance = x;
 			}
 
 			++n;
diff --git a/source/geometry/surfacepoint.h b/source/geometry/surfacepoint.h
index 251964c..a5bd794 100644
--- a/source/geometry/surfacepoint.h
+++ b/source/geometry/surfacepoint.h
@@ -14,6 +14,7 @@ struct SurfacePoint
 {
 	LinAl::Vector<T, N> position;
 	LinAl::Vector<T, N> normal;
+	T distance;
 };
 
 } // namespace Geometry
diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 0125368..34fd298 100644
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -107,6 +107,7 @@ inline unsigned TransformedShape<T, D>::get_intersections(const Ray<T, D> &ray,
 			/* XXX This is not correct for nonuniform scaling.  Inverse of the
 			transpose of the upper DxD part of the matrix should be used. */
 			points[i].normal = transformation.transform(points[i].normal);
+			points[i].distance = inner_product(points[i].position-ray.get_start(), ray.get_direction());
 		}
 	}
 	return count;