X-Git-Url: http://git.tdb.fi/?p=libs%2Fmath.git;a=blobdiff_plain;f=source%2Fgeometry%2Fcompositeshape.h;h=4c640be22f4c5045076b9659ce7734d517f1127c;hp=50075d923b70c3c38f6671ae6ed585fe75f95ec1;hb=09cc3a8648dd20e9a07d669b353c4a120b67c1c4;hpb=f7dcf3f0be55316bf20ac0c318dd90cb78a75c80 diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h index 50075d9..4c640be 100644 --- a/source/geometry/compositeshape.h +++ b/source/geometry/compositeshape.h @@ -3,6 +3,7 @@ #include #include +#include "boundingbox.h" #include "shape.h" namespace Msp { @@ -29,7 +30,7 @@ protected: public: virtual ~CompositeShape(); - virtual HyperBox get_axis_aligned_bounding_box() const; + virtual BoundingBox get_axis_aligned_bounding_box() const; virtual bool contains(const LinAl::Vector &) const; virtual unsigned get_max_ray_intersections() const; virtual unsigned get_intersections(const Ray &, SurfacePoint *, unsigned) const; @@ -70,9 +71,9 @@ inline CompositeShape::~CompositeShape() } template -inline HyperBox CompositeShape::get_axis_aligned_bounding_box() const +inline BoundingBox CompositeShape::get_axis_aligned_bounding_box() const { - HyperBox aabb; + BoundingBox aabb; for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i) { if(i==shapes.begin())