Changeset daf5d6 for molecuilder/src/tesselation.cpp

Timestamp:

Aug 19, 2009, 12:30:21 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

78dac6

Parents:

27459a (diff), 6c09a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'VectorUnitTest' into ConcaveHull

File:

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

molecuilder/src/tesselation.cpp

@@ -349 +349 @@
 
   // make it always point inward (any offset vector onto plane projected onto normal vector suffices)
-  if (NormalVector.Projection(&OtherVector) > 0)
+  if (NormalVector.ScalarProduct(&OtherVector) > 0.)
     NormalVector.Scale(-1.);
 };
@@ -737 +737 @@
           TrialVector.CopyVector(checker->second->node->node);
           TrialVector.SubtractVector(A->second->node->node);
-          distance = TrialVector.Projection(&PlaneVector);
+          distance = TrialVector.ScalarProduct(&PlaneVector);
           if (fabs(distance) < 1e-4) // we need to have a small epsilon around 0 which is still ok
             continue;
@@ -897 +897 @@
         TempVector.SubtractVector(baseline->second->endpoints[0]->node->node); // TempVector is vector on triangle plane pointing from one baseline egde towards center!
         //*out << Verbose(2) << "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << "." << endl;
-        if (PropagationVector.Projection(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
+        if (PropagationVector.ScalarProduct(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
           PropagationVector.Scale(-1.);
         *out << Verbose(4) << "PropagationVector of base triangle is " << PropagationVector << endl;
@@ -957 +957 @@
             TempVector.SubtractVector(Center);
             // make it always point outward
-            if (VirtualNormalVector.Projection(&TempVector) < 0)
+            if (VirtualNormalVector.ScalarProduct(&TempVector) < 0)
               VirtualNormalVector.Scale(-1.);
             // calculate angle
@@ -1530 +1530 @@
         AddTesselationLine(TPS[0], TPS[1], 0);
       }
-      cout << Verbose(2) << "Projection is " << BTS->NormalVector.Projection(&Oben) << "." << endl;
+      cout << Verbose(2) << "Projection is " << BTS->NormalVector.ScalarProduct(&Oben) << "." << endl;
     }
     if (BTS != NULL) // we have created one starting triangle