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

diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 0125368..168fbd9 100644
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -1,8 +1,7 @@
 #ifndef MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
 #define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_
 
-#include "affinetransformation.h"
-#include "ray.h"
+#include "affinetransform.h"
 #include "shape.h"
 
 namespace Msp {
@@ -16,11 +15,11 @@ class TransformedShape: public Shape<T, D>
 {
 private:
 	Shape<T, D> *shape;
-	AffineTransformation<T, D> transformation;
-	AffineTransformation<T, D> inverse_trans;
+	AffineTransform<T, D> transformation;
+	AffineTransform<T, D> inverse_trans;
 
 public:
-	TransformedShape(const Shape<T, D> &, const AffineTransformation<T, D> &);
+	TransformedShape(const Shape<T, D> &, const AffineTransform<T, D> &);
 	TransformedShape(const TransformedShape &);
 	TransformedShape &operator=(const TransformedShape &);
 	~TransformedShape();
@@ -28,24 +27,24 @@ public:
 	virtual TransformedShape *clone() const;
 
 	const Shape<T, D> &get_shape() const { return *shape; }
-	const AffineTransformation<T, D> &get_transformation() const { return transformation; }
+	const AffineTransform<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(unsigned = 0) const;
 	virtual bool contains(const LinAl::Vector<T, D> &) const;
-	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;
+	virtual Coverage get_coverage(const BoundingBox<T, D> &) const;
 };
 
 template<typename T, unsigned D>
-inline TransformedShape<T, D>::TransformedShape(const Shape<T, D> &s, const AffineTransformation<T, D> &t):
+inline TransformedShape<T, D>::TransformedShape(const Shape<T, D> &s, const AffineTransform<T, D> &t):
 	shape(s.clone()),
 	transformation(t),
 	inverse_trans(invert(t))
 { }
 
 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 +72,12 @@ 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(unsigned detail) const
 {
-	// XXX This is not correct for most shapes
-	return shape->get_axis_aligned_bounding_box();
+	if(detail)
+		return this->bisect_axis_aligned_bounding_box(detail);
+
+	return transformation.transform(shape->get_axis_aligned_bounding_box());
 }
 
 template<typename T, unsigned D>
@@ -85,19 +86,11 @@ 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 bool TransformedShape<T, D>::check_intersection(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);
-}
-
 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 = inverse_trans.transform(ray);
+
 	unsigned count = shape->get_intersections(local_ray, points, size);
 	if(points)
 	{
@@ -106,12 +99,42 @@ 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;
 }
 
+template<typename T, unsigned D>
+inline Coverage TransformedShape<T, D>::get_coverage(const BoundingBox<T, D> &bbox) const
+{
+	BoundingBox<T, D> local_bbox = inverse_trans.transform(bbox);
+	Coverage coverage = shape->get_coverage(local_bbox);
+	if(coverage==PARTIAL_COVERAGE)
+	{
+		BoundingBox<T, D> outer_bbox = transformation.transform(local_bbox);
+		LinAl::Vector<T, D> min_pt = local_bbox.get_minimum_point();
+		LinAl::Vector<T, D> max_pt = local_bbox.get_maximum_point();
+		for(unsigned i=0; i<D; ++i)
+		{
+			T scale_ratio = (1-bbox.get_dimension(i)/outer_bbox.get_dimension(i))*local_bbox.get_dimension(i);
+			T low_gap = bbox.get_minimum_coordinate(i)-outer_bbox.get_minimum_coordinate(i);
+			T high_gap = outer_bbox.get_maximum_coordinate(i)-bbox.get_maximum_coordinate(i);
+			min_pt[i] += low_gap*scale_ratio;
+			max_pt[i] -= high_gap-scale_ratio;
+		}
+
+		local_bbox = BoundingBox<T, D>(min_pt, max_pt);
+		if(shape->get_coverage(local_bbox)>=PARTIAL_COVERAGE)
+			return PARTIAL_COVERAGE;
+		else
+			return UNCERTAIN_COVERAGE;
+	}
+	else
+		return coverage;
+}
+
 } // namespace Geometry
 } // namespace Msp