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

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 7d363f2..9a161f3 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <stdexcept>
 #include <msp/linal/vector.h>
 #include "ray.h"
 #include "shape.h"
@@ -47,7 +48,11 @@ inline HyperBox<T, D>::HyperBox()
 template<typename T, unsigned D>
 inline HyperBox<T, D>::HyperBox(const LinAl::Vector<T, D> &d):
 	dimensions(d)
-{ }
+{
+	for(unsigned i=0; i<D; ++i)
+		if(dimensions[i]<=T(0))
+			throw std::invalid_argument("HyperBox::HyperBox");
+}
 
 template<typename T, unsigned D>
 inline HyperBox<T, D> *HyperBox<T, D>::clone() const
@@ -64,8 +69,10 @@ 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)
+		if(abs(point[i])>dimensions[i]/T(2))
 			return false;
 	return true;
 }
@@ -81,18 +88,20 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 {
 	using std::abs;
 
+	if(size>2)
+		size = 2;
+
 	LinAl::Vector<T, D> half_dim = dimensions/T(2);
 	unsigned n = 0;
-	T first_depth = T();
-	for(unsigned i=0; i<D; ++i)
+	for(unsigned i=0; (n<size && i<D); ++i)
 	{
 		if(!ray.get_direction()[i])
 			continue;
 
-		for(int j=-1; j<=1; j+=2)
+		for(int j=-1; (n<size && 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;
@@ -101,22 +110,20 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 			for(unsigned k=0; (inside && k<D); ++k)
 				inside = (k==i || abs(p[k])<=half_dim[k]);
 
-			if(inside && n<size)
+			if(inside)
 			{
 				if(points)
 				{
 					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]);
 				}
 
 				++n;
-				if(n==size || n==2)
-					return n;
 			}
 		}
 	}