Make the check_intersection function non-virtual

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

diff --git a/source/geometry/shape.h b/source/geometry/shape.h
index 3f52613bef98d9df47e3c935fd4ddca213e98b82..7b1d190b5a762b82c7213a012e58190c7ba8d66c 100644 (file)
--- a/source/geometry/shape.h
+++ b/source/geometry/shape.h
@@ -33,14 +33,20 @@ public:
 
        virtual HyperBox<T, D> get_axis_aligned_bounding_box() const = 0;
        virtual bool contains(const LinAl::Vector<T, D> &) const = 0;
-       virtual bool check_intersection(const Ray<T, D> &) const = 0;
+       bool check_intersection(const Ray<T, D> &) const;
        virtual unsigned get_max_ray_intersections() const = 0;
        virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const = 0;
        std::vector<SurfacePoint<T, D> > get_intersections(const Ray<T, D> &) const;
 };
 
 template<typename T, unsigned D>
-std::vector<SurfacePoint<T, D> > Shape<T, D>::get_intersections(const Ray<T, D> &ray) const
+inline bool Shape<T, D>::check_intersection(const Ray<T, D> &ray) const
+{
+       return get_intersections(ray, 0, 1);
+}
+
+template<typename T, unsigned D>
+inline std::vector<SurfacePoint<T, D> > Shape<T, D>::get_intersections(const Ray<T, D> &ray) const
 {
        unsigned max_isect = get_max_ray_intersections();
        std::vector<SurfacePoint<T, D> > points(max_isect);