- // TODO cache the inverse transformation for performance
- LinAl::SquareMatrix<T, D+1> inverse_trans = LinAl::invert(transformation.get_matrix());
- Ray<T, D> trans_ray(reduce_vector(inverse_trans*augment_vector(ray.get_start(), T(1))),
- reduce_vector(inverse_trans*augment_vector(ray.get_direction(), T(0))));
- return shape->check_intersection(trans_ray);
+ Ray<T, D> local_ray(inverse_trans.transform(ray.get_start()),
+ inverse_trans.transform_linear(ray.get_direction()));
+ return shape->check_intersection(local_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(inverse_trans.transform(ray.get_start()),
+ inverse_trans.transform_linear(ray.get_direction()));
+ unsigned count = shape->get_intersections(local_ray, points, size);
+ if(points)
+ {
+ for(unsigned i=0; i<count; ++i)
+ {
+ points[i].position = transformation.transform(points[i].position);
+ /* XXX This is not correct for nonuniform scaling. Inverse of the
+ transpose of the upper DxD part of the matrix should be used. */
+ points[i].normal = transformation.transform(points[i].normal);
+ }
+ }
+ return count;