X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgeometry%2Fhypersphere.h;h=6bb4352f4016840ca331ebfd2034f35a7090e7d2;hb=65b26478a62b8d715ec415164fff25fafcb35fc1;hp=de028fa580d627ed06d1cb811f43b104a450ed7a;hpb=cc51208545c3941fcfdb078ad0c70c7fd607614e;p=libs%2Fmath.git

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index de028fa..6bb4352 100644
--- a/source/geometry/hypersphere.h
+++ b/source/geometry/hypersphere.h
@@ -4,10 +4,7 @@
 #include <cmath>
 #include <stdexcept>
 #include <msp/linal/vector.h>
-#include "hyperbox.h"
-#include "ray.h"
 #include "shape.h"
-#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {
@@ -23,25 +20,19 @@ private:
 	T radius;
 
 public:
-	HyperSphere();
+	HyperSphere(): radius(1) { }
 	explicit HyperSphere(T);
 
 	virtual HyperSphere *clone() const;
 
 	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;
 };
 
-template<typename T, unsigned D>
-inline HyperSphere<T, D>::HyperSphere():
-	radius(1)
-{ }
-
 template<typename T, unsigned D>
 inline HyperSphere<T, D>::HyperSphere(T r):
 	radius(r)
@@ -57,12 +48,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>
@@ -71,16 +62,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,26 +70,25 @@ inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, Surfa
 	T mid = -inner_product(ray.get_direction(), ray.get_start());
 	LinAl::Vector<T, D> nearest = ray.get_start()+ray.get_direction()*mid;
 	T offset_sq = radius*radius-inner_product(nearest, nearest);
-	if(offset_sq<0)
+	if(offset_sq<T(0))
 		return 0;
 	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)
 			{
 				points[n].position = ray.get_start()+ray.get_direction()*x;
 				points[n].normal = normalize(points[n].position);
 				points[n].distance = x;
+				points[n].entry = (i<0);
 			}
 
 			++n;
-			if(n==size)
-				return n;
 		}
 	}