Fixes from Cameron Moore:

[flightgear.git] / src / FDM / JSBSim / FGPosition.h

diff --git a/src/FDM/JSBSim/FGPosition.h b/src/FDM/JSBSim/FGPosition.h
index ca455cacd72d2b1594e89dba71ab0fcdf1874f50..7287ff993b45eb4657830d5bfc2e53922ad85c99 100644 (file)
--- a/src/FDM/JSBSim/FGPosition.h
+++ b/src/FDM/JSBSim/FGPosition.h
@@ -78,6 +78,8 @@ public:
   /// Destructor
   ~FGPosition();
 
+  bool InitModel(void);
+
   /** Runs the Position model; called by the Executive
       @see JSBSim.cpp documentation
       @return false if no error */
@@ -102,10 +104,11 @@ public:
   inline FGColumnVector3& GetRunwayNormal(void) { return vRunwayNormal; }
   
   inline double GetGamma(void) { return gamma; }
-  inline void SetGamma(float tt) { gamma = tt; }
-  inline double GetHOverB(void) { return hoverb; }
+  inline void SetGamma(double tt) { gamma = tt; }
+  inline double GetHOverBCG(void) { return hoverbcg; }
+  inline double GetHOverBMAC(void){ return hoverbmac; }
   void SetvVel(const FGColumnVector3& v) { vVel = v; }
-  void SetLatitude(float tt) { Latitude = tt; }
+  void SetLatitude(double tt) { Latitude = tt; }
   void SetLongitude(double tt) { Longitude = tt; }
   void Seth(double tt);
   void SetRunwayRadius(double tt) { RunwayRadius = tt; }
@@ -120,23 +123,22 @@ private:
   FGColumnVector3 vVelDot;
   FGColumnVector3 vRunwayNormal;
   
-  double Vee, invMass, invRadius;
   double Radius, h;
   double LatitudeDot, LongitudeDot, RadiusDot;
   double lastLatitudeDot, lastLongitudeDot, lastRadiusDot;
   double Longitude, Latitude;
-  float dt;
+  double dt;
   double RunwayRadius;
   double DistanceAGL;
   double SeaLevelRadius;
   double gamma;
   double Vt, Vground;
-  float hoverb,b;
+  double hoverbcg,hoverbmac,b;
 
   double psigt;
 
   void GetState(void);
-  void Debug(void);
+  void Debug(int from);
 };
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%