X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=4df03fed0eb433abb38d6df8e9375fc42f78befe;hb=fb9e6b5ff48e10ea2217cf539e0461956abf02cf;hp=abdd1939508c2a717f5856fed975da0690226a0a;hpb=313e10c1dcf5504789cc145166aece93d8141212;p=libs%2Fmath.git

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index abdd193..4df03fe 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 {
@@ -30,7 +27,7 @@ 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 unsigned get_max_ray_intersections() const { return 2; }
 	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
@@ -51,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>
@@ -73,7 +70,7 @@ 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);