Changes in src/Shapes/BaseShapes.cpp [955b91:c67c65]

File:

• src/Shapes/BaseShapes.cpp (modified) (9 diffs)

src/Shapes/BaseShapes.cpp

@@ -37 +37 @@
 #include <algorithm>
 
-bool Sphere_impl::isInside(const Vector &point){
-  return point.NormSquared()<=1;
-}
-
-bool Sphere_impl::isOnSurface(const Vector &point){
-  return fabs(point.NormSquared()-1)<MYEPSILON;
-}
-
-Vector Sphere_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
+bool Sphere_impl::isInside(const Vector &point) const{
+  return point.NormSquared()<=1.;
+}
+
+bool Sphere_impl::isOnSurface(const Vector &point) const{
+  return fabs(point.NormSquared()-1.)<MYEPSILON;
+}
+
+Vector Sphere_impl::getNormal(const Vector &point) const throw(NotOnSurfaceException){
   if(!isOnSurface(point)){
     throw NotOnSurfaceException() << ShapeVector(&point);
@@ -52 +52 @@
 }
 
-LineSegmentSet Sphere_impl::getLineIntersections(const Line &line){
+Vector Sphere_impl::getCenter() const
+{
+  return Vector(0.,0.,0.);
+}
+
+double Sphere_impl::getRadius() const
+{
+  return 1.;
+}
+
+double Sphere_impl::getVolume() const
+{
+        return (4./3.)*M_PI; // 4/3 pi r^3
+}
+
+double Sphere_impl::getSurfaceArea() const
+{
+        return 2.*M_PI; // 2 pi r^2
+}
+
+
+LineSegmentSet Sphere_impl::getLineIntersections(const Line &line) const{
   LineSegmentSet res(line);
   std::vector<Vector> intersections = line.getSphereIntersections();
@@ -61 +82 @@
 }
 
-std::string Sphere_impl::toString(){
+std::string Sphere_impl::toString() const{
   return "Sphere()";
+}
+
+enum ShapeType Sphere_impl::getType() const
+{
+        return SphereType;
 }
 
@@ -115 +141 @@
 }
 
+std::vector<Vector> Sphere_impl::getHomogeneousPointsInVolume(const size_t N) const {
+        ASSERT(0,
+                        "Sphere_impl::getHomogeneousPointsInVolume() - not implemented.");
+        return std::vector<Vector>();
+}
 
 Shape Sphere(){
@@ -129 +160 @@
 }
 
-bool Cuboid_impl::isInside(const Vector &point){
+bool Cuboid_impl::isInside(const Vector &point) const{
   return (point[0]>=0 && point[0]<=1) && (point[1]>=0 && point[1]<=1) && (point[2]>=0 && point[2]<=1);
 }
 
-bool Cuboid_impl::isOnSurface(const Vector &point){
+bool Cuboid_impl::isOnSurface(const Vector &point) const{
   bool retVal = isInside(point);
   // test all borders of the cuboid
@@ -144 +175 @@
 }
 
-Vector Cuboid_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
+Vector Cuboid_impl::getNormal(const Vector &point) const throw(NotOnSurfaceException){
   if(!isOnSurface(point)){
     throw NotOnSurfaceException() << ShapeVector(&point);
@@ -162 +193 @@
 }
 
-LineSegmentSet Cuboid_impl::getLineIntersections(const Line &line){
+
+Vector Cuboid_impl::getCenter() const
+{
+  return Vector(0.5,0.5,0.5);
+}
+
+double Cuboid_impl::getRadius() const
+{
+  return .5;
+}
+
+double Cuboid_impl::getVolume() const
+{
+        return 1.; // l^3
+}
+
+double Cuboid_impl::getSurfaceArea() const
+{
+        return 6.;      // 6 * l^2
+}
+
+LineSegmentSet Cuboid_impl::getLineIntersections(const Line &line) const{
   LineSegmentSet res(line);
   // get the intersection on each of the six faces
@@ -192 +244 @@
 }
 
-std::string Cuboid_impl::toString(){
+std::string Cuboid_impl::toString() const{
   return "Cuboid()";
+}
+
+enum ShapeType Cuboid_impl::getType() const
+{
+        return CuboidType;
 }
 
@@ -203 +260 @@
   ASSERT(false, "Cuboid_impl::getHomogeneousPointsOnSurface() not implemented yet");
   return PointsOnSurface;
+}
+
+std::vector<Vector> Cuboid_impl::getHomogeneousPointsInVolume(const size_t N) const {
+        ASSERT(0,
+                        "Cuboid_impl::getHomogeneousPointsInVolume() - not implemented.");
+        return std::vector<Vector>();
 }