Changeset c0c33f

Timestamp:

Mar 1, 2010, 8:28:32 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

978bcd

Parents:

b1d8ab5

Message:

Added Vector Copy constructors, Vector::GetDistanceVectorToPlane() and Vector::DistanceToVector() makes use of it

• Copy Constructors taking const pointers and const reference as argument
• Vector::DistanceToVector() basically renamed to Vector::GetDistanceVectorToPlane()
• Vector::DistanceToVector() uses the latter

Location:

molecuilder/src

Files:

• vector.cpp (modified) (3 diffs)
• vector.hpp (modified) (2 diffs)

molecuilder/src/vector.cpp

@@ -26 +26 @@
  */
 Vector::Vector() { x[0] = x[1] = x[2] = 0.; };
+
+/** Constructor of class vector.
+ */
+Vector::Vector(const Vector * const a)
+{
+  x[0] = a->x[0];
+  x[1] = a->x[1];
+  x[2] = a->x[2];
+};
+
+/** Constructor of class vector.
+ */
+Vector::Vector(const Vector &a)
+{
+  x[0] = a.x[0];
+  x[1] = a.x[1];
+  x[2] = a.x[2];
+};
 
 /** Constructor of class vector.
@@ -267 +285 @@
 };
 
-/** Calculates the minimum distance of this vector to the plane.
+/** Calculates the minimum distance vector of this vector to the plane.
  * \param *out output stream for debugging
  * \param *PlaneNormal normal of plane
  * \param *PlaneOffset offset of plane
- * \return distance to plane
- */
-double Vector::DistanceToPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset) const
+ * \return distance vector onto to plane
+ */
+Vector Vector::GetDistanceVectorToPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset) const
 {
   Vector temp;
@@ -291 +309 @@
     sign = 0.;
 
-  return (temp.Norm()*sign);
+  temp.Normalize();
+  temp.Scale(sign);
+  return temp;
+};
+
+/** Calculates the minimum distance of this vector to the plane.
+ * \sa Vector::GetDistanceVectorToPlane()
+ * \param *out output stream for debugging
+ * \param *PlaneNormal normal of plane
+ * \param *PlaneOffset offset of plane
+ * \return distance to plane
+ */
+double Vector::DistanceToPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset) const
+{
+  return GetDistanceVectorToPlane(PlaneNormal,PlaneOffset).Norm();
 };
 

molecuilder/src/vector.hpp

@@ -27 +27 @@
 
   Vector();
+  Vector(const Vector * const a);
+  Vector(const Vector &a);
   Vector(const double x1, const double x2, const double x3);
   ~Vector();
@@ -67 +69 @@
   void LinearCombinationOfVectors(const Vector * const x1, const Vector * const x2, const Vector * const x3, const double * const factors);
   double CutsPlaneAt(const Vector * const A, const Vector * const B, const Vector * const C) const;
+  Vector GetDistanceVectorToPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset) const;
   bool GetIntersectionWithPlane(const Vector * const PlaneNormal, const Vector * const PlaneOffset, const Vector * const Origin, const Vector * const LineVector);
   bool GetIntersectionOfTwoLinesOnPlane(const Vector * const Line1a, const Vector * const Line1b, const Vector * const Line2a, const Vector * const Line2b, const Vector *Normal = NULL);