Math function usage fixes

[libs/math.git] / source / geometry / hypersphere.h

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index f95ebe4182094667533e2cec0914210cb7b79337..01aee0e57b22e2791763077aecb3e3193ea35843 100644 (file)
--- 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 <cmath>
 #include <msp/linal/vector.h>
 #include "hyperbox.h"
 #include "ray.h"
@@ -10,6 +11,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<typename T, unsigned D>
 class HyperSphere: public Shape<T, D>
 {
@@ -75,6 +80,8 @@ inline bool HyperSphere<T, D>::check_intersection(const Ray<T, D> &ray) const
 template<typename T, unsigned D>
 inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, SurfacePoint<T, D> *points, unsigned size) const
 {
+       using std::sqrt;
+
        T mid = -inner_product(ray.get_direction(), ray.get_start());
        LinAl::Vector<T, D> nearest = ray.get_start()+ray.get_direction()*mid;
        T offset_sq = radius*radius-inner_product(nearest, nearest);
@@ -86,12 +93,13 @@ inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, Surfa
        for(int i=-1; i<=1; i+=2)
        {
                T x = mid+offset*i;
-               if(x>0 && n<size)
+               if(ray.check_limits(x) && n<size)
                {
                        if(points)
                        {
                                points[n].position = ray.get_start()+ray.get_direction()*x;
                                points[n].normal = normalize(points[n].position);
+                               points[n].distance = x;
                        }
 
                        ++n;