X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgeometry%2Funion.h;fp=source%2Fgeometry%2Funion.h;h=fadeff2ac9270dd71718aade2e733504e6a44e5b;hb=68389c29cf88d6522dcfa00b5e2a5166e3947210;hp=0000000000000000000000000000000000000000;hpb=1e34b120f1229b1390cee67c917829715615ccd0;p=libs%2Fmath.git

diff --git a/source/geometry/union.h b/source/geometry/union.h
new file mode 100644
index 0000000..fadeff2
--- /dev/null
+++ b/source/geometry/union.h
@@ -0,0 +1,62 @@
+#ifndef MSP_GEOMETRY_UNION_H_
+#define MSP_GEOMETRY_UNION_H_
+
+#include "compositeshape.h"
+
+namespace Msp {
+namespace Geometry {
+
+/**
+Joins component shapes together into one.
+*/
+template<typename T, unsigned D>
+struct UnionOps
+{
+	static HyperBox<T, D> combine_aabb(const HyperBox<T, D> &, const HyperBox<T, D> &);
+	static bool init_inside() { return false; }
+	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; }
+};
+
+template<typename T, unsigned D>
+class Union: public CompositeShape<T, D, UnionOps<T, D> >
+{
+public:
+	Union(const Shape<T, D> &, const Shape<T, D> &);
+	Union(const std::vector<Shape<T, D> *> &);
+
+	virtual Union *clone() const;
+};
+
+template<typename T, unsigned D>
+inline Union<T, D>::Union(const Shape<T, D> &s1, const Shape<T, D> &s2):
+	CompositeShape<T, D, UnionOps<T, D> >(s1, s2)
+{ }
+
+template<typename T, unsigned D>
+inline Union<T, D>::Union(const std::vector<Shape<T, D> *> &s):
+	CompositeShape<T, D, UnionOps<T, D> >(s)
+{ }
+
+template<typename T, unsigned D>
+inline Union<T, D> *Union<T, D>::clone() const
+{
+	return new Union<T, D>(this->shapes);
+}
+
+
+template<typename T, unsigned D>
+inline HyperBox<T, D> UnionOps<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::max(box1.get_dimension(i), box2.get_dimension(i));
+	return HyperBox<T, D>(dimensions);
+}
+
+} // namespace Geometry
+} // namespace Msp
+
+#endif