Changeset 1f591b for molecuilder/src/Plane.cpp

Timestamp:

Apr 13, 2010, 1:22:42 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

e7ea64

Parents:

0f55b2

Message:

Prepared interface of Vector Class for transition to VectorComposites

File:

• molecuilder/src/Plane.cpp (modified) (7 diffs)

molecuilder/src/Plane.cpp

@@ -20 +20 @@
   normalVector(new Vector())
 {
-  Vector x1, x2;
-
-  x1.CopyVector(&y1);
-  x1.SubtractVector(&y2);
-  x2.CopyVector(&y3);
-  x2.SubtractVector(&y2);
-  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(&x2)) < MYEPSILON)) {
+  Vector x1 = y1 -y2;
+  Vector x2 = y3 -y2;
+  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(x2)) < MYEPSILON)) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -41 +37 @@
   normalVector->Normalize();
 
-  offset=normalVector->ScalarProduct(&y1);
+  offset=normalVector->ScalarProduct(y1);
 }
 /**
@@ -51 +47 @@
     offset(_offset)
 {
-  Vector x1,x2;
-  x1.CopyVector(&y1);
-  x2.CopyVector(&y2);
-  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(&x2)) < MYEPSILON)) {
+  Vector x1 = y1;
+  Vector x2 = y2;
+  if ((fabs(x1.Norm()) < MYEPSILON) || (fabs(x2.Norm()) < MYEPSILON) || (fabs(x1.Angle(x2)) < MYEPSILON)) {
     throw LinearDependenceException(__FILE__,__LINE__);
   }
@@ -84 +79 @@
     normalVector(new Vector(_normalVector))
 {
-  offset = normalVector->ScalarProduct(&_offsetVector);
+  offset = normalVector->ScalarProduct(_offsetVector);
 }
 
@@ -126 +121 @@
   Log() << Verbose(1) << "INFO: Direction is " << Direction << "." << endl;
   //Log() << Verbose(1) << "INFO: PlaneNormal is " << *PlaneNormal << " and PlaneOffset is " << *PlaneOffset << "." << endl;
-  double factor1 = Direction.ScalarProduct(normalVector.get());
+  double factor1 = Direction.ScalarProduct(*normalVector.get());
   if (fabs(factor1) < MYEPSILON) { // Uniqueness: line parallel to plane?
     Log() << Verbose(1) << "BAD: Line is parallel to plane, no intersection." << endl;
@@ -132 +127 @@
   }
 
-  double factor2 = Origin.ScalarProduct(normalVector.get());
+  double factor2 = Origin.ScalarProduct(*normalVector.get());
   if (fabs(factor2-offset) < MYEPSILON) { // Origin is in-plane
     Log() << Verbose(1) << "GOOD: Origin of line is in-plane." << endl;
@@ -147 +142 @@
 
   // test whether resulting vector really is on plane
-  ASSERT(fabs(res.ScalarProduct(normalVector.get()) - offset) < MYEPSILON,
+  ASSERT(fabs(res.ScalarProduct((*normalVector.get())) - offset) < MYEPSILON,
          "Calculated line-Plane intersection does not lie on plane.");
   return res;