X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhyperbox.h;h=10c28d5d1f4c20a15937e7b0aa696f3074151aec;hb=c135ff2480f4e2aaf05b0206631bb0e1b5d73fad;hp=6248d6b0920e906f5bad1ee1ce1b9ba6fbb97fc4;hpb=9260eee3126731c1e6b54ce3407be757d0d71716;p=libs%2Fmath.git

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 6248d6b..10c28d5 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -11,6 +11,10 @@
 namespace Msp {
 namespace Geometry {
 
+/**
+A shape bounded by planar faces at right angles to each other.  Two- and three-
+dimensional cases are Rectangle and Box, respectively.
+*/
 template<typename T, unsigned D>
 class HyperBox: public Shape<T, D>
 {
@@ -79,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])
@@ -104,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]);
 				}