X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Ftransformedshape.h;h=6a14b0b75a1951f69a72cc9c3034fb56161dfc49;hb=4bb4d03d5a6a0252083d6bc45b8a50fe7b504c51;hp=2168126242ab88d1823230ac3b56f34df0eaa564;hpb=6843cbaeaca73ecdbebe852b7e7899ce48f8a83c;p=libs%2Fmath.git

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 2168126..6a14b0b 100644
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -2,12 +2,14 @@
 #define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
 
 #include "affinetransformation.h"
-#include "ray.h"
 #include "shape.h"
 
 namespace Msp {
 namespace Geometry {
 
+/**
+A shape modified by an affine transformation.
+*/
 template<typename T, unsigned D>
 class TransformedShape: public Shape<T, D>
 {
@@ -27,8 +29,10 @@ public:
 	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 bool check_intersection(const Ray<T, D> &) const;
+	virtual BoundingBox<T, D> get_axis_aligned_bounding_box() const;
+	virtual bool contains(const LinAl::Vector<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>
@@ -39,7 +43,7 @@ inline TransformedShape<T, D>::TransformedShape(const Shape<T, D> &s, const Affi
 { }
 
 template<typename T, unsigned D>
-inline TransformedShape<T, D>::TransformedShape(const TransformedShape &other):
+inline TransformedShape<T, D>::TransformedShape(const TransformedShape<T, D> &other):
 	shape(other.shape->clone()),
 	transformation(other.transformation),
 	inverse_trans(other.inverse_trans)
@@ -67,18 +71,35 @@ inline TransformedShape<T, D> *TransformedShape<T, D>::clone() 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>
-inline bool TransformedShape<T, D>::check_intersection(const Ray<T, D> &ray) const
+inline bool TransformedShape<T, D>::contains(const LinAl::Vector<T, D> &point) const
 {
-	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;
 }
 
 } // namespace Geometry