Synchronized with JSBSim/CVS

[flightgear.git] / src / Navaids / routePath.hxx

diff --git a/src/Navaids/routePath.hxx b/src/Navaids/routePath.hxx
index d04c03d08198996db56199bf7e54bdbec44c72fb..778e0d00ef68a268b9931bc62095a4403cadddfa 100644 (file)
--- a/src/Navaids/routePath.hxx
+++ b/src/Navaids/routePath.hxx
@@ -29,6 +29,7 @@
 namespace flightgear
 {
   class Hold;
+  class FlightPlan;
 }
 
 typedef std::vector<SGGeod> SGGeodVec;
@@ -37,12 +38,15 @@ class RoutePath
 {
 public:
   RoutePath(const flightgear::WayptVec& wpts);
-
+  RoutePath(const flightgear::FlightPlan* fp);
+  
   SGGeodVec pathForIndex(int index) const;
   
   SGGeod positionForIndex(int index) const;
   
 private:
+  void commonInit();
+  
   class PathCtx;
   
   SGGeodVec pathForHold(flightgear::Hold* hold) const;
@@ -51,6 +55,8 @@ private:
   double computeAltitudeForIndex(int index) const;
   double computeTrackForIndex(int index) const;
   
+  void interpolateGreatCircle(const SGGeod& aFrom, const SGGeod& aTo, SGGeodVec& r) const;
+  
   /**
    * Find the distance (in Nm) to climb/descend a height in feet
    */