Implement bounding boxes with a separate class

[libs/math.git] / source / geometry / hypersphere.h

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index abdd1939508c2a717f5856fed975da0690226a0a..3c0412564fcc1cf055842c9d325943935812746a 100644 (file)
--- 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,7 +30,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 +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>