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

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 0e4efd8..11c197e 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -33,7 +33,6 @@ public:
 
 	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const { return *this; }
 	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;
 };
@@ -72,30 +71,27 @@ 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;
 }
 
-template<typename T, unsigned D>
-inline bool HyperBox<T, D>::check_intersection(const Ray<T, D> &ray) const
-{
-	return get_intersections(ray, 0, 1);
-}
-
 template<typename T, unsigned D>
 inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfacePoint<T, D> *points, unsigned size) const
 {
 	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))
@@ -107,7 +103,7 @@ 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)
 				{
@@ -121,8 +117,6 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 				}
 
 				++n;
-				if(n==size || n==2)
-					return n;
 			}
 		}
 	}