Put the common #includes in shape.h

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

diff --git a/source/geometry/shape.h b/source/geometry/shape.h
index 7b1d190b5a762b82c7213a012e58190c7ba8d66c..22b18876620657e9f2858ea568196cc66a2d3f9c 100644 (file)
--- a/source/geometry/shape.h
+++ b/source/geometry/shape.h
@@ -3,19 +3,13 @@
 
 #include <vector>
 #include <msp/linal/vector.h>
+#include "boundingbox.h"
+#include "ray.h"
+#include "surfacepoint.h"
 
 namespace Msp {
 namespace Geometry {
 
-template<typename T, unsigned D>
-class HyperBox;
-
-template<typename T, unsigned D>
-class Ray;
-
-template<typename T, unsigned D>
-class SurfacePoint;
-
 /**
 Base class and interface for geometric shapes.  Shapes may be bounded or
 unbounded.  They are always considered to be solid, i.e. have a distinct inside
@@ -31,7 +25,7 @@ public:
 
        virtual Shape *clone() const = 0;
 
-       virtual HyperBox<T, D> get_axis_aligned_bounding_box() const = 0;
+       virtual BoundingBox<T, D> get_axis_aligned_bounding_box() const = 0;
        virtual bool contains(const LinAl::Vector<T, D> &) const = 0;
        bool check_intersection(const Ray<T, D> &) const;
        virtual unsigned get_max_ray_intersections() const = 0;