#define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
#include "affinetransformation.h"
+#include "boundingbox.h"
#include "ray.h"
#include "shape.h"
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;
}
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();
+ 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);
+
+ for(unsigned j=0; j<D; ++j)
+ {
+ min_pt[j] = std::min(min_pt[j], point[j]);
+ max_pt[j] = std::max(min_pt[j], point[j]);
+ }
+ }
+
+ return BoundingBox<T, D>(min_pt, max_pt);
}
template<typename T, unsigned D>