Put ray and bounding box transformations in AffineTransformation

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

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index f214e4bb1aa9c578308088f2475879debc726378..6a14b0b75a1951f69a72cc9c3034fb56161dfc49 100644 (file)
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -31,9 +31,6 @@ public:
 
        virtual BoundingBox<T, D> get_axis_aligned_bounding_box() const;
        virtual bool contains(const LinAl::Vector<T, D> &) const;
-private:
-       Ray<T, D> make_local_ray(const Ray<T, D> &) const;
-public:
        virtual unsigned get_max_ray_intersections() const { return shape->get_max_ray_intersections(); }
        virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
 };
@@ -76,34 +73,7 @@ inline TransformedShape<T, D> *TransformedShape<T, D>::clone() const
 template<typename T, unsigned D>
 inline BoundingBox<T, D> TransformedShape<T, D>::get_axis_aligned_bounding_box() const
 {
-       BoundingBox<T, D> inner_bbox = shape->get_axis_aligned_bounding_box();
-
-       LinAl::Vector<T, D> min_pt;
-       LinAl::Vector<T, D> max_pt;
-       for(unsigned i=0; i<(1<<D); ++i)
-       {
-               LinAl::Vector<T, D> point;
-               for(unsigned j=0; j<D; ++j)
-                       point[j] = ((i>>j)&1 ? inner_bbox.get_maximum_coordinate(j) : inner_bbox.get_minimum_coordinate(j));
-
-               point = transformation.transform(point);
-
-               if(i==0)
-               {
-                       min_pt = point;
-                       max_pt = point;
-               }
-               else
-               {
-                       for(unsigned j=0; j<D; ++j)
-                       {
-                               min_pt[j] = std::min(min_pt[j], point[j]);
-                               max_pt[j] = std::max(max_pt[j], point[j]);
-                       }
-               }
-       }
-
-       return BoundingBox<T, D>(min_pt, max_pt);
+       return transformation.transform(shape->get_axis_aligned_bounding_box());
 }
 
 template<typename T, unsigned D>
@@ -112,18 +82,10 @@ inline bool TransformedShape<T, D>::contains(const LinAl::Vector<T, D> &point) c
        return shape->contains(inverse_trans.transform(point));
 }
 
-template<typename T, unsigned D>
-inline Ray<T, D> TransformedShape<T, D>::make_local_ray(const Ray<T, D> &ray) const
-{
-       LinAl::Vector<T, D> local_dir = inverse_trans.transform_linear(ray.get_direction());
-       float distortion = local_dir.norm();
-       return Ray<T, D>(inverse_trans.transform(ray.get_start()), local_dir, ray.get_limit()*distortion);
-}
-
 template<typename T, unsigned D>
 inline unsigned TransformedShape<T, D>::get_intersections(const Ray<T, D> &ray, SurfacePoint<T, D> *points, unsigned size) const
 {
-       Ray<T, D> local_ray = make_local_ray(ray);
+       Ray<T, D> local_ray = inverse_trans.transform(ray);
 
        unsigned count = shape->get_intersections(local_ray, points, size);
        if(points)