Merge branch 'maint' into next

[simgear.git] / simgear / math / SGVec3.hxx

diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx
index 3d375c0b72595b712ef818758b0d7e2fe1a49e63..7695819915e718e1a518910edb5dafbb85bb6aaa 100644 (file)
--- a/simgear/math/SGVec3.hxx
+++ b/simgear/math/SGVec3.hxx
@@ -261,6 +261,15 @@ SGVec3<T>
 operator*(const SGVec3<T>& v, S s)
 { return SGVec3<T>(s*v(0), s*v(1), s*v(2)); }
 
+/// multiplication as a multiplicator, that is assume that the first vector
+/// represents a 3x3 diagonal matrix with the diagonal elements in the vector.
+/// Then the result is the product of that matrix times the second vector.
+template<typename T>
+inline
+SGVec3<T>
+mult(const SGVec3<T>& v1, const SGVec3<T>& v2)
+{ return SGVec3<T>(v1(0)*v2(0), v1(1)*v2(1), v1(2)*v2(2)); }
+
 /// component wise min
 template<typename T>
 inline
@@ -379,10 +388,10 @@ perpendicular(const SGVec3<T>& v)
   if (absv2 < absv1 && absv3 < absv1) {
     T quot = v(1)/v(0);
     return (1/sqrt(1+quot*quot))*SGVec3<T>(quot, -1, 0);
-  } else if (absv1 < absv2 && absv3 < absv2) {
+  } else if (absv3 < absv2) {
     T quot = v(2)/v(1);
     return (1/sqrt(1+quot*quot))*SGVec3<T>(0, quot, -1);
-  } else if (absv1 < absv3 && absv2 < absv3) {
+  } else if (SGLimits<T>::min() < absv3) {
     T quot = v(0)/v(2);
     return (1/sqrt(1+quot*quot))*SGVec3<T>(-1, 0, quot);
   } else {