X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhyperbox.h;h=865b968902f078b25297138786f3602fbafa9260;hb=643aa7b2317f88463f66da11e595ebe0f6c9621d;hp=7d363f246a8a48e25cbb07762e351f7f4dc58936;hpb=adb812a194961d542dcb0abd61258cbc8723ecd9;p=libs%2Fmath.git

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 7d363f2..865b968 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -64,6 +64,8 @@ inline T HyperBox<T, D>::get_dimension(unsigned i) const
 template<typename T, unsigned D>
 inline bool HyperBox<T, D>::contains(const LinAl::Vector<T, D> &point) const
 {
+	using std::abs;
+
 	for(unsigned i=0; i<D; ++i)
 		if(abs(point[i])>dimensions[i]/2)
 			return false;
@@ -83,7 +85,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])
@@ -92,7 +93,7 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 		for(int j=-1; j<=1; j+=2)
 		{
 			T x = (T(j)*half_dim[i]-ray.get_start()[i])/ray.get_direction()[i];
-			if(x<0)
+			if(!ray.check_limits(x))
 				continue;
 
 			LinAl::Vector<T, D> p = ray.get_start()+ray.get_direction()*x;
@@ -108,9 +109,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]);
 				}