builddir -> srcdir so builds can be done outside the master source directory.

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

diff --git a/src/FDM/JSBSim/FGRotation.h b/src/FDM/JSBSim/FGRotation.h
index ce568e308a8ac78f1599868d5a60c4c949db5f24..f40d549307f428edd5fd987c8089dcdb486f91ab 100644 (file)
--- a/src/FDM/JSBSim/FGRotation.h
+++ b/src/FDM/JSBSim/FGRotation.h
@@ -67,6 +67,11 @@ INCLUDES
 #  include <cmath>
 #endif
 
+#ifndef M_PI
+#  include <simgear/constants.h>
+#  define M_PI FG_PI
+#endif
+
 #include "FGModel.h"
 #include "FGMatrix.h"
 
@@ -74,15 +79,18 @@ INCLUDES
 CLASS DECLARATION
 *******************************************************************************/
 
-#pragma warn -8026
-
 class FGRotation : public FGModel
 {
   FGColumnVector vPQR;
   FGColumnVector vPQRdot;
   FGColumnVector vMoments;
   FGColumnVector vEuler;
-
+  FGColumnVector vEulerRates;
+  
+  float cTht,sTht;
+  float cPhi,sPhi;
+  float cPsi,sPsi;
+  
   float Ixx, Iyy, Izz, Ixz;
   float dt;
 
@@ -97,13 +105,25 @@ public:
   inline FGColumnVector GetPQR(void) {return vPQR;}
   inline FGColumnVector GetPQRdot(void) {return vPQRdot;}
   inline FGColumnVector GetEuler(void) {return vEuler;}
+  inline FGColumnVector GetEulerRates(void) { return vEulerRates; }
   inline void SetPQR(FGColumnVector tt) {vPQR = tt;}
   inline void SetEuler(FGColumnVector tt) {vEuler = tt;}
+  
   inline float Getphi(void) {return vEuler(1);}
   inline float Gettht(void) {return vEuler(2);}
   inline float Getpsi(void) {return vEuler(3);}
+  
+  inline float GetCosphi(void) {return cPhi;}
+  inline float GetCostht(void) {return cTht;}
+  inline float GetCospsi(void) {return cPsi;}
+
+  inline float GetSinphi(void) {return sPhi;}
+  inline float GetSintht(void) {return sTht;}
+  inline float GetSinpsi(void) {return sPsi;}
+
+
+
 };
-#pragma warn .8026
 
 /******************************************************************************/
 #endif