Math function usage fixes

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

diff --git a/source/geometry/hyperbox.h b/source/geometry/hyperbox.h
index 10c28d5d1f4c20a15937e7b0aa696f3074151aec..865b968902f078b25297138786f3602fbafa9260 100644 (file)
--- a/source/geometry/hyperbox.h
+++ b/source/geometry/hyperbox.h
@@ -64,6 +64,8 @@ inline T HyperBox<T, D>::get_dimension(unsigned i) const
 template<typename T, unsigned D>
 inline bool HyperBox<T, D>::contains(const LinAl::Vector<T, D> &point) const
 {
+       using std::abs;
+
        for(unsigned i=0; i<D; ++i)
                if(abs(point[i])>dimensions[i]/2)
                        return false;
@@ -91,7 +93,7 @@ inline unsigned HyperBox<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
                for(int j=-1; j<=1; j+=2)
                {
                        T x = (T(j)*half_dim[i]-ray.get_start()[i])/ray.get_direction()[i];
-                       if(x<0)
+                       if(!ray.check_limits(x))
                                continue;
 
                        LinAl::Vector<T, D> p = ray.get_start()+ray.get_direction()*x;