Changeset 6c6d84 for molecuilder/src/vector.cpp

Timestamp:

Aug 20, 2009, 11:35:19 AM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

bc3953

Parents:

84b811

Message:

Ticket 16: Unit tests for Vector::RotateVector(), additionally fixing the function

File:

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

molecuilder/src/vector.cpp

@@ -467 +467 @@
 };
 
-/** Rotates the vector around the axis given by \a *axis by an angle of \a alpha.
+/** Rotates the vector relative to the origin around the axis given by \a *axis by an angle of \a alpha.
  * \param *axis rotation axis
  * \param alpha rotation angle in radian
@@ -478 +478 @@
   a.ProjectOntoPlane(axis);
   // construct normal vector
-  y.MakeNormalVector(axis,this);
+  bool rotatable = y.MakeNormalVector(axis,&a);
+  // The normal vector cannot be created if there is linar dependency.
+  // Then the vector to rotate is on the axis and any rotation leads to the vector itself.
+  if (!rotatable) {
+    return;
+  }
   y.Scale(Norm());
   // scale normal vector by sine and this vector by cosine
   y.Scale(sin(alpha));
-  Scale(cos(alpha));
+  a.Scale(cos(alpha));
+  CopyVector(Projection(axis));
   // add scaled normal vector onto this vector
   AddVector(&y);