- allow for (rather unusual) ////// cloud groups

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

diff --git a/simgear/math/point3d.hxx b/simgear/math/point3d.hxx
index 3980e203053bf331ff0aca8898656368b85931b8..79ce830341b67d26906985ab9bc4d0f107f0a574 100644 (file)
--- a/simgear/math/point3d.hxx
+++ b/simgear/math/point3d.hxx
@@ -97,6 +97,8 @@ public:
     static Point3D fromSGGeod(const SGGeod& geod);
     static Point3D fromSGGeoc(const SGGeoc& geoc);
     static Point3D fromSGVec3(const SGVec3<double>& cart);
+    static Point3D fromSGVec3(const SGVec3<float>& cart);
+    static Point3D fromSGVec2(const SGVec2<double>& cart);
 
     // Assignment operators
 
@@ -134,6 +136,7 @@ public:
 
     SGVec3d toSGVec3d(void) const;
     SGVec3f toSGVec3f(void) const;
+    SGVec2f toSGVec2f(void) const;
 
     // friends
     friend Point3D operator - (const Point3D& p);                  // -p1
@@ -242,6 +245,24 @@ inline Point3D Point3D::fromSGVec3(const SGVec3<double>& cart)
   return pt;
 }
 
+inline Point3D Point3D::fromSGVec3(const SGVec3<float>& cart)
+{
+  Point3D pt;
+  pt.setx(cart.x());
+  pt.sety(cart.y());
+  pt.setz(cart.z());
+  return pt;
+}
+
+inline Point3D Point3D::fromSGVec2(const SGVec2<double>& cart)
+{
+  Point3D pt;
+  pt.setx(cart.x());
+  pt.sety(cart.y());
+  pt.setz(0);
+  return pt;
+}
+
 // ASSIGNMENT OPERATORS
 
 inline Point3D& Point3D::operator = (const Point3D& p)
@@ -354,6 +375,11 @@ inline SGVec3f Point3D::toSGVec3f(void) const
   return SGVec3f(x(), y(), z());
 }
 
+inline SGVec2f Point3D::toSGVec2f(void) const
+{
+  return SGVec2f(x(), y());
+}
+
 // FRIENDS
 
 inline Point3D operator - (const Point3D& a)