Changeset daf5d6 for molecuilder/src/tesselationhelpers.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/tesselationhelpers.cpp (modified) (2 diffs)

molecuilder/src/tesselationhelpers.cpp

@@ -359 +359 @@
   HeightA.SubtractVector(&par.x1);
 
-  t1 = HeightA.Projection(&SideA)/SideA.ScalarProduct(&SideA);
+  t1 = HeightA.ScalarProduct(&SideA)/SideA.ScalarProduct(&SideA);
 
   SideB.CopyVector(&par.x4);
@@ -366 +366 @@
   HeightB.SubtractVector(&par.x3);
 
-  t2 = HeightB.Projection(&SideB)/SideB.ScalarProduct(&SideB);
+  t2 = HeightB.ScalarProduct(&SideB)/SideB.ScalarProduct(&SideB);
 
   cout << Verbose(2) << "Intersection " << intersection << " is at "