X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fcompositeshape.h;h=4c640be22f4c5045076b9659ce7734d517f1127c;hb=09cc3a8648dd20e9a07d669b353c4a120b67c1c4;hp=50b04e80c506e93f7dc995187140e871dec66e27;hpb=827b227ae53884109b6885ccd1424dda8c0b3725;p=libs%2Fmath.git

diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h
index 50b04e8..4c640be 100644
--- a/source/geometry/compositeshape.h
+++ b/source/geometry/compositeshape.h
@@ -1,7 +1,9 @@
 #ifndef MSP_GEOMETRY_COMPOSITESHAPE_H_
 #define MSP_GEOMETRY_COMPOSITESHAPE_H_
 
+#include <stdexcept>
 #include <vector>
+#include "boundingbox.h"
 #include "shape.h"
 
 namespace Msp {
@@ -19,16 +21,17 @@ protected:
 
 	ShapeArray shapes;
 
+	CompositeShape() { }
 	CompositeShape(const Shape<T, D> &, const Shape<T, D> &);
-	CompositeShape(const ShapeArray &);
 	CompositeShape(const CompositeShape &);
 	CompositeShape &operator=(const CompositeShape &);
+	template<typename Iter>
+	void init_from_iter_range(const Iter &, const Iter &);
 public:
 	virtual ~CompositeShape();
 
-	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const;
+	virtual BoundingBox<T, D> get_axis_aligned_bounding_box() const;
 	virtual bool contains(const LinAl::Vector<T, D> &) const;
-	virtual bool check_intersection(const Ray<T, D> &) const;
 	virtual unsigned get_max_ray_intersections() const;
 	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
 };
@@ -42,13 +45,21 @@ inline CompositeShape<T, D, O>::CompositeShape(const Shape<T, D> &s1, const Shap
 }
 
 template<typename T, unsigned D, typename O>
-inline CompositeShape<T, D, O>::CompositeShape(const ShapeArray &s)
+template<typename Iter>
+inline void CompositeShape<T, D, O>::init_from_iter_range(const Iter &begin, const Iter &end)
 {
-	if(s.empty())
-		throw std::invalid_argument("CompositeShape::CompositeShape");
+	if(begin==end)
+		throw std::invalid_argument("CompositeShape::init_from_iter_range");
 
-	shapes.reserve(s.size());
-	for(typename ShapeArray::const_iterator i=s.begin(); i!=s.end(); ++i)
+	for(Iter i=begin; i!=end; ++i)
+		shapes.push_back((*i)->clone());
+}
+
+template<typename T, unsigned D, typename O>
+inline CompositeShape<T, D, O>::CompositeShape(const CompositeShape<T, D, O> &other)
+{
+	shapes.reserve(other.shapes.size());
+	for(typename ShapeArray::const_iterator i=other.shapes.begin(); i!=other.shapes.end(); ++i)
 		shapes.push_back((*i)->clone());
 }
 
@@ -60,9 +71,9 @@ inline CompositeShape<T, D, O>::~CompositeShape()
 }
 
 template<typename T, unsigned D, typename O>
-inline HyperBox<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() const
 {
-	HyperBox<T, D> aabb;
+	BoundingBox<T, D> aabb;
 	for(typename ShapeArray::const_iterator i=shapes.begin(); i!=shapes.end(); ++i)
 	{
 		if(i==shapes.begin())
@@ -86,12 +97,6 @@ inline bool CompositeShape<T, D, O>::contains(const LinAl::Vector<T, D> &point)
 	return inside;
 }
 
-template<typename T, unsigned D, typename O>
-inline bool CompositeShape<T, D, O>::check_intersection(const Ray<T, D> &ray) const
-{
-	return get_intersections(ray, 0, 1);
-}
-
 template<typename T, unsigned D, typename O>
 inline unsigned CompositeShape<T, D, O>::get_max_ray_intersections() const
 {