JSBSim updates. This update changes the file format, so an update of the base

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

diff --git a/src/FDM/JSBSim/FGTranslation.h b/src/FDM/JSBSim/FGTranslation.h
index faac818d251160114f000a7ce3fad8d2e0998b07..8a17e95812621adfb27d179538e14d2d2ab74fdb 100644 (file)
--- a/src/FDM/JSBSim/FGTranslation.h
+++ b/src/FDM/JSBSim/FGTranslation.h
@@ -86,27 +86,33 @@ class FGTranslation : public FGModel {
 public:
   FGTranslation(FGFDMExec*);
   ~FGTranslation();
-
+  
+  inline double           GetUVW   (int idx) const { return vUVW(idx); }
   inline FGColumnVector3& GetUVW   (void)    { return vUVW; }
-  inline double           GetUVW   (int idx) { return vUVW(idx); }
   inline FGColumnVector3& GetUVWdot(void)    { return vUVWdot; }
-  inline double           GetUVWdot(int idx) { return vUVWdot(idx); }
-  inline FGColumnVector3& GetvAeroUVW (void)    { return vAeroUVW; }
-  inline double           GetvAeroUVW (int idx) { return vAeroUVW(idx); }
-
-  inline double Getalpha(void) { return alpha; }
-  inline double Getbeta (void) { return beta; }
-  inline double Getqbar (void) { return qbar; }
-  inline double GetVt   (void) { return Vt; }
-  inline double GetMach (void) { return Mach; }
-  inline double Getadot (void) { return adot; }
-  inline double Getbdot (void) { return bdot; }
+  inline double           GetUVWdot(int idx) const { return vUVWdot(idx); }
+  inline FGColumnVector3& GetAeroUVW (void)    { return vAeroUVW; }
+  inline double           GetAeroUVW (int idx) const { return vAeroUVW(idx); }
+
+  double Getalpha(void) const { return alpha; }
+  double Getbeta (void) const { return beta; }
+  inline double GetMagBeta(void) const { return fabs(beta); }
+  double Getqbar (void) const { return qbar; }
+  double GetqbarUW (void) const { return qbarUW; }
+  double GetqbarUV (void) const { return qbarUV; }
+  inline double GetVt   (void) const { return Vt; }
+  double GetMach (void) const { return Mach; }
+  double Getadot (void) const { return adot; }
+  double Getbdot (void) const { return bdot; }
 
   void SetUVW(FGColumnVector3 tt) { vUVW = tt; }
+  void SetAeroUVW(FGColumnVector3 tt) { vAeroUVW = tt; }
 
   inline void Setalpha(double tt) { alpha = tt; }
   inline void Setbeta (double tt) { beta  = tt; }
   inline void Setqbar (double tt) { qbar = tt; }
+  inline void SetqbarUW (double tt) { qbarUW = tt; }
+  inline void SetqbarUV (double tt) { qbarUV = tt; }
   inline void SetVt   (double tt) { Vt = tt; }
   inline void SetMach (double tt) { Mach=tt; }
   inline void Setadot (double tt) { adot = tt; }
@@ -116,18 +122,21 @@ public:
   
   bool Run(void);
 
+  void bind(void);
+  void unbind(void);
+
 private:
   FGColumnVector3 vUVW;
   FGColumnVector3 vUVWdot;
-  FGColumnVector3 vlastUVWdot;
-  FGMatrix33       mVel;
+  FGColumnVector3 vUVWdot_prev[3];
+  FGMatrix33      mVel;
   FGColumnVector3 vAeroUVW;
 
-  double Vt, qbar, Mach;
+  double Vt, Mach;
+  double qbar, qbarUW, qbarUV;
   double dt;
   double alpha, beta;
   double adot,bdot;
-
   void Debug(int from);
 };