X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=3c0412564fcc1cf055842c9d325943935812746a;hb=09cc3a8648dd20e9a07d669b353c4a120b67c1c4;hp=35cddd1ac36461f4ee2a0e00122abda491ce3b0a;hpb=1e34b120f1229b1390cee67c917829715615ccd0;p=libs%2Fmath.git

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index 35cddd1..3c04125 100644
--- a/source/geometry/hypersphere.h
+++ b/source/geometry/hypersphere.h
@@ -4,7 +4,7 @@
 #include <cmath>
 #include <stdexcept>
 #include <msp/linal/vector.h>
-#include "hyperbox.h"
+#include "boundingbox.h"
 #include "ray.h"
 #include "shape.h"
 #include "surfacepoint.h"
@@ -30,9 +30,8 @@ public:
 
 	T get_radius() const { return radius; }
 
-	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const;
+	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;
 };
@@ -52,12 +51,12 @@ inline HyperSphere<T, D> *HyperSphere<T, D>::clone() const
 }
 
 template<typename T, unsigned D>
-inline HyperBox<T, D> HyperSphere<T, D>::get_axis_aligned_bounding_box() const
+inline BoundingBox<T, D> HyperSphere<T, D>::get_axis_aligned_bounding_box() const
 {
-	LinAl::Vector<T, D> dimensions;
+	LinAl::Vector<T, D> extent;
 	for(unsigned i=0; i<D; ++i)
-		dimensions[i] = radius;
-	return HyperBox<T, D>(dimensions);
+		extent[i] = radius;
+	return BoundingBox<T, D>(-extent, extent);
 }
 
 template<typename T, unsigned D>
@@ -66,16 +65,6 @@ inline bool HyperSphere<T, D>::contains(const LinAl::Vector<T, D> &point) const
 	return inner_product(point, point)<=radius*radius;
 }
 
-template<typename T, unsigned D>
-inline bool HyperSphere<T, D>::check_intersection(const Ray<T, D> &ray) const
-{
-	T x = inner_product(ray.get_direction(), ray.get_start());
-	if(x>0)
-		return contains(ray.get_start());
-	else
-		return contains(ray.get_start()-ray.get_direction()*x);
-}
-
 template<typename T, unsigned D>
 inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, SurfacePoint<T, D> *points, unsigned size) const
 {
@@ -89,10 +78,10 @@ inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, Surfa
 	T offset = sqrt(offset_sq);
 
 	unsigned n = 0;
-	for(int i=-1; i<=1; i+=2)
+	for(int i=-1; (n<size && i<=1); i+=2)
 	{
 		T x = mid+offset*i;
-		if(ray.check_limits(x) && n<size)
+		if(ray.check_limits(x))
 		{
 			if(points)
 			{
@@ -102,8 +91,6 @@ inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, Surfa
 			}
 
 			++n;
-			if(n==size)
-				return n;
 		}
 	}