X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=de028fa580d627ed06d1cb811f43b104a450ed7a;hb=cc51208545c3941fcfdb078ad0c70c7fd607614e;hp=f95ebe4182094667533e2cec0914210cb7b79337;hpb=9260eee3126731c1e6b54ce3407be757d0d71716;p=libs%2Fmath.git diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h index f95ebe4..de028fa 100644 --- a/source/geometry/hypersphere.h +++ b/source/geometry/hypersphere.h @@ -1,6 +1,8 @@ #ifndef MSP_GEOMETRY_HYPERSPHERE_H_ #define MSP_GEOMETRY_HYPERSPHERE_H_ +#include +#include #include #include "hyperbox.h" #include "ray.h" @@ -10,6 +12,10 @@ namespace Msp { namespace Geometry { +/** +A shape consisting of the points within a specific distance from the origin. +Two- and three-dimensional cases are Circle and Sphere, respectively. +*/ template class HyperSphere: public Shape { @@ -39,7 +45,10 @@ inline HyperSphere::HyperSphere(): template inline HyperSphere::HyperSphere(T r): radius(r) -{ } +{ + if(r<=T(0)) + throw std::invalid_argument("HyperSphere::HyperShpere"); +} template inline HyperSphere *HyperSphere::clone() const @@ -75,6 +84,8 @@ inline bool HyperSphere::check_intersection(const Ray &ray) const 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); @@ -86,12 +97,13 @@ inline unsigned HyperSphere::get_intersections(const Ray &ray, Surfa for(int i=-1; i<=1; i+=2) { T x = mid+offset*i; - if(x>0 && n