Changes in src/Plane.cpp [27ac00:d4c9ae]

File:

• src/Plane.cpp (modified) (4 diffs)

src/Plane.cpp

@@ -14 +14 @@
 #include "Helpers/Assert.hpp"
 #include <cmath>
-#include "Line.hpp"
-#include "Exceptions/MultipleSolutionsException.hpp"
 
 /**
@@ -44 +42 @@
 /**
  * Constructs a plane from two direction vectors and a offset.
+ * If no offset is given a plane through origin is assumed
  */
 Plane::Plane(const Vector &y1, const Vector &y2, double _offset) throw(ZeroVectorException,LinearDependenceException) :
@@ -114 +113 @@
 }
 
-Vector Plane::getOffsetVector() const {
+Vector Plane::getOffsetVector() {
   return getOffset()*getNormal();
 }
 
-vector<Vector> Plane::getPointsOnPlane() const{
+vector<Vector> Plane::getPointsOnPlane(){
   std::vector<Vector> res;
   res.reserve(3);
@@ -148 +147 @@
  * \return true -  \a this contains intersection point on return, false - line is parallel to plane (even if in-plane)
  */
-Vector Plane::GetIntersection(const Line& line) const
+Vector Plane::GetIntersection(const Vector &Origin, const Vector &LineVector)
 {
   Info FunctionInfo(__func__);
   Vector res;
 
-  double factor1 = getNormal().ScalarProduct(line.getDirection());
-  if(fabs(factor1)<MYEPSILON){
-    // the plane is parallel... under all circumstances this is bad luck
-    // we no have either no or infinite solutions
-    if(isContained(line.getOrigin())){
-      throw MultipleSolutionsException<Vector>(__FILE__,__LINE__,line.getOrigin());
-    }
-    else{
-      throw LinearDependenceException(__FILE__,__LINE__);
-    }
-  }
-
-  double factor2 = getNormal().ScalarProduct(line.getOrigin());
+  // find intersection of a line defined by Offset and Direction with a  plane defined by triangle
+  Vector Direction = LineVector - Origin;
+  Direction.Normalize();
+  Log() << Verbose(1) << "INFO: Direction is " << Direction << "." << endl;
+  //Log() << Verbose(1) << "INFO: PlaneNormal is " << *PlaneNormal << " and PlaneOffset is " << *PlaneOffset << "." << endl;
+  double factor1 = Direction.ScalarProduct(*normalVector.get());
+  if (fabs(factor1) < MYEPSILON) { // Uniqueness: line parallel to plane?
+    Log() << Verbose(1) << "BAD: Line is parallel to plane, no intersection." << endl;
+    throw LinearDependenceException(__FILE__,__LINE__);
+  }
+
+  double factor2 = Origin.ScalarProduct(*normalVector.get());
+  if (fabs(factor2-offset) < MYEPSILON) { // Origin is in-plane
+    Log() << Verbose(1) << "GOOD: Origin of line is in-plane." << endl;
+    res = Origin;
+    return res;
+  }
+
   double scaleFactor = (offset-factor2)/factor1;
 
-  res = line.getOrigin() + scaleFactor * line.getDirection();
-
-  // tests to make sure the resulting vector really is on plane and line
-  ASSERT(isContained(res),"Calculated line-Plane intersection does not lie on plane.");
-  ASSERT(line.isContained(res),"Calculated line-Plane intersection does not lie on line.");
+  //factor = Origin->ScalarProduct(PlaneNormal)*(-PlaneOffset->ScalarProduct(PlaneNormal))/(Direction.ScalarProduct(PlaneNormal));
+  Direction.Scale(scaleFactor);
+  res = Origin + Direction;
+  Log() << Verbose(1) << "INFO: Scaled direction is " << Direction << "." << endl;
+
+  // test whether resulting vector really is on plane
+  ASSERT(fabs(res.ScalarProduct(*normalVector) - offset) < MYEPSILON,
+         "Calculated line-Plane intersection does not lie on plane.");
   return res;
 };
-
-Vector Plane::mirrorVector(const Vector &rhs) const {
-  Vector helper = getVectorToPoint(rhs);
-  // substract twice the Vector to the plane
-  return rhs+2*helper;
-}
-
-Line Plane::getOrthogonalLine(const Vector &origin) const{
-  return Line(origin,getNormal());
-}
 
 /************ Methods inherited from Space ****************/