Merge branch 'maint' into next

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

diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx
index 9e07584e1755411837ea83b8effadb930fd8282f..4ec4145a399f005a05ab88d85d1271f2cb919488 100644 (file)
--- a/simgear/math/SGVec3.hxx
+++ b/simgear/math/SGVec3.hxx
@@ -92,6 +92,9 @@ public:
   /// make sure it has at least 3 elements
   explicit SGVec3(const T* d)
   { data()[0] = d[0]; data()[1] = d[1]; data()[2] = d[2]; }
+  template<typename S>
+  explicit SGVec3(const SGVec3<S>& d)
+  { data()[0] = d[0]; data()[1] = d[1]; data()[2] = d[2]; }
   explicit SGVec3(const osg::Vec3f& d)
   { data()[0] = d[0]; data()[1] = d[1]; data()[2] = d[2]; }
   explicit SGVec3(const osg::Vec3d& d)
@@ -261,6 +264,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 +391,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 {
@@ -412,6 +424,43 @@ bool
 operator!=(const SGVec3<T>& v1, const SGVec3<T>& v2)
 { return ! (v1 == v2); }
 
+/// Return true if smaller, good for putting that into a std::map
+template<typename T>
+inline
+bool
+operator<(const SGVec3<T>& v1, const SGVec3<T>& v2)
+{
+  if (v1(0) < v2(0)) return true;
+  else if (v2(0) < v1(0)) return false;
+  else if (v1(1) < v2(1)) return true;
+  else if (v2(1) < v1(1)) return false;
+  else return (v1(2) < v2(2));
+}
+
+template<typename T>
+inline
+bool
+operator<=(const SGVec3<T>& v1, const SGVec3<T>& v2)
+{
+  if (v1(0) < v2(0)) return true;
+  else if (v2(0) < v1(0)) return false;
+  else if (v1(1) < v2(1)) return true;
+  else if (v2(1) < v1(1)) return false;
+  else return (v1(2) <= v2(2));
+}
+
+template<typename T>
+inline
+bool
+operator>(const SGVec3<T>& v1, const SGVec3<T>& v2)
+{ return operator<(v2, v1); }
+
+template<typename T>
+inline
+bool
+operator>=(const SGVec3<T>& v1, const SGVec3<T>& v2)
+{ return operator<=(v2, v1); }
+
 /// Return true if equal to the relative tolerance tol
 template<typename T>
 inline