X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgeometry%2Fhypersphere.h;h=3c0412564fcc1cf055842c9d325943935812746a;hb=09cc3a8648dd20e9a07d669b353c4a120b67c1c4;hp=abdd1939508c2a717f5856fed975da0690226a0a;hpb=f7dcf3f0be55316bf20ac0c318dd90cb78a75c80;p=libs%2Fmath.git diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h index abdd193..3c04125 100644 --- a/source/geometry/hypersphere.h +++ b/source/geometry/hypersphere.h @@ -4,7 +4,7 @@ #include #include #include -#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 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 +51,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