X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhyperbox.h;h=b9fad33d620d205f1a5043e002cb88556cbc6e32;hb=818f9df5f383adad815f6f3276bfc1fa30c25681;hp=845ca346eaffedf3aad1a4899b54c281c9593ff9;hpb=24f239e418599c13a9d0bdc4942c188ccf0a8437;p=libs%2Fmath.git

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 845ca34..b9fad33 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -3,10 +3,9 @@
 
 #include <algorithm>
 #include <cmath>
+#include <stdexcept>
 #include <msp/linal/vector.h>
-#include "ray.h"
 #include "shape.h"
-#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {
@@ -30,9 +29,8 @@ public:
 	const LinAl::Vector<T, D> &get_dimensions() const { return dimensions; }
 	T get_dimension(unsigned) const;
 
-	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const { return *this; }
+	virtual BoundingBox<T, D> get_axis_aligned_bounding_box() const;
 	virtual bool contains(const LinAl::Vector<T, D> &) const;
-	virtual bool check_intersection(const Ray<T, D> &) const;
 	virtual unsigned get_max_ray_intersections() const { return 2; }
 	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
 };
@@ -47,7 +45,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
@@ -62,18 +64,21 @@ 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
+inline BoundingBox<T, D> HyperBox<T, D>::get_axis_aligned_bounding_box() const
 {
-	for(unsigned i=0; i<D; ++i)
-		if(abs(point[i])>dimensions[i]/2)
-			return false;
-	return true;
+	LinAl::Vector<T, D> half_dim = dimensions/T(2);
+	return BoundingBox<T, D>(-half_dim, half_dim);
 }
 
 template<typename T, unsigned D>
-inline bool HyperBox<T, D>::check_intersection(const Ray<T, D> &ray) const
+inline bool HyperBox<T, D>::contains(const LinAl::Vector<T, D> &point) const
 {
-	return get_intersections(ray, 0, 1);
+	using std::abs;
+
+	for(unsigned i=0; i<D; ++i)
+		if(abs(point[i])>dimensions[i]/T(2))
+			return false;
+	return true;
 }
 
 template<typename T, unsigned D>
@@ -81,14 +86,17 @@ 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;
-	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(!ray.check_limits(x))
@@ -100,22 +108,30 @@ 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;
-					points[n].distance = x;
-
-					if(n==1 && x<points[0].distance)
-						std::swap(points[0], points[1]);
+					bool entry = (T(j)*ray.get_direction()[i]<T(0));
+					unsigned k = 0;
+					if(n>0 && entry!=points[0].entry)
+					{
+						if(entry)
+							points[1] = points[0];
+						else
+							++k;
+					}
+					if(k<n && entry==points[k].entry)
+						--n;
+
+					points[k].position = p;
+					points[k].normal = LinAl::Vector<T, D>();
+					points[k].normal[i] = j;
+					points[k].distance = x;
+					points[k].entry = (T(j)*ray.get_direction()[i]<T(0));
 				}
 
 				++n;
-				if(n==size || n==2)
-					return n;
 			}
 		}
 	}