Changes in src/Tesselation/BoundaryTriangleSet.cpp [94d5ac6:b8d215]

File:

• src/Tesselation/BoundaryTriangleSet.cpp (modified) (7 diffs)

src/Tesselation/BoundaryTriangleSet.cpp

@@ -94 +94 @@
   // set endpoints
   int Counter = 0;
-  LOG(4, "DEBUG: New triangle " << Nr << " with end points: ");
+  LOG(4, "DEBUG: New triangle " << Nr << " with end points ... and lines:");
   for (PointMap::iterator runner = OrderMap.begin(); runner != OrderMap.end(); runner++) {
     endpoints[Counter] = runner->second;
-    LOG(4, "DEBUG:    " << *endpoints[Counter]);
+    LOG(4, "DEBUG:    " << *endpoints[Counter] << "\t\t" << *lines[Counter]);
     Counter++;
   }
@@ -246 +246 @@
 
   // 1. get intersection with plane
-  LOG(3, "DEBUG: Looking for closest point of triangle " << *this << " to " << x << ".");
-  LOG(3, "DEBUG: endpoints are " << endpoints[0]->node->getPosition() << ","
+  LOG(4, "DEBUG: Looking for closest point of triangle " << *this << " to " << x << ".");
+  LOG(5, "DEBUG: endpoints are " << endpoints[0]->node->getPosition() << ","
       << endpoints[1]->node->getPosition() << ", and " << endpoints[2]->node->getPosition() << ".");
   try {
@@ -256 +256 @@
   }
   Vector InPlane(ClosestPoint); // points from plane intersection to straight-down point
-  LOG(4, "DEBUG: Closest point on triangle plane is " << ClosestPoint << ".");
+  LOG(5, "DEBUG: Closest point on triangle plane is " << ClosestPoint << ".");
 
   // 2. Calculate in plane part of line (x, intersection)
@@ -269 +269 @@
     CrossPoint[i] = l.getClosestPoint(InPlane);
     // NOTE: direction of line is normalized, hence s must not necessarily be in [0,1] for the baseline
-    LOG(4, "DEBUG: Closest point on line from " << (endpoints[(i+1)%3]->node->getPosition())
+    LOG(5, "DEBUG: Closest point on line from " << (endpoints[(i+1)%3]->node->getPosition())
         << " to " << (endpoints[i%3]->node->getPosition()) << " is " << CrossPoint[i] << ".");
     CrossPoint[i] -= (endpoints[(i+1)%3]->node->getPosition());  // cross point was returned as absolute vector
     const double s = CrossPoint[i].ScalarProduct(Direction)/Direction.NormSquared();
-    LOG(5, "DEBUG: Factor s is " << s << ".");
+    LOG(6, "DEBUG: Factor s is " << s << ".");
     if ((s >= -MYEPSILON) && ((s-1.) <= MYEPSILON)) {
       CrossPoint[i] += (endpoints[(i+1)%3]->node->getPosition());  // make cross point absolute again
-      LOG(5, "DEBUG: Crosspoint is " << CrossPoint[i] << ", intersecting BoundaryLine between "
+      LOG(6, "DEBUG: Crosspoint is " << CrossPoint[i] << ", intersecting BoundaryLine between "
           << endpoints[i % 3]->node->getPosition() << " and "
           << endpoints[(i + 1) % 3]->node->getPosition() << ".");
@@ -285 +285 @@
       else
         CrossPoint[i] = (endpoints[i%3]->node->getPosition());
-      LOG(5, "DEBUG: Crosspoint is " << CrossPoint[i] << ", intersecting outside of BoundaryLine between "
+      LOG(6, "DEBUG: Crosspoint is " << CrossPoint[i] << ", intersecting outside of BoundaryLine between "
           << endpoints[i % 3]->node->getPosition() << " and "
           << endpoints[(i + 1) % 3]->node->getPosition() << ".");
@@ -312 +312 @@
     ShortestDistance = InPlane.DistanceSquared(x);
   }
-  LOG(3, "DEBUG: Closest Point is " << ClosestPoint << " with shortest squared distance is " << ShortestDistance << ".");
+  LOG(4, "DEBUG: Closest Point is " << ClosestPoint << " with shortest squared distance is " << ShortestDistance << ".");
 
   return ShortestDistance;
@@ -367 +367 @@
 {
   //Info FunctionInfo(__func__);
-  LOG(1, "INFO: Checking " << Points[0] << "," << Points[1] << "," << Points[2] << " against " << endpoints[0] << "," << endpoints[1] << "," << endpoints[2] << ".");
-  return (((endpoints[0] == Points[0]) || (endpoints[0] == Points[1]) || (endpoints[0] == Points[2])) && ((endpoints[1] == Points[0]) || (endpoints[1] == Points[1]) || (endpoints[1] == Points[2])) && ((endpoints[2] == Points[0]) || (endpoints[2] == Points[1]) || (endpoints[2] == Points[2])
+  LOG(5, "DEBUG: Checking " << *Points[0] << "," << *Points[1] << "," << *Points[2]
+      << " against " << *this); //*endpoints[0] << "," << *endpoints[1] << "," << *endpoints[2] << ".");
+  return (((endpoints[0] == Points[0]) || (endpoints[0] == Points[1]) || (endpoints[0] == Points[2]))
+      && ((endpoints[1] == Points[0]) || (endpoints[1] == Points[1]) || (endpoints[1] == Points[2]))
+      && ((endpoints[2] == Points[0]) || (endpoints[2] == Points[1]) || (endpoints[2] == Points[2])
 
   ));