X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fextrudedshape.h;h=bacea7c3e54e208f6ef246bfa4dd719aa2aeb8ac;hb=fb9e6b5ff48e10ea2217cf539e0461956abf02cf;hp=7aeedb0cd146e30e761e3c88b41d54dde680cdfb;hpb=827b227ae53884109b6885ccd1424dda8c0b3725;p=libs%2Fmath.git

diff --git a/source/geometry/extrudedshape.h b/source/geometry/extrudedshape.h
index 7aeedb0..bacea7c 100644
--- a/source/geometry/extrudedshape.h
+++ b/source/geometry/extrudedshape.h
@@ -31,9 +31,8 @@ public:
 	const Shape<T, D-1> &get_base() const { return *base; }
 	T get_length() const { return length; }
 
-	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;
 	virtual unsigned get_max_ray_intersections() const;
 	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
 };
@@ -42,7 +41,7 @@ template<typename T, unsigned D>
 inline ExtrudedShape<T, D>::ExtrudedShape(const Shape<T, D-1> &b, T l):
 	length(l)
 {
-	if(l<=0)
+	if(l<=T(0))
 		throw std::invalid_argument("ExtrudedShape::ExtrudedShape");
 
 	base = b.clone();
@@ -75,10 +74,12 @@ inline ExtrudedShape<T, D> *ExtrudedShape<T, D>::clone() const
 }
 
 template<typename T, unsigned D>
-inline HyperBox<T, D> ExtrudedShape<T, D>::get_axis_aligned_bounding_box() const
+inline BoundingBox<T, D> ExtrudedShape<T, D>::get_axis_aligned_bounding_box() const
 {
-	HyperBox<T, D-1> base_bbox = base->get_axis_aligned_bounding_box();
-	return HyperBox<T, D>(LinAl::Vector<T, D>(base_bbox.get_dimensions(), length));
+	BoundingBox<T, D-1> base_bbox = base->get_axis_aligned_bounding_box();
+	T half_length = length/T(2);
+	return BoundingBox<T, D>(compose(base_bbox.get_minimum_point(), -half_length),
+		compose(base_bbox.get_maximum_point(), half_length));
 }
 
 template<typename T, unsigned D>
@@ -89,13 +90,7 @@ inline bool ExtrudedShape<T, D>::contains(const LinAl::Vector<T, D> &point) cons
 	if(abs(point[D-1])>length/T(2))
 		return false;
 
-	return base->contains(LinAl::Vector<T, D-1>(point));
-}
-
-template<typename T, unsigned D>
-inline bool ExtrudedShape<T, D>::check_intersection(const Ray<T, D> &ray) const
-{
-	return get_intersections(ray, 0, 1);
+	return base->contains(point.template slice<D-1>(0));
 }
 
 template<typename T, unsigned D>
@@ -113,7 +108,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 	T half_length = length/T(2);
 	const LinAl::Vector<T, D> &ray_start = ray.get_start();
 	const LinAl::Vector<T, D> &ray_direction = ray.get_direction();
-	LinAl::Vector<T, D-1> base_dir(ray_direction);
+	LinAl::Vector<T, D-1> base_dir = ray_direction.template slice<D-1>(0);
 
 	/* If the ray does not degenerate to a point in the base space, it could
 	intersect the base shape. */
@@ -130,28 +125,32 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 			if(offset<T(0))
 				offset = T(0);
 		}
-		T distortion = base_dir.norm();
-		Ray<T, D-1> base_ray(LinAl::Vector<T, D-1>(ray_start+ray_direction*offset),
-			base_dir, (limit-offset)*distortion);
-
-		SurfacePoint<T, D-1> *base_points = 0;
-		if(points)
-			/* Shamelessly reuse the provided storage.  Align to the end of the array
-			so processing can start from the first (nearest) point. */
-			base_points = reinterpret_cast<SurfacePoint<T, D-1> *>(points+size)-size;
-
-		unsigned count = base->get_intersections(base_ray, base_points, size);
-		for(unsigned i=0; (n<size && i<count); ++i)
+
+		if(limit>=offset)
 		{
+			T distortion = base_dir.norm();
+			Ray<T, D-1> base_ray((ray_start+ray_direction*offset).template slice<D-1>(0),
+				base_dir, (limit-offset)*distortion);
+
+			SurfacePoint<T, D-1> *base_points = 0;
 			if(points)
+				/* Shamelessly reuse the provided storage.  Align to the end of the array
+				so processing can start from the first (nearest) point. */
+				base_points = reinterpret_cast<SurfacePoint<T, D-1> *>(points+size)-size;
+
+			unsigned count = base->get_intersections(base_ray, base_points, size);
+			for(unsigned i=0; (n<size && i<count); ++i)
 			{
-				T x = offset+base_points[i].distance/distortion;
-				points[n].position = ray_start+ray_direction*x;
-				points[n].normal = LinAl::Vector<T, D>(base_points[i].normal, T(0));
-				points[n].distance = x;
-			}
+				if(points)
+				{
+					T x = offset+base_points[i].distance/distortion;
+					points[n].position = ray_start+ray_direction*x;
+					points[n].normal = compose(base_points[i].normal, T(0));
+					points[n].distance = x;
+				}
 
-			++n;
+				++n;
+			}
 		}
 	}
 
@@ -166,7 +165,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 				continue;
 
 			LinAl::Vector<T, D> p = ray_start+ray_direction*x;
-			if(base->contains(LinAl::Vector<T, D-1>(p)))
+			if(base->contains(p.template slice<D-1>(0)))
 			{
 				if(points)
 				{