Check return value of FDM::init().

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

diff --git a/src/FDM/JSBSim/FGTranslation.h b/src/FDM/JSBSim/FGTranslation.h
index b742a07f71c888f1910e8c25db2e36052c18d0ec..cb3696b46127438e18b3365d71ab539089b2f643 100644 (file)
--- a/src/FDM/JSBSim/FGTranslation.h
+++ b/src/FDM/JSBSim/FGTranslation.h
@@ -1,32 +1,32 @@
 /*******************************************************************************
-
+ 
  Header:       FGTranslation.h
  Author:       Jon Berndt
  Date started: 12/02/98
-
+ 
  ------------- Copyright (C) 1999  Jon S. Berndt (jsb@hal-pc.org) -------------
-
+ 
  This program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; either version 2 of the License, or (at your option) any later
  version.
-
+ 
  This program is distributed in the hope that it will be useful, but WITHOUT
  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  details.
-
+ 
  You should have received a copy of the GNU General Public License along with
  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  Place - Suite 330, Boston, MA  02111-1307, USA.
-
+ 
  Further information about the GNU General Public License can also be found on
  the world wide web at http://www.gnu.org.
-
+ 
 HISTORY
 --------------------------------------------------------------------------------
 12/02/98   JSB   Created
-
+ 
 ********************************************************************************
 COMMENTS, REFERENCES,  and NOTES
 ********************************************************************************
@@ -41,10 +41,10 @@ COMMENTS, REFERENCES,  and NOTES
     Wiley & Sons, 1979 ISBN 0-471-03032-5
 [5] Bernard Etkin, "Dynamics of Flight, Stability and Control", Wiley & Sons,
     1982 ISBN 0-471-08936-2
-
+ 
   The order of rotations used in this class corresponds to a 3-2-1 sequence,
   or Y-P-R, or Z-Y-X, if you prefer.
-
+ 
 ********************************************************************************
 SENTRY
 *******************************************************************************/
@@ -70,56 +70,61 @@ INCLUDES
 #include "FGModel.h"
 #include "FGMatrix.h"
 
-using namespace std;
+#define ID_TRANSLATION "$Header"
 
 /*******************************************************************************
 CLASS DECLARATION
 *******************************************************************************/
 
-#pragma warn -8026
-
-class FGTranslation : public FGModel
-{
+class FGTranslation : public FGModel {
 public:
-   FGTranslation(FGFDMExec*);
-   ~FGTranslation(void);
+  FGTranslation(FGFDMExec*);
+  ~FGTranslation(void);
 
-   inline FGColumnVector GetUVW(void) {return vUVW;}
+  inline FGColumnVector GetUVW(void) { return vUVW; }
+  inline FGColumnVector GetUVWdot(void) { return vUVWdot; }
+  inline FGColumnVector GetNcg(void) { return vNcg; }
 
-   inline float Getalpha(void) {return alpha;}
-   inline float Getbeta (void) {return beta; }
-   inline float Getgamma(void) {return gamma;}
-   inline float Getqbar (void) {return qbar;}
-   inline float GetVt   (void) {return Vt;}
-   inline float GetMach (void) {return Mach;}
+  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;}
+  void SetUVW(FGColumnVector tt) { vUVW = tt; }
 
-   inline void Setalpha(float tt) {alpha = tt;}
-   inline void Setbeta (float tt) {beta  = tt;}
-   inline void Setgamma(float tt) {gamma = tt;}
-   inline void Setqbar (float tt) {qbar = tt;}
-   inline void SetVt   (float tt) {Vt = 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 SetABG(float t1, float t2, float t3) {alpha=t1; beta=t2; gamma=t3;}
+  inline void SetAB(float t1, float t2) { alpha=t1; beta=t2; }
 
-   bool Run(void);
+  bool Run(void);
 
 protected:
 
 private:
-  FGColumnVector vUVW;
+  FGColumnVector vUVW,vWindUVW;
+  FGColumnVector vUVWdot;
+  FGColumnVector vNcg;
   FGColumnVector vPQR;
   FGColumnVector vForces;
   FGColumnVector vEuler;
+
   float Vt, qbar, Mach;
   float Mass, dt;
-  float alpha, beta, gamma;
+  float alpha, beta;
+  float adot,bdot;
   float rho;
 
   void GetState(void);
 };
-#pragma warn .8026
 
 /******************************************************************************/
 #endif