Optimize bounding box bisection with more early culling

[libs/math.git] / source / geometry / intersection.h

diff --git a/source/geometry/intersection.h b/source/geometry/intersection.h
index c20aae126d1b021552d430df5fc05a5c1a8ad205..24e668dc35a1924a70e1c3815fecbeac8147595e 100644 (file)
--- a/source/geometry/intersection.h
+++ b/source/geometry/intersection.h
@@ -6,20 +6,17 @@
 namespace Msp {
 namespace Geometry {
 
-/**
-Forms a shape from the common parts of component shapes.
-*/
 template<typename T, unsigned D>
 struct IntersectionOps
 {
-       static HyperBox<T, D> combine_aabb(const HyperBox<T, D> &, const HyperBox<T, D> &);
-       static bool init_inside() { return true; }
-       static bool combine_inside(bool a, bool b) { return a && b; }
-       static bool is_inside_decided(bool a) { return !a; }
-       static bool init_surface() { return true; }
-       static bool combine_surface(bool a, bool b) { return a && b; }
+       static BoundingBox<T, D> combine_aabb(const BoundingBox<T, D> &a, const BoundingBox<T, D> &b) { return a&b; }
+       static Coverage combine_coverage(Coverage a, Coverage b) { return ((a==PARTIAL_COVERAGE && b==a) ? UNCERTAIN_COVERAGE : std::min(a, b)); }
+       static bool shortcircuit(bool c) { return !c; }
 };
 
+/**
+Forms a shape from the common parts of component shapes.
+*/
 template<typename T, unsigned D>
 class Intersection: public CompositeShape<T, D, IntersectionOps<T, D> >
 {
@@ -54,16 +51,6 @@ inline Intersection<T, D> *Intersection<T, D>::clone() const
        return new Intersection<T, D>(*this);
 }
 
-
-template<typename T, unsigned D>
-inline HyperBox<T, D> IntersectionOps<T, D>::combine_aabb(const HyperBox<T, D> &box1, const HyperBox<T, D> &box2)
-{
-       LinAl::Vector<T, D> dimensions;
-       for(unsigned i=0; i<D; ++i)
-               dimensions[i] = std::min(box1.get_dimension(i), box2.get_dimension(i));
-       return HyperBox<T, D>(dimensions);
-}
-
 } // namespace Geometry
 } // namespace Msp