Fixes from Cameron Moore:

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

diff --git a/src/FDM/JSBSim/FGTranslation.h b/src/FDM/JSBSim/FGTranslation.h
index 1729a9d85eb66126b9daef0fabdcbc509e1260b9..faac818d251160114f000a7ce3fad8d2e0998b07 100644 (file)
--- a/src/FDM/JSBSim/FGTranslation.h
+++ b/src/FDM/JSBSim/FGTranslation.h
@@ -64,11 +64,17 @@ INCLUDES
 #    include <math.h>
 #  endif
 #else
-#  include <cmath>
+#  if defined(sgi) && !defined(__GNUC__)
+#    include <math.h>
+#  else
+#    include <cmath>
+#  endif
 #endif
 
 #include "FGModel.h"
-#include "FGMatrix.h"
+#include "FGMatrix33.h"
+#include "FGColumnVector3.h"
+#include "FGColumnVector4.h"
 
 #define ID_TRANSLATION "$Id$"
 
@@ -81,58 +87,48 @@ public:
   FGTranslation(FGFDMExec*);
   ~FGTranslation();
 
-  inline FGColumnVector GetUVW   (void)    { return vUVW; }
-  inline float          GetUVW   (int idx) { return vUVW(idx); }
-  inline FGColumnVector GetUVWdot(void)    { return vUVWdot; }
-  inline float          GetUVWdot(int idx) { return vUVWdot(idx); }
-  inline FGColumnVector GetNcg   (void)    { return vNcg; }
-  inline float          GetNcg   (int idx) { return vNcg(idx); }
-  inline FGColumnVector GetvAero (void)    { return vAero; }
-  inline float          GetvAero (int idx) { return vAero(idx); }
-
-  inline float Getalpha(void) { return alpha; }
-  inline float Getbeta (void) { return beta; }
-  inline float Getqbar (void) { return qbar; }
-  inline float GetVt   (void) { return Vt; }
-  inline float GetMach (void) { return Mach; }
-  inline float Getadot (void) { return adot; }
-  inline float Getbdot (void) { return bdot; }
-
-  void SetUVW(FGColumnVector tt) { vUVW = tt; }
-
-  inline void Setalpha(float tt) { alpha = tt; }
-  inline void Setbeta (float tt) { beta  = tt; }
-  inline void Setqbar (float tt) { qbar = tt; }
-  inline void SetVt   (float tt) { Vt = tt; }
-  inline void SetMach (float tt) { Mach=tt; }
-  inline void Setadot (float tt) { adot = tt; }
-  inline void Setbdot (float tt) { bdot = tt; }
-
-  inline void SetAB(float t1, float t2) { alpha=t1; beta=t2; }
+  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; }
+
+  void SetUVW(FGColumnVector3 tt) { vUVW = tt; }
+
+  inline void Setalpha(double tt) { alpha = tt; }
+  inline void Setbeta (double tt) { beta  = tt; }
+  inline void Setqbar (double tt) { qbar = tt; }
+  inline void SetVt   (double tt) { Vt = tt; }
+  inline void SetMach (double tt) { Mach=tt; }
+  inline void Setadot (double tt) { adot = tt; }
+  inline void Setbdot (double tt) { bdot = tt; }
+
+  inline void SetAB(double t1, double t2) { alpha=t1; beta=t2; }
   
   bool Run(void);
 
-protected:
-
 private:
-  FGColumnVector vUVW;
-  FGColumnVector vUVWdot;
-  FGColumnVector vNcg;
-  FGColumnVector vPQR;
-  FGColumnVector vForces;
-  FGColumnVector vEuler;
-  FGColumnVector vlastUVWdot;
-  FGMatrix       mVel;
-  FGColumnVector vAero;
-
-  float Vt, qbar, Mach;
-  float Mass, dt;
-  float alpha, beta;
-  float adot,bdot;
-  float rho;
-
-  void GetState(void);
-  void Debug(void);
+  FGColumnVector3 vUVW;
+  FGColumnVector3 vUVWdot;
+  FGColumnVector3 vlastUVWdot;
+  FGMatrix33       mVel;
+  FGColumnVector3 vAeroUVW;
+
+  double Vt, qbar, Mach;
+  double dt;
+  double alpha, beta;
+  double adot,bdot;
+
+  void Debug(int from);
 };
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%