Changeset 66ce7a for molecuilder/src/boundary.cpp

Timestamp:

Aug 19, 2009, 12:22:08 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

6c09a4

Parents:

da84d6

Message:

Replaced Vector::Projection() by Vector::ScalarProduct()

• Projection before was just a return of the Vector::ScalarProduct(). We change it now, to make it return a projected vector, the counterpart to ProjectOntoPlane

File:

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

molecuilder/src/boundary.cpp

@@ -308 +308 @@
 
       //*out << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
-      if (ProjectedVector.Projection(&AngleReferenceNormalVector) > 0) {
+      if (ProjectedVector.ScalarProduct(&AngleReferenceNormalVector) > 0) {
         angle = 2. * M_PI - angle;
       }
@@ -804 +804 @@
       G = sqrt(((a + b + c) * (a + b + c) - 2 * (a * a + b * b + c * c)) / 16.); // area of tesselated triangle
       x.MakeNormalVector(runner->second->endpoints[0]->node->node, runner->second->endpoints[1]->node->node, runner->second->endpoints[2]->node->node);
-      x.Scale(runner->second->endpoints[1]->node->node->Projection(&x));
+      x.Scale(runner->second->endpoints[1]->node->node->ScalarProduct(&x));
       h = x.Norm(); // distance of CoG to triangle
       PyramidVolume = (1. / 3.) * G * h; // this formula holds for _all_ pyramids (independent of n-edge base or (not) centered peak)