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

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 6248d6b..0e4efd8 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"
@@ -11,6 +12,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>
 {
@@ -43,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
@@ -60,6 +69,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;
@@ -79,7 +90,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])
@@ -88,7 +98,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;
@@ -104,9 +114,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]);
 				}