#define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
#include "affinetransformation.h"
-#include "ray.h"
#include "shape.h"
namespace Msp {
const Shape<T, D> &get_shape() const { return *shape; }
const AffineTransformation<T, D> &get_transformation() const { return transformation; }
- virtual HyperBox<T, D> get_axis_aligned_bounding_box() const;
+ 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 bool check_intersection(const Ray<T, D> &) const;
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;
};
}
template<typename T, unsigned D>
-inline HyperBox<T, D> TransformedShape<T, D>::get_axis_aligned_bounding_box() const
+inline BoundingBox<T, D> TransformedShape<T, D>::get_axis_aligned_bounding_box() const
{
- // XXX This is not correct for most shapes
- return shape->get_axis_aligned_bounding_box();
+ return transformation.transform(shape->get_axis_aligned_bounding_box());
}
template<typename T, unsigned D>
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 bool TransformedShape<T, D>::check_intersection(const Ray<T, D> &ray) const
-{
- return shape->check_intersection(make_local_ray(ray));
-}
-
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)