X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fextrudedshape.h;h=83933b0808a02f32d8febcce5eee8c8a23ad85d0;hb=313e10c1dcf5504789cc145166aece93d8141212;hp=0d895ac5bc0aecbac9d6de46f5e93c9c932ca0dd;hpb=643aa7b2317f88463f66da11e595ebe0f6c9621d;p=libs%2Fmath.git

diff --git a/source/geometry/extrudedshape.h b/source/geometry/extrudedshape.h
index 0d895ac..83933b0 100644
--- a/source/geometry/extrudedshape.h
+++ b/source/geometry/extrudedshape.h
@@ -33,7 +33,6 @@ 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;
 	virtual unsigned get_max_ray_intersections() const;
 	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
 };
@@ -92,12 +91,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
 {
@@ -141,7 +134,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 			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)
+		for(unsigned i=0; (n<size && i<count); ++i)
 		{
 			if(points)
 			{
@@ -152,23 +145,21 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 			}
 
 			++n;
-			if(n==size)
-				return 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)
 				{
@@ -176,16 +167,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;