Changeset 91b1e79 for molecuilder/src/tesselation.cpp

Timestamp:

Jan 11, 2010, 9:16:36 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

afa056

Parents:

d403a1

git-author:

Frederik Heber <heber@…> (01/11/10 09:13:49)

git-committer:

Frederik Heber <heber@…> (01/11/10 09:16:36)

Message:

Fixed Tesselation::IsInnerPoint()

• Both unit tests TesselationInsideOutsideTest and VectorUnitTest are working (and also all others btw);
• FIX: BoundaryTriangleSet::GetIntersectionInsideTriangle() - checks whether intersection is one endpoint and performs the GetIntersectionOfTwoLinesOnPlane() right away to check whether we are inside of triangle
• FIX: Vector::GetIntersectionOfTwoLinesOnPlane() - parallelity is now checked correctly and in accordance with interface description fixed in VectorUnitTest.

Signed-off-by: Frederik Heber <heber@tabletINS.(none)>

File:

• molecuilder/src/tesselation.cpp (modified) (2 diffs)

molecuilder/src/tesselation.cpp

@@ -402 +402 @@
 bool BoundaryTriangleSet::GetIntersectionInsideTriangle(Vector *MolCenter, Vector *x, Vector *Intersection)
 {
-        Info FunctionInfo(__func__);
+  Info FunctionInfo(__func__);
   Vector CrossPoint;
   Vector helper;
@@ -415 +415 @@
   Log() << Verbose(1) << "INFO: Intersection is " << *Intersection << "." << endl;
 
+  if (Intersection->DistanceSquared(endpoints[0]->node->node) < MYEPSILON) {
+    Log() << Verbose(1) << "Intersection coindices with first endpoint." << endl;
+    return true;
+  }   else if (Intersection->DistanceSquared(endpoints[1]->node->node) < MYEPSILON) {
+    Log() << Verbose(1) << "Intersection coindices with second endpoint." << endl;
+    return true;
+  }   else if (Intersection->DistanceSquared(endpoints[2]->node->node) < MYEPSILON) {
+    Log() << Verbose(1) << "Intersection coindices with third endpoint." << endl;
+    return true;
+  }
   // Calculate cross point between one baseline and the line from the third endpoint to intersection
   int i=0;
   do {
     if (CrossPoint.GetIntersectionOfTwoLinesOnPlane(endpoints[i%3]->node->node, endpoints[(i+1)%3]->node->node, endpoints[(i+2)%3]->node->node, Intersection, &NormalVector)) {
+      helper.CopyVector(endpoints[(i+1)%3]->node->node);
+      helper.SubtractVector(endpoints[i%3]->node->node);
       CrossPoint.SubtractVector(endpoints[i%3]->node->node);  // cross point was returned as absolute vector
+      const double s = CrossPoint.ScalarProduct(&helper)/helper.NormSquared();
+      Log() << Verbose(1) << "INFO: Factor s is " << s << "." << endl;
+      if ((s < -MYEPSILON) || ((s-1.) > MYEPSILON)) {
+        Log() << Verbose(1) << "INFO: Crosspoint " << CrossPoint << "outside of triangle." << endl;
+        i=4;
+        break;
+      }
       i++;
     } else