X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fextrudedshape.h;h=c00111a549a67fa0bbdd4682f859030acbad4a74;hb=a6ba5f18950f8471c5f3c168a9d65e901a8a6f2a;hp=8fac4bc46d7e9e4da831fed1713987834af54a24;hpb=aee0d4c9f7d4dc6ac77b6ff3429973f16d86144b;p=libs%2Fmath.git

diff --git a/source/geometry/extrudedshape.h b/source/geometry/extrudedshape.h
index 8fac4bc..c00111a 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;
 };
@@ -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>(LinAl::Vector<T, D>(base_bbox.get_minimum_point(), -half_length),
+		LinAl::Vector<T, D>(base_bbox.get_maximum_point(), half_length));
 }
 
 template<typename T, unsigned D>
@@ -92,12 +93,6 @@ inline bool ExtrudedShape<T, D>::contains(const LinAl::Vector<T, D> &point) cons
 	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);
-}
-
 template<typename T, unsigned D>
 inline unsigned ExtrudedShape<T, D>::get_max_ray_intersections() const
 {
@@ -107,8 +102,6 @@ inline unsigned ExtrudedShape<T, D>::get_max_ray_intersections() const
 template<typename T, unsigned D>
 inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, SurfacePoint<T, D> *points, unsigned size) const
 {
-	using std::abs;
-	using std::sqrt;
 	using std::swap;
 
 	unsigned n = 0;
@@ -132,45 +125,47 @@ 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; i<count; ++i)
+
+		if(limit>=offset)
 		{
+			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)
 			{
-				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 = LinAl::Vector<T, D>(base_points[i].normal, T(0));
+					points[n].distance = x;
+				}
 
-			++n;
-			if(n==size)
-				return n;
+				++n;
+			}
 		}
 	}
 
 	/* If the ray is not parallel to the base space, it may pass through the
 	caps. */
-	if(ray_direction[D-1])
+	if(n<size && ray_direction[D-1])
 	{
-		for(int i=-1; i<=1; i+=2)
+		for(int i=-1; (n<size && i<=1); i+=2)
 		{
 			T x = (half_length*i-ray_start[D-1])/ray_direction[D-1];
 			if(!ray.check_limits(x))
 				continue;
 
 			LinAl::Vector<T, D> p = ray_start+ray_direction*x;
-			if(base->contains(LinAl::Vector<T, D-1>(p)) && n<size)
+			if(base->contains(LinAl::Vector<T, D-1>(p)))
 			{
 				if(points)
 				{
@@ -178,16 +173,13 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 					points[n].normal = LinAl::Vector<T, D>();
 					points[n].normal[D-1] = i;
 					points[n].distance = x;
-
-					if(n==1 && x<points[0].distance)
-						swap(points[0], points[1]);
 				}
 
 				++n;
-				if(n==size)
-					return n;
 			}
 		}
+
+		sort_points(points, n);
 	}
 
 	return n;