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

diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h
index 5d0cd8c..c472b43 100644
--- a/source/geometry/compositeshape.h
+++ b/source/geometry/compositeshape.h
@@ -201,10 +201,12 @@ inline Coverage CompositeShape<T, D, O>::get_coverage(const BoundingBox<T, D> &b
 	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))
+		if(i==shapes.begin())
 			coverage = c;
+		else
+			coverage = Ops::combine_coverage(coverage, c);
 
-		if(coverage!=PARTIAL_COVERAGE && Ops::shortcircuit(coverage==FULL_COVERAGE))
+		if((coverage==NO_COVERAGE && Ops::shortcircuit(false)) || (coverage==FULL_COVERAGE && Ops::shortcircuit(true)))
 			break;
 	}