X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=e2e3102014a1f73a9cfb9411d9b90638c937f851;hb=e4b75401bd773201deb00eff672ee34794479671;hp=abdd1939508c2a717f5856fed975da0690226a0a;hpb=313e10c1dcf5504789cc145166aece93d8141212;p=libs%2Fmath.git diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h index abdd193..e2e3102 100644 --- a/source/geometry/hypersphere.h +++ b/source/geometry/hypersphere.h @@ -4,10 +4,7 @@ #include #include #include -#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 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 { return 2; } virtual unsigned get_intersections(const Ray &, SurfacePoint *, unsigned) const; @@ -51,12 +48,12 @@ inline HyperSphere *HyperSphere::clone() const } template -inline HyperBox HyperSphere::get_axis_aligned_bounding_box() const +inline BoundingBox HyperSphere::get_axis_aligned_bounding_box() const { - LinAl::Vector dimensions; + LinAl::Vector extent; for(unsigned i=0; i(dimensions); + extent[i] = radius; + return BoundingBox(-extent, extent); } template