X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Ftransformedshape.h;h=6a14b0b75a1951f69a72cc9c3034fb56161dfc49;hb=7de28b9c89ca4554f5c12746f481f5b385529479;hp=90c37b0bb0a2b234c0e7929796846c25cc7e4648;hpb=24f239e418599c13a9d0bdc4942c188ccf0a8437;p=libs%2Fmath.git

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 90c37b0..6a14b0b 100644
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -2,7 +2,6 @@
 #define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
 
 #include "affinetransformation.h"
-#include "ray.h"
 #include "shape.h"
 
 namespace Msp {
@@ -30,12 +29,8 @@ 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 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;
 };
@@ -48,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)
@@ -76,10 +71,9 @@ 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>
@@ -88,24 +82,10 @@ inline bool TransformedShape<T, D>::contains(const LinAl::Vector<T, D> &point) c
 	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)
@@ -115,7 +95,7 @@ inline unsigned TransformedShape<T, D>::get_intersections(const Ray<T, D> &ray,
 			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);
+			points[i].normal = transformation.transform_linear(points[i].normal);
 			points[i].distance = inner_product(points[i].position-ray.get_start(), ray.get_direction());
 		}
 	}