X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=6bb4352f4016840ca331ebfd2034f35a7090e7d2;hb=7919982691f0b8c69d8bef1bf6471b1e7a312163;hp=48fdb8aa2b98bfeb91cee5b62c21d375ff35a247;hpb=c135ff2480f4e2aaf05b0206631bb0e1b5d73fad;p=libs%2Fmath.git diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h index 48fdb8a..6bb4352 100644 --- a/source/geometry/hypersphere.h +++ b/source/geometry/hypersphere.h @@ -1,11 +1,10 @@ #ifndef MSP_GEOMETRY_HYPERSPHERE_H_ #define MSP_GEOMETRY_HYPERSPHERE_H_ +#include +#include #include -#include "hyperbox.h" -#include "ray.h" #include "shape.h" -#include "surfacepoint.h" namespace Msp { namespace Geometry { @@ -21,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 @@ -52,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 @@ -66,42 +62,33 @@ 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 { + using std::sqrt; + 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_sq0 && n