Negation contains a pointer and needs copy c'tor and operator=

[libs/math.git] / source / geometry / negation.h

diff --git a/source/geometry/negation.h b/source/geometry/negation.h
index 0fc01964b869efd4d841f2bee439da3feffb24d8..ce2f7873d6aed3eeff7304e67abe7598b5c274c7 100644 (file)
--- a/source/geometry/negation.h
+++ b/source/geometry/negation.h
@@ -18,14 +18,16 @@ 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() 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;
 };
@@ -36,28 +38,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() const
 {
-       return get_intersections(ray, 0, 1);
+       return ~shape->get_axis_aligned_bounding_box();
+}
+
+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>