From a315384a319c84f445d0acbf48f331396bc86c3b Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 3 Mar 2014 07:39:22 +0100
Subject: [PATCH] [MathLib] Vector3: Reimpl. crossProduct() as a friend.
---
MathLib/Vector3.h | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/MathLib/Vector3.h b/MathLib/Vector3.h
index 2ff5c2da2af..09a5c0dbdb4 100644
--- a/MathLib/Vector3.h
+++ b/MathLib/Vector3.h
@@ -102,14 +102,13 @@ public:
template <typename T1>
friend T1 scalarProduct(TemplateVector3<T1> const& v, TemplateVector3<T1> const& w);
- /// Cross product as the multiplication operator
- TemplateVector3 operator*(const TemplateVector3 & pV) const
- {
- return TemplateVector3 (
- this->_x[1] * pV[2] - this->_x[2] * pV[1],
- this->_x[2] * pV[0] - this->_x[0] * pV[2],
- this->_x[0] * pV[1] - this->_x[1] * pV[0] );
- }
+ /** crossProduct: implementation of cross product,
+ * sometimes called outer product.
+ */
+ template <typename T1>
+ friend TemplateVector3<T1> crossProduct(
+ TemplateVector3<T1> const& v,
+ TemplateVector3<T1> const& w);
/// Cross product with another vector
TemplateVector3 Cross( const TemplateVector3 & pV ) const
@@ -174,6 +173,17 @@ T scalarProduct(TemplateVector3<T> const& v, TemplateVector3<T> const& w)
return v._x[0] * w._x[0] + v._x[1] * w._x[1] + v._x[2] * w._x[2];
}
+template <typename T1>
+TemplateVector3<T1> crossProduct(
+ TemplateVector3<T1> const& v,
+ TemplateVector3<T1> const& w)
+{
+ return TemplateVector3<T1>(
+ v._x[1] * w._x[2] - v._x[2] * w._x[1],
+ v._x[2] * w._x[0] - v._x[0] * w._x[2],
+ v._x[0] * w._x[1] - v._x[1] * w._x[0]);
+}
+
typedef TemplateVector3<double> Vector3;
}
--
GitLab