X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fintersection.h;h=0e555b03f7086185076ca904512605b0ae204e08;hb=4fc002747e8138501d08942be247e60cd99ac404;hp=53c25c22e6380a5b8ec2cb777ff96fdf9752d4f6;hpb=68389c29cf88d6522dcfa00b5e2a5166e3947210;p=libs%2Fmath.git

diff --git a/source/geometry/intersection.h b/source/geometry/intersection.h
index 53c25c2..0e555b0 100644
--- a/source/geometry/intersection.h
+++ b/source/geometry/intersection.h
@@ -6,54 +6,48 @@
 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 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> >
 {
+private:
+	Intersection() { }
 public:
 	Intersection(const Shape<T, D> &, const Shape<T, D> &);
-	Intersection(const std::vector<Shape<T, D> *> &);
+
+	template<typename Iter>
+	static Intersection from_iterator_range(const Iter &, const Iter &);
 
 	virtual Intersection *clone() const;
 };
 
 template<typename T, unsigned D>
-Intersection<T, D>::Intersection(const Shape<T, D> &s1, const Shape<T, D> &s2):
+inline Intersection<T, D>::Intersection(const Shape<T, D> &s1, const Shape<T, D> &s2):
 	CompositeShape<T, D, IntersectionOps<T, D> >(s1, s2)
 { }
 
 template<typename T, unsigned D>
-Intersection<T, D>::Intersection(const std::vector<Shape<T, D> *> &s):
-	CompositeShape<T, D, IntersectionOps<T, D> >(s)
-{ }
-
-template<typename T, unsigned D>
-Intersection<T, D> *Intersection<T, D>::clone() const
+template<typename Iter>
+inline Intersection<T, D> Intersection<T, D>::from_iterator_range(const Iter &begin, const Iter &end)
 {
-	return new Intersection<T, D>(this->shapes);
+	Intersection<T, D> shape;
+	shape.init_from_iter_range(begin, end);
+	return shape;
 }
 
-
 template<typename T, unsigned D>
-inline HyperBox<T, D> IntersectionOps<T, D>::combine_aabb(const HyperBox<T, D> &box1, const HyperBox<T, D> &box2)
+inline Intersection<T, D> *Intersection<T, D>::clone() const
 {
-	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);
+	return new Intersection<T, D>(*this);
 }
 
 } // namespace Geometry