Changes in src/Shapes/ShapeOps_impl.hpp [cfda65:5e588b5]

File:

• src/Shapes/ShapeOps_impl.hpp (modified) (1 diff)

src/Shapes/ShapeOps_impl.hpp

@@ -13 +13 @@
 #include "Matrix.hpp"
 
-class ShapeOpsBase_impl : public Shape_impl{
-public:
-  ShapeOpsBase_impl(const Shape::impl_ptr&);
-  virtual ~ShapeOpsBase_impl();
-  virtual bool isInside(const Vector &point);
-  virtual bool isOnSurface(const Vector &point);
-  virtual Vector getNormal(const Vector &point) throw (NotOnSurfaceException);
-protected:
-  virtual Vector translateIn(const Vector &point)=0;
-  virtual Vector translateOutPos(const Vector &point)=0;
-  virtual Vector translateOutNormal(const Vector &point)=0;
-  Shape::impl_ptr getArg();
-private:
-  Shape::impl_ptr arg;
-};
-
-class Resize_impl :  public ShapeOpsBase_impl
+class Resize_impl :  public Shape_impl
 {
 public:
   Resize_impl(const Shape::impl_ptr&,double);
   virtual ~Resize_impl();
-protected:
-  virtual Vector translateIn(const Vector &point);
-  virtual Vector translateOutPos(const Vector &point);
-  virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual bool isInside(const Vector& point);
 private:
+  Shape::impl_ptr arg;
   double size;
 };
 
-class Translate_impl :  public ShapeOpsBase_impl
+class Translate_impl :  public Shape_impl
 {
 public:
   Translate_impl(const Shape::impl_ptr&, const Vector&);
   virtual ~Translate_impl();
-protected:
-  virtual Vector translateIn(const Vector &point);
-  virtual Vector translateOutPos(const Vector &point);
-  virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual bool isInside(const Vector& point);
 private:
+  Shape::impl_ptr arg;
   Vector offset;
 };
 
-class Stretch_impl : public ShapeOpsBase_impl
+class Stretch_impl : public Shape_impl
 {
 public:
   Stretch_impl(const Shape::impl_ptr&, const Vector&);
   virtual ~Stretch_impl();
-protected:
-  virtual Vector translateIn(const Vector &point);
-  virtual Vector translateOutPos(const Vector &point);
-  virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual bool isInside(const Vector& point);
 private:
+  Shape::impl_ptr arg;
   Vector factors;
   Vector reciFactors;
 };
 
-class Transform_impl : public ShapeOpsBase_impl
+class Transform_impl : public Shape_impl
 {
 public:
   Transform_impl(const Shape::impl_ptr&, const Matrix&);
   virtual ~Transform_impl();
-protected:
-  virtual Vector translateIn(const Vector &point);
-  virtual Vector translateOutPos(const Vector &point);
-  virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual bool isInside(const Vector& point);
 private:
+  Shape::impl_ptr arg;
   Matrix transformation;
   Matrix transformationInv;