X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fcompositeshape.h;h=5d0cd8c59532ed3b782c3cd60908c8ce96778b6c;hb=44bd1d1ab256d397be4e2169c4ca5efdd0569d31;hp=55467d762993add17cbc4fe74ae7bfda2f776c22;hpb=5e5a34537e5f2efc71181f2bf6878c3e2e62b398;p=libs%2Fmath.git

diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h
index 55467d7..5d0cd8c 100644
--- a/source/geometry/compositeshape.h
+++ b/source/geometry/compositeshape.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GEOMETRY_COMPOSITESHAPE_H_
 #define MSP_GEOMETRY_COMPOSITESHAPE_H_
 
+#include <algorithm>
 #include <stdexcept>
 #include <vector>
 #include "shape.h"
@@ -19,20 +20,25 @@ protected:
 	typedef std::vector<Shape<T, D> *> ShapeArray;
 
 	ShapeArray shapes;
+	unsigned max_isect;
 
 	CompositeShape() { }
 	CompositeShape(const Shape<T, D> &, const Shape<T, D> &);
 	template<typename Iter>
 	void init_from_iter_range(const Iter &, const Iter &);
+private:
+	void init();
+protected:
 	CompositeShape(const CompositeShape &);
 	CompositeShape &operator=(const CompositeShape &);
 public:
 	virtual ~CompositeShape();
 
-	virtual BoundingBox<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 unsigned get_max_ray_intersections() const;
+	virtual unsigned get_max_ray_intersections() const { return max_isect; }
 	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, typename O>
@@ -41,6 +47,7 @@ inline CompositeShape<T, D, O>::CompositeShape(const Shape<T, D> &s1, const Shap
 	shapes.reserve(2);
 	shapes.push_back(s1.clone());
 	shapes.push_back(s2.clone());
+	init();
 }
 
 template<typename T, unsigned D, typename O>
@@ -52,11 +59,21 @@ inline void CompositeShape<T, D, O>::init_from_iter_range(const Iter &begin, con
 
 	for(Iter i=begin; i!=end; ++i)
 		shapes.push_back((*i)->clone());
+	init();
+}
+
+template<typename T, unsigned D, typename O>
+inline void CompositeShape<T, D, O>::init()
+{
+	max_isect = 0;
+	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
+		max_isect += (*i)->get_max_ray_intersections();
 }
 
 template<typename T, unsigned D, typename O>
 inline CompositeShape<T, D, O>::CompositeShape(const CompositeShape<T, D, O> &other):
-	shapes(other.shapes)
+	shapes(other.shapes),
+	max_isect(other.max_isect)
 {
 	for(typename ShapeArray::iterator i=shapes.begin(); i!=shapes.end(); ++i)
 		*i = (*i)->clone();
@@ -71,6 +88,8 @@ inline CompositeShape<T, D, O> &CompositeShape<T, D, O>::operator=(const Composi
 	shapes = other.shapes;
 	for(typename ShapeArray::iterator i=shapes.begin(); i!=shapes.end(); ++i)
 		*i = (*i)->clone();
+
+	max_isect = other.max_isect;
 }
 
 template<typename T, unsigned D, typename O>
@@ -81,8 +100,11 @@ inline CompositeShape<T, D, O>::~CompositeShape()
 }
 
 template<typename T, unsigned D, typename O>
-inline BoundingBox<T, D> CompositeShape<T, D, O>::get_axis_aligned_bounding_box() const
+inline BoundingBox<T, D> CompositeShape<T, D, O>::get_axis_aligned_bounding_box(unsigned detail) const
 {
+	if(detail)
+		return this->bisect_axis_aligned_bounding_box(detail);
+
 	BoundingBox<T, D> aabb;
 	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
 	{
@@ -97,57 +119,98 @@ inline BoundingBox<T, D> CompositeShape<T, D, O>::get_axis_aligned_bounding_box(
 template<typename T, unsigned D, typename O>
 inline bool CompositeShape<T, D, O>::contains(const LinAl::Vector<T, D> &point) const
 {
-	bool inside = Ops::init_inside();
+	bool inside = false;
 	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
 	{
-		inside = Ops::combine_inside(inside, (*i)->contains(point));
-		if(Ops::is_inside_decided(inside))
-			break;
+		inside = (*i)->contains(point);
+		if(Ops::shortcircuit(inside))
+			return inside;
 	}
 	return inside;
 }
 
-template<typename T, unsigned D, typename O>
-inline unsigned CompositeShape<T, D, O>::get_max_ray_intersections() const
-{
-	unsigned max_isect = 0;
-	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
-		max_isect += (*i)->get_max_ray_intersections();
-	return max_isect;
-}
-
 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
 {
+	SurfacePoint<T, D> *buffer = points;
+	unsigned buf_size = size;
+	if(!points && !Ops::shortcircuit(true))
+	{
+		buffer = new SurfacePoint<T, D>[max_isect];
+		buf_size = max_isect;
+	}
+
+	int start_nesting = 0;
 	unsigned n = 0;
-	for(typename ShapeArray::const_iterator i=shapes.begin(); (n<size && i!=shapes.end()); ++i)
+	for(typename ShapeArray::const_iterator i=shapes.begin(); (n<buf_size && i!=shapes.end()); ++i)
 	{
 		unsigned base = n;
-		unsigned count = (*i)->get_intersections(ray, points+base, size-base);
-		for(unsigned j=0; (n<size && j<count); ++j)
+		unsigned count = (*i)->get_intersections(ray, buffer+base, buf_size-base);
+		bool start_inside = (*i)->contains(ray.get_start());
+
+		if(!count && !start_inside)
 		{
-			SurfacePoint<T, D> &pt = points[base+j];
+			if(Ops::shortcircuit(false))
+				return 0;
+			continue;
+		}
 
-			bool surface = Ops::init_surface();
-			for(typename ShapeArray::const_iterator k=shapes.begin(); k!=shapes.end(); ++k)
-				if(k!=i)
-					surface = Ops::combine_surface(surface, (*k)->contains(pt.position));
+		start_nesting += start_inside;
 
-			if(surface)
-			{
-				if(points && base+j!=n)
-					points[n] = pt;
+		if(!base)
+		{
+			n = count;
+			continue;
+		}
 
-				++n;
+		sort_points(buffer, base+count);
+
+		int nesting = start_nesting;
+		unsigned k = 0;
+		for(unsigned j=0; j<base+count; ++j)
+		{
+			if(Ops::shortcircuit(nesting+buffer[j].entry<2))
+			{
+				if(j!=k)
+					buffer[k] = buffer[j];
+				++k;
 			}
+
+			nesting += buffer[j].entry*2-1;
 		}
+
+		if(!k && Ops::shortcircuit(false))
+			return 0;
+
+		n = k;
+
+		if(i!=shapes.begin())
+			start_nesting = (start_nesting>!Ops::shortcircuit(true));
 	}
 
-	sort_points(points, n);
+	if(buffer!=points)
+		delete[] buffer;
 
 	return n;
 }
 
+template<typename T, unsigned D, typename O>
+inline Coverage CompositeShape<T, D, O>::get_coverage(const BoundingBox<T, D> &bbox) const
+{
+	Coverage coverage = NO_COVERAGE;
+	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
+	{
+		Coverage c = (*i)->get_coverage(bbox);
+		if(i==shapes.begin() || Ops::shortcircuit(c>coverage))
+			coverage = c;
+
+		if(coverage!=PARTIAL_COVERAGE && Ops::shortcircuit(coverage==FULL_COVERAGE))
+			break;
+	}
+
+	return coverage;
+}
+
 } // namespace Geometry
 } // namespace Msp