Changeset fca6e7

Timestamp:

Oct 2, 2009, 3:18:43 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

daf956

Parents:

60cbe5

Message:

FIX of Vector::GetIntersectionWithPlane()

• Direction was not normalized.
• simple case of origin is in-plane not immediately returned.

File:

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

molecuilder/src/vector.cpp

@@ -224 +224 @@
   Direction.CopyVector(LineVector);
   Direction.SubtractVector(Origin);
+  Direction.Normalize();
   //*out << Verbose(4) << "INFO: Direction is " << Direction << "." << endl;
   factor = Direction.ScalarProduct(PlaneNormal);
@@ -233 +234 @@
   helper.SubtractVector(Origin);
   factor = helper.ScalarProduct(PlaneNormal)/factor;
+  if (factor < MYEPSILON) { // Origin is in-plane
+    //*out << Verbose(2) << "Origin of line is in-plane, simple." << endl;
+    CopyVector(Origin);
+    return true;
+  }
   //factor = Origin->ScalarProduct(PlaneNormal)*(-PlaneOffset->ScalarProduct(PlaneNormal))/(Direction.ScalarProduct(PlaneNormal));
   Direction.Scale(factor);