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

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 11c197e..e45fadc 100644
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -5,9 +5,7 @@
 #include <cmath>
 #include <stdexcept>
 #include <msp/linal/vector.h>
-#include "ray.h"
 #include "shape.h"
-#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {
@@ -31,7 +29,7 @@ public:
 	const LinAl::Vector<T, D> &get_dimensions() const { return dimensions; }
 	T get_dimension(unsigned) const;
 
-	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const { return *this; }
+	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;
@@ -65,6 +63,13 @@ inline T HyperBox<T, D>::get_dimension(unsigned i) const
 	return dimensions[i];
 }
 
+template<typename T, unsigned D>
+inline BoundingBox<T, D> HyperBox<T, D>::get_axis_aligned_bounding_box() const
+{
+	LinAl::Vector<T, D> half_dim = dimensions/T(2);
+	return BoundingBox<T, D>(-half_dim, half_dim);
+}
+
 template<typename T, unsigned D>
 inline bool HyperBox<T, D>::contains(const LinAl::Vector<T, D> &point) const
 {