X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fshape.h;h=22b18876620657e9f2858ea568196cc66a2d3f9c;hb=540bea4f0254725c003c73f7340c1d48ac0c86f5;hp=528a77ca6d97d42e748bb4a47a17f88508394bfa;hpb=6ff13022b53830d35283905d562c2ef3af198cc1;p=libs%2Fmath.git

diff --git a/source/geometry/shape.h b/source/geometry/shape.h
index 528a77c..22b1887 100644
--- a/source/geometry/shape.h
+++ b/source/geometry/shape.h
@@ -1,15 +1,20 @@
 #ifndef MSP_GEOMETRY_SHAPE_H_
 #define MSP_GEOMETRY_SHAPE_H_
 
+#include <vector>
+#include <msp/linal/vector.h>
+#include "boundingbox.h"
+#include "ray.h"
+#include "surfacepoint.h"
+
 namespace Msp {
 namespace Geometry {
 
-template<typename T, unsigned D>
-class HyperBox;
-
-template<typename T, unsigned D>
-class Ray;
-
+/**
+Base class and interface for geometric shapes.  Shapes may be bounded or
+unbounded.  They are always considered to be solid, i.e. have a distinct inside
+and an outside.
+*/
 template<typename T, unsigned D>
 class Shape
 {
@@ -20,10 +25,30 @@ public:
 
 	virtual Shape *clone() const = 0;
 
-	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const = 0;
-	virtual bool check_intersection(const Ray<T, D> &) const = 0;
+	virtual BoundingBox<T, D> get_axis_aligned_bounding_box() const = 0;
+	virtual bool contains(const LinAl::Vector<T, D> &) const = 0;
+	bool check_intersection(const Ray<T, D> &) const;
+	virtual unsigned get_max_ray_intersections() const = 0;
+	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const = 0;
+	std::vector<SurfacePoint<T, D> > get_intersections(const Ray<T, D> &) const;
 };
 
+template<typename T, unsigned D>
+inline bool Shape<T, D>::check_intersection(const Ray<T, D> &ray) const
+{
+	return get_intersections(ray, 0, 1);
+}
+
+template<typename T, unsigned D>
+inline std::vector<SurfacePoint<T, D> > Shape<T, D>::get_intersections(const Ray<T, D> &ray) const
+{
+	unsigned max_isect = get_max_ray_intersections();
+	std::vector<SurfacePoint<T, D> > points(max_isect);
+	unsigned count = get_intersections(ray, &points[0], max_isect);
+	points.resize(count);
+	return points;
+}
+
 } // namespace Geometry
 } // namespace Msp