X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Ftransformedshape.h;h=02587bfd87877efac86f365d39e1a68e072a7020;hb=313e10c1dcf5504789cc145166aece93d8141212;hp=34fd2989f2cfeaadddcf40ef6822ae2fb37c62d0;hpb=c135ff2480f4e2aaf05b0206631bb0e1b5d73fad;p=libs%2Fmath.git

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 34fd298..02587bf 100644
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -32,7 +32,9 @@ public:
 
 	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const;
 	virtual bool contains(const LinAl::Vector<T, D> &) const;
-	virtual bool check_intersection(const Ray<T, D> &) const;
+private:
+	Ray<T, D> make_local_ray(const Ray<T, D> &) const;
+public:
 	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;
 };
@@ -45,7 +47,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)
@@ -86,18 +88,18 @@ inline bool TransformedShape<T, D>::contains(const LinAl::Vector<T, D> &point) c
 }
 
 template<typename T, unsigned D>
-inline bool TransformedShape<T, D>::check_intersection(const Ray<T, D> &ray) const
+inline Ray<T, D> TransformedShape<T, D>::make_local_ray(const Ray<T, D> &ray) 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);
+	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 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()));
+	Ray<T, D> local_ray = make_local_ray(ray);
+
 	unsigned count = shape->get_intersections(local_ray, points, size);
 	if(points)
 	{
@@ -106,7 +108,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());
 		}
 	}