Changes in src/Shapes/Shape.cpp [cfda65:205d9b]

File:

• src/Shapes/Shape.cpp (modified) (6 diffs)

src/Shapes/Shape.cpp

@@ -8 +8 @@
 #include "Shape.hpp"
 #include "Shape_impl.hpp"
-
-#include "Helpers/Assert.hpp"
-
-#include <string>
-
-using namespace std;
 
 Shape::Shape(const Shape& src) :
@@ -25 +19 @@
 }
 
-bool Shape::isOnSurface(const Vector &point) const{
-  return impl->isOnSurface(point);
-}
-
-Vector Shape::getNormal(const Vector &point) const throw (NotOnSurfaceException){
-  return impl->getNormal(point);
-}
-
 Shape::Shape(Shape::impl_ptr _impl) :
     impl(_impl)
@@ -42 +28 @@
   }
   return *this;
-}
-
-std::string Shape::toString() const{
-  return impl->toString();
 }
 
@@ -83 +65 @@
 }
 
-bool AndShape_impl::isOnSurface(const Vector &point){
-  // check the number of surfaces that this point is on
-  int surfaces =0;
-  surfaces += lhs->isOnSurface(point);
-  surfaces += rhs->isOnSurface(point);
-
-  switch(surfaces){
-    case 0:
-      return false;
-      // no break necessary
-    case 1:
-      // if it is inside for the object where it does not lie on
-      // the surface the whole point lies inside
-      return (lhs->isOnSurface(point) && rhs->isInside(point)) ||
-             (rhs->isOnSurface(point) && lhs->isInside(point));
-      // no break necessary
-    case 2:
-      {
-        // it lies on both Shapes... could be an edge or an inner point
-        // test the direction of the normals
-        Vector direction=lhs->getNormal(point)+rhs->getNormal(point);
-        // if the directions are opposite we lie on the inside
-        return !direction.IsZero();
-      }
-      // no break necessary
-    default:
-      // if this happens there is something wrong
-      ASSERT(0,"Default case should have never been used");
-  }
-  return false; // never reached
-}
-
-Vector AndShape_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
-  Vector res;
-  if(!isOnSurface(point)){
-    throw NotOnSurfaceException(__FILE__,__LINE__);
-  }
-  res += lhs->isOnSurface(point)?lhs->getNormal(point):zeroVec;
-  res += rhs->isOnSurface(point)?rhs->getNormal(point):zeroVec;
-  res.Normalize();
-  return res;
-}
-
-string AndShape_impl::toString(){
-  return string("(") + lhs->toString() + string("&&") + rhs->toString() + string(")");
-}
-
 Shape operator&&(const Shape &lhs,const Shape &rhs){
   Shape::impl_ptr newImpl = Shape::impl_ptr(new AndShape_impl(getShapeImpl(lhs),getShapeImpl(rhs)));
@@ -145 +80 @@
 bool OrShape_impl::isInside(const Vector &point){
   return rhs->isInside(point) || lhs->isInside(point);
-}
-
-bool OrShape_impl::isOnSurface(const Vector &point){
-  // check the number of surfaces that this point is on
-  int surfaces =0;
-  surfaces += lhs->isOnSurface(point);
-  surfaces += rhs->isOnSurface(point);
-
-  switch(surfaces){
-    case 0:
-      return false;
-      // no break necessary
-    case 1:
-      // if it is inside for the object where it does not lie on
-      // the surface the whole point lies inside
-      return (lhs->isOnSurface(point) && !rhs->isInside(point)) ||
-             (rhs->isOnSurface(point) && !lhs->isInside(point));
-      // no break necessary
-    case 2:
-      {
-        // it lies on both Shapes... could be an edge or an inner point
-        // test the direction of the normals
-        Vector direction=lhs->getNormal(point)+rhs->getNormal(point);
-        // if the directions are opposite we lie on the inside
-        return !direction.IsZero();
-      }
-      // no break necessary
-    default:
-      // if this happens there is something wrong
-      ASSERT(0,"Default case should have never been used");
-  }
-  return false; // never reached
-}
-
-Vector OrShape_impl::getNormal(const Vector &point) throw (NotOnSurfaceException){
-  Vector res;
-  if(!isOnSurface(point)){
-    throw NotOnSurfaceException(__FILE__,__LINE__);
-  }
-  res += lhs->isOnSurface(point)?lhs->getNormal(point):zeroVec;
-  res += rhs->isOnSurface(point)?rhs->getNormal(point):zeroVec;
-  res.Normalize();
-  return res;
-}
-
-string OrShape_impl::toString(){
-  return string("(") + lhs->toString() + string("||") + rhs->toString() + string(")");
 }
 
@@ -211 +99 @@
 }
 
-bool NotShape_impl::isOnSurface(const Vector &point){
-  return arg->isOnSurface(point);
-}
-
-Vector NotShape_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
-  return -1*arg->getNormal(point);
-}
-
-string NotShape_impl::toString(){
-  return string("!") + arg->toString();
-}
-
 Shape operator!(const Shape &arg){
   Shape::impl_ptr newImpl = Shape::impl_ptr(new NotShape_impl(getShapeImpl(arg)));
   return Shape(newImpl);
 }
-
-/**************** global operations *********************************/
-ostream &operator<<(ostream &ost,const Shape &shape){
-  ost << shape.toString();
-  return ost;
-}