math: Move lerp function into SGMisc.

[simgear.git] / simgear / math / SGGeod.cxx

diff --git a/simgear/math/SGGeod.cxx b/simgear/math/SGGeod.cxx
index 370b9725f28db66143953ca923a43f10e0ab9dca..20fa1938369307f92e02a66a3d4358f1e87088b2 100644 (file)
--- a/simgear/math/SGGeod.cxx
+++ b/simgear/math/SGGeod.cxx
@@ -15,6 +15,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "SGMath.hxx"
 
 #ifndef NO_OPENSCENEGRAPH_INTERFACE
@@ -22,7 +26,7 @@
 osg::Matrix SGGeod::makeSimulationFrameRelative() const
 {
     SGQuatd hlOr = SGQuatd::fromLonLat(*this);
-    return osg::Matrix(hlOr.osg());
+    return osg::Matrix(toOsg(hlOr));
 }
 
 osg::Matrix SGGeod::makeSimulationFrame() const
@@ -30,7 +34,7 @@ osg::Matrix SGGeod::makeSimulationFrame() const
     osg::Matrix result(makeSimulationFrameRelative());
     SGVec3d coord;
     SGGeodesy::SGGeodToCart(*this, coord);
-    result.setTrans(coord.osg());
+    result.setTrans(toOsg(coord));
     return result;
 }
 
@@ -48,7 +52,7 @@ osg::Matrix SGGeod::makeZUpFrame() const
     osg::Matrix result(makeZUpFrameRelative());
     SGVec3d coord;
     SGGeodesy::SGGeodToCart(*this, coord);
-    result.setTrans(coord.osg());
+    result.setTrans(toOsg(coord));
     return result;
 }