- Ray<T, D> local_ray(inverse_trans.transform(ray.get_start()),
- inverse_trans.transform_linear(ray.get_direction()));
- return shape->check_intersection(local_ray);
+ return shape->contains(inverse_trans.transform(point));
+}
+
+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);
+
+ 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_linear(points[i].normal);
+ points[i].distance = inner_product(points[i].position-ray.get_start(), ray.get_direction());
+ }
+ }
+ return count;