X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fhypersphere.h;h=01aee0e57b22e2791763077aecb3e3193ea35843;hb=643aa7b2317f88463f66da11e595ebe0f6c9621d;hp=48fdb8aa2b98bfeb91cee5b62c21d375ff35a247;hpb=c135ff2480f4e2aaf05b0206631bb0e1b5d73fad;p=libs%2Fmath.git diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h index 48fdb8a..01aee0e 100644 --- a/source/geometry/hypersphere.h +++ b/source/geometry/hypersphere.h @@ -1,6 +1,7 @@ #ifndef MSP_GEOMETRY_HYPERSPHERE_H_ #define MSP_GEOMETRY_HYPERSPHERE_H_ +#include #include #include "hyperbox.h" #include "ray.h" @@ -79,6 +80,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); @@ -90,7 +93,7 @@ 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