X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fnegation.h;h=91802f8bce9906cfdadcae3bc7382c6e193cb423;hb=44bd1d1ab256d397be4e2169c4ca5efdd0569d31;hp=0fc01964b869efd4d841f2bee439da3feffb24d8;hpb=68389c29cf88d6522dcfa00b5e2a5166e3947210;p=libs%2Fmath.git

diff --git a/source/geometry/negation.h b/source/geometry/negation.h
index 0fc0196..91802f8 100644
--- a/source/geometry/negation.h
+++ b/source/geometry/negation.h
@@ -18,16 +18,19 @@ private:
 
 public:
 	Negation(const Shape<T, D> &);
+	Negation(const Negation &);
+	Negation &operator=(const Negation &);
+	~Negation();
 
 	virtual Negation *clone() const;
 
 	const Shape<T, D> &get_shape() const { return *shape; }
 
-	virtual HyperBox<T, D> get_axis_aligned_bounding_box() const;
+	virtual BoundingBox<T, D> get_axis_aligned_bounding_box(unsigned = 0) 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 { return shape->get_max_ray_intersections(); }
 	virtual unsigned get_intersections(const Ray<T, D> &, SurfacePoint<T, D> *, unsigned) const;
+	virtual Coverage get_coverage(const BoundingBox<T, D> &) const;
 };
 
 template<typename T, unsigned D>
@@ -36,28 +39,40 @@ inline Negation<T, D>::Negation(const Shape<T, D> &s):
 { }
 
 template<typename T, unsigned D>
-inline Negation<T, D> *Negation<T, D>::clone() const
+inline Negation<T, D>::Negation(const Negation<T, D> &other):
+	shape(other.shape->clone())
+{ }
+
+template<typename T, unsigned D>
+inline Negation<T, D> &Negation<T, D>::operator=(const Negation<T, D> &other)
 {
-	return new Negation<T, D>(*shape);
+	delete shape;
+	shape = other.shape->clone();
+	return *this;
 }
 
 template<typename T, unsigned D>
-inline HyperBox<T, D> Negation<T, D>::get_axis_aligned_bounding_box() const
+inline Negation<T, D>::~Negation()
 {
-	// XXX How do we handle this correctly?  In particular negation of a negation?
-	return HyperBox<T, D>();
+	delete shape;
 }
 
 template<typename T, unsigned D>
-inline bool Negation<T, D>::contains(const LinAl::Vector<T, D> &point) const
+inline Negation<T, D> *Negation<T, D>::clone() const
 {
-	return !shape->contains(point);
+	return new Negation<T, D>(*shape);
 }
 
 template<typename T, unsigned D>
-inline bool Negation<T, D>::check_intersection(const Ray<T, D> &ray) const
+inline BoundingBox<T, D> Negation<T, D>::get_axis_aligned_bounding_box(unsigned detail) const
 {
-	return get_intersections(ray, 0, 1);
+	return ~shape->get_axis_aligned_bounding_box(detail);
+}
+
+template<typename T, unsigned D>
+inline bool Negation<T, D>::contains(const LinAl::Vector<T, D> &point) const
+{
+	return !shape->contains(point);
 }
 
 template<typename T, unsigned D>
@@ -65,10 +80,25 @@ inline unsigned Negation<T, D>::get_intersections(const Ray<T, D> &ray, SurfaceP
 {
 	unsigned count = shape->get_intersections(ray, points, size);
 	for(unsigned i=0; i<count; ++i)
+	{
 		points[i].normal = -points[i].normal;
+		points[i].entry = !points[i].entry;
+	}
 	return count;
 }
 
+template<typename T, unsigned D>
+inline Coverage Negation<T, D>::get_coverage(const BoundingBox<T, D> &bbox) const
+{
+	Coverage coverage = shape->get_coverage(bbox);
+	if(coverage==FULL_COVERAGE)
+		return NO_COVERAGE;
+	else if(coverage==NO_COVERAGE)
+		return FULL_COVERAGE;
+	else
+		return PARTIAL_COVERAGE;
+}
+
 } // namespace Geometry
 } // namespace Msp