X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fcompositeshape.h;h=9476f99287843b33f52b1cf55fa0dfd6bdc85d94;hb=313e10c1dcf5504789cc145166aece93d8141212;hp=fd55c8e6e090875cd147f57697a35190fa26206e;hpb=68389c29cf88d6522dcfa00b5e2a5166e3947210;p=libs%2Fmath.git

diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h
index fd55c8e..9476f99 100644
--- a/source/geometry/compositeshape.h
+++ b/source/geometry/compositeshape.h
@@ -28,7 +28,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;
 };
@@ -86,12 +85,6 @@ inline bool CompositeShape<T, D, O>::contains(const LinAl::Vector<T, D> &point)
 	return inside;
 }
 
-template<typename T, unsigned D, typename O>
-inline bool CompositeShape<T, D, O>::check_intersection(const Ray<T, D> &ray) const
-{
-	return get_intersections(ray, 0, 1);
-}
-
 template<typename T, unsigned D, typename O>
 inline unsigned CompositeShape<T, D, O>::get_max_ray_intersections() const
 {
@@ -105,14 +98,13 @@ template<typename T, unsigned D, typename O>
 inline unsigned CompositeShape<T, D, O>::get_intersections(const Ray<T, D> &ray, SurfacePoint<T, D> *points, unsigned size) const
 {
 	unsigned n = 0;
-	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
+	for(typename ShapeArray::const_iterator i=shapes.begin(); (n<size && i!=shapes.end()); ++i)
 	{
 		unsigned base = n;
 		unsigned count = (*i)->get_intersections(ray, points+base, size-base);
-		for(unsigned j=0; j<count; ++j)
+		for(unsigned j=0; (n<size && j<count); ++j)
 		{
-			// XXX Devise a way to reduce copies here
-			SurfacePoint<T, D> pt = points[base+j];
+			SurfacePoint<T, D> &pt = points[base+j];
 
 			bool surface = Ops::init_surface();
 			for(typename ShapeArray::const_iterator k=shapes.begin(); k!=shapes.end(); ++k)
@@ -121,22 +113,16 @@ inline unsigned CompositeShape<T, D, O>::get_intersections(const Ray<T, D> &ray,
 
 			if(surface)
 			{
-				if(points)
-				{
-					unsigned k;
-					for(k=n; (k>0 && points[k-1].distance>pt.distance); --k)
-						points[k] = points[k-1];
-					if(base+j!=k)
-						points[k] = pt;
-				}
+				if(points && base+j!=n)
+					points[n] = pt;
 
 				++n;
-				if(n==size)
-					return n;
 			}
 		}
 	}
 
+	sort_points(points, n);
+
 	return n;
 }