X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=4df03fed0eb433abb38d6df8e9375fc42f78befe;hb=fb9e6b5ff48e10ea2217cf539e0461956abf02cf;hp=01aee0e57b22e2791763077aecb3e3193ea35843;hpb=643aa7b2317f88463f66da11e595ebe0f6c9621d;p=libs%2Fmath.git diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h index 01aee0e..4df03fe 100644 --- a/source/geometry/hypersphere.h +++ b/source/geometry/hypersphere.h @@ -2,11 +2,9 @@ #define MSP_GEOMETRY_HYPERSPHERE_H_ #include +#include #include -#include "hyperbox.h" -#include "ray.h" #include "shape.h" -#include "surfacepoint.h" namespace Msp { namespace Geometry { @@ -22,29 +20,26 @@ private: T radius; public: - HyperSphere(); + HyperSphere(): radius(1) { } explicit HyperSphere(T); virtual HyperSphere *clone() const; 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 bool check_intersection(const Ray &) const; virtual unsigned get_max_ray_intersections() const { return 2; } virtual unsigned get_intersections(const Ray &, SurfacePoint *, unsigned) const; }; -template -inline HyperSphere::HyperSphere(): - radius(1) -{ } - template inline HyperSphere::HyperSphere(T r): radius(r) -{ } +{ + if(r<=T(0)) + throw std::invalid_argument("HyperSphere::HyperShpere"); +} template inline HyperSphere *HyperSphere::clone() const @@ -53,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 @@ -67,16 +62,6 @@ inline bool HyperSphere::contains(const LinAl::Vector &point) const return inner_product(point, point)<=radius*radius; } -template -inline bool HyperSphere::check_intersection(const Ray &ray) const -{ - T x = inner_product(ray.get_direction(), ray.get_start()); - if(x>0) - return contains(ray.get_start()); - else - return contains(ray.get_start()-ray.get_direction()*x); -} - template inline unsigned HyperSphere::get_intersections(const Ray &ray, SurfacePoint *points, unsigned size) const { @@ -85,15 +70,15 @@ inline unsigned HyperSphere::get_intersections(const Ray &ray, Surfa T mid = -inner_product(ray.get_direction(), ray.get_start()); LinAl::Vector nearest = ray.get_start()+ray.get_direction()*mid; T offset_sq = radius*radius-inner_product(nearest, nearest); - if(offset_sq<0) + if(offset_sq::get_intersections(const Ray &ray, Surfa } ++n; - if(n==size) - return n; } }