Changes in src/Shapes/ShapeOps.cpp [79dd0e:5e588b5]

File:

• src/Shapes/ShapeOps.cpp (modified) (7 diffs)

src/Shapes/ShapeOps.cpp

@@ -11 +11 @@
 #include "Helpers/Assert.hpp"
 
-/*************** Base case ***********************/
-
-ShapeOpsBase_impl::ShapeOpsBase_impl(const Shape::impl_ptr &_arg) :
-  arg(_arg){}
-
-ShapeOpsBase_impl::~ShapeOpsBase_impl(){}
-
-bool ShapeOpsBase_impl::isInside(const Vector &point){
-  return arg->isInside(translateIn(point));
-}
-
-bool ShapeOpsBase_impl::isOnSurface(const Vector &point){
-  return arg->isOnSurface(translateIn(point));
-}
-
-Vector ShapeOpsBase_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
-  Vector helper = translateIn(point);
-  if(!arg->isOnSurface(helper)){
-    throw NotOnSurfaceException(__FILE__,__LINE__);
-  }
-  return translateOutNormal(arg->getNormal(helper));
-}
-
-Shape::impl_ptr ShapeOpsBase_impl::getArg(){
-  return arg;
-}
-
 /********************* Resize ********************/
 
 Resize_impl::Resize_impl(const Shape::impl_ptr &_arg,double _size) :
-  ShapeOpsBase_impl(_arg), size(_size)
+  arg(_arg), size(_size)
 {
   ASSERT(size>0,"Cannot resize a Shape to size zero or below");
@@ -48 +21 @@
 Resize_impl::~Resize_impl(){}
 
-Vector Resize_impl::translateIn(const Vector& point){
-  return (1/size) * point;
-}
-
-Vector Resize_impl::translateOutPos(const Vector& point){
-  return size * point;
-}
-
-Vector Resize_impl::translateOutNormal(const Vector& point){
-  return point;
-}
-
-string Resize_impl::toString(){
-  stringstream sstr;
-  sstr << "resize(" << getArg()->toString() << "," << size << ")";
-  return sstr.str();
+bool Resize_impl::isInside(const Vector& point){
+  return arg->isInside((1/size) * point);
 }
 
@@ -74 +33 @@
 
 Translate_impl::Translate_impl(const Shape::impl_ptr &_arg, const Vector &_offset) :
-  ShapeOpsBase_impl(_arg),offset(_offset)
+  arg(_arg),offset(_offset)
 {}
 
 Translate_impl::~Translate_impl(){}
 
-Vector Translate_impl::translateIn(const Vector& point){
-  return point-offset;
-}
-
-Vector Translate_impl::translateOutPos(const Vector& point){
-  return point+offset;
-}
-
-Vector Translate_impl::translateOutNormal(const Vector& point){
-  return point;
-}
-
-string Translate_impl::toString(){
-  stringstream sstr;
-  sstr << "translate(" << getArg()->toString() << "," << offset << ")";
-  return sstr.str();
+bool Translate_impl::isInside(const Vector& point){
+  return arg->isInside(point-offset);
 }
 
@@ -105 +50 @@
 
 Stretch_impl::Stretch_impl(const Shape::impl_ptr &_arg, const Vector &_factors) :
-  ShapeOpsBase_impl(_arg),factors(_factors)
+  arg(_arg),factors(_factors)
 {
   ASSERT(factors[0]>0,"cannot stretch a shape by a negative amount");
@@ -117 +62 @@
 Stretch_impl::~Stretch_impl(){}
 
-Vector Stretch_impl::translateIn(const Vector& point){
+bool Stretch_impl::isInside(const Vector& point){
   Vector helper=point;
   helper.ScaleAll(reciFactors);
-  return helper;
-}
-
-Vector Stretch_impl::translateOutPos(const Vector& point){
-  Vector helper=point;
-  helper.ScaleAll(factors);
-  return helper;
-}
-
-Vector Stretch_impl::translateOutNormal(const Vector& point){
-  Vector helper=point;
-  // the normalFactors are derived from appearances of the factors
-  // with in the vectorproduct
-  Vector normalFactors;
-  normalFactors[0]=factors[1]*factors[2];
-  normalFactors[1]=factors[0]*factors[2];
-  normalFactors[2]=factors[0]*factors[1];
-  helper.ScaleAll(normalFactors);
-  return helper;
-}
-
-string Stretch_impl::toString(){
-  stringstream sstr;
-  sstr << "stretch(" << getArg()->toString() << "," << factors << ")";
-  return sstr.str();
+  return arg->isInside(helper);
 }
 
@@ -155 +76 @@
 
 Transform_impl::Transform_impl(const Shape::impl_ptr &_arg, const Matrix &_transformation) :
-  ShapeOpsBase_impl(_arg),transformation(_transformation)
+  arg(_arg),transformation(_transformation)
 {
   transformationInv = transformation.invert();
@@ -162 +83 @@
 Transform_impl::~Transform_impl(){}
 
-Vector Transform_impl::translateIn(const Vector& point){
-  return transformationInv * point;
-}
-
-Vector Transform_impl::translateOutPos(const Vector& point){
-  return transformation * point;
-}
-
-Vector Transform_impl::translateOutNormal(const Vector& point){
-  Matrix mat = transformation.determinant() * transformation.invert().transpose();
-  return mat * point;
-}
-
-string Transform_impl::toString(){
-  stringstream sstr;
-  sstr << "transform(" << getArg()->toString() << "," << transformation << ")";
-  return sstr.str();
+bool Transform_impl::isInside(const Vector& point){
+  return arg->isInside(transformationInv * point);
 }