X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Ftransformedshape.h;h=f214e4bb1aa9c578308088f2475879debc726378;hb=de53838941cc8ccf00aeffa77c28d915317879bd;hp=01253680f6340a9ed277f76664b906313f8314e2;hpb=adb812a194961d542dcb0abd61258cbc8723ecd9;p=libs%2Fmath.git

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 0125368..f214e4b 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,9 +29,11 @@ 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;
-	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 +46,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)
@@ -73,10 +74,36 @@ 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();
+	BoundingBox<T, D> inner_bbox = shape->get_axis_aligned_bounding_box();
+
+	LinAl::Vector<T, D> min_pt;
+	LinAl::Vector<T, D> max_pt;
+	for(unsigned i=0; i<(1<<D); ++i)
+	{
+		LinAl::Vector<T, D> point;
+		for(unsigned j=0; j<D; ++j)
+			point[j] = ((i>>j)&1 ? inner_bbox.get_maximum_coordinate(j) : inner_bbox.get_minimum_coordinate(j));
+
+		point = transformation.transform(point);
+
+		if(i==0)
+		{
+			min_pt = point;
+			max_pt = point;
+		}
+		else
+		{
+			for(unsigned j=0; j<D; ++j)
+			{
+				min_pt[j] = std::min(min_pt[j], point[j]);
+				max_pt[j] = std::max(max_pt[j], point[j]);
+			}
+		}
+	}
+
+	return BoundingBox<T, D>(min_pt, max_pt);
 }
 
 template<typename T, unsigned D>
@@ -86,18 +113,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 +133,8 @@ 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());
 		}
 	}
 	return count;