Make the check_intersection function non-virtual

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

diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index ed2b49ff161141e4364a5bd81773ed0c9cc16632..abdd1939508c2a717f5856fed975da0690226a0a 100644 (file)
--- 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 <cmath>
+#include <stdexcept>
 #include <msp/linal/vector.h>
 #include "hyperbox.h"
 #include "ray.h"
@@ -21,7 +23,7 @@ private:
        T radius;
 
 public:
-       HyperSphere();
+       HyperSphere(): radius(1) { }
        explicit HyperSphere(T);
 
        virtual HyperSphere *clone() const;
@@ -30,20 +32,17 @@ public:
 
        virtual HyperBox<T, D> get_axis_aligned_bounding_box() const;
        virtual bool contains(const LinAl::Vector<T, D> &) const;
-       virtual bool check_intersection(const Ray<T, D> &) const;
        virtual unsigned get_max_ray_intersections() const { return 2; }
        virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
 };
 
-template<typename T, unsigned D>
-inline HyperSphere<T, D>::HyperSphere():
-       radius(1)
-{ }
-
 template<typename T, unsigned D>
 inline HyperSphere<T, D>::HyperSphere(T r):
        radius(r)
-{ }
+{
+       if(r<=T(0))
+               throw std::invalid_argument("HyperSphere::HyperShpere");
+}
 
 template<typename T, unsigned D>
 inline HyperSphere<T, D> *HyperSphere<T, D>::clone() const
@@ -66,19 +65,11 @@ inline bool HyperSphere<T, D>::contains(const LinAl::Vector<T, D> &point) const
        return inner_product(point, point)<=radius*radius;
 }
 
-template<typename T, unsigned D>
-inline bool HyperSphere<T, D>::check_intersection(const Ray<T, D> &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<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);
@@ -87,20 +78,19 @@ inline unsigned HyperSphere<T, D>::get_intersections(const Ray<T, D> &ray, Surfa
        T offset = sqrt(offset_sq);
 
        unsigned n = 0;
-       for(int i=-1; i<=1; i+=2)
+       for(int i=-1; (n<size && i<=1); i+=2)
        {
                T x = mid+offset*i;
-               if(x>0 && n<size)
+               if(ray.check_limits(x))
                {
                        if(points)
                        {
                                points[n].position = ray.get_start()+ray.get_direction()*x;
                                points[n].normal = normalize(points[n].position);
+                               points[n].distance = x;
                        }
 
                        ++n;
-                       if(n==size)
-                               return n;
                }
        }