Better fix for a compilation problem with MSVC 2012

[flightgear.git] / src / FDM / JSBSim / models / propulsion / FGThruster.h

diff --git a/src/FDM/JSBSim/models/propulsion/FGThruster.h b/src/FDM/JSBSim/models/propulsion/FGThruster.h
index 118005f5a408b0498619efcf6c82230cb7197b8d..2b8fac0441f67a0a64e14731f9fe90bb22ec67f2 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGThruster.h
+++ b/src/FDM/JSBSim/models/propulsion/FGThruster.h
@@ -46,7 +46,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_THRUSTER "$Id: FGThruster.h,v 1.15 2009/10/24 22:59:30 jberndt Exp $"
+#define ID_THRUSTER "$Id: FGThruster.h,v 1.20 2012/03/18 15:48:36 jentron Exp $"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
@@ -74,7 +74,7 @@ CLASS DOCUMENTATION
     1.57 (pi/2) results in no thrust at all.
  
     @author Jon Berndt
-    @version $Id: FGThruster.h,v 1.15 2009/10/24 22:59:30 jberndt Exp $
+    @version $Id: FGThruster.h,v 1.20 2012/03/18 15:48:36 jentron Exp $
     */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -98,6 +98,7 @@ public:
   }
   void SetName(string name) {Name = name;}
   virtual void SetRPM(double rpm) {};
+  virtual void SetEngineRPM(double rpm) {};
   virtual double GetPowerRequired(void) {return 0.0;}
   virtual void SetdeltaT(double dt) {deltaT = dt;}
   double GetThrust(void) const {return Thrust;}
@@ -106,9 +107,24 @@ public:
   void SetReverserAngle(double angle) {ReverserAngle = angle;}
   double GetReverserAngle(void) const {return ReverserAngle;}
   virtual double GetRPM(void) const { return 0.0; };
+  virtual double GetEngineRPM(void) const { return 0.0; };
   double GetGearRatio(void) {return GearRatio; }
-  virtual string GetThrusterLabels(int id, string delimeter);
-  virtual string GetThrusterValues(int id, string delimeter);
+  virtual string GetThrusterLabels(int id, const string& delimeter);
+  virtual string GetThrusterValues(int id, const string& delimeter);
+
+  struct Inputs {
+    double TotalDeltaT;
+    double H_agl;
+    FGColumnVector3 PQR;
+    FGColumnVector3 AeroPQR;
+    FGColumnVector3 AeroUVW;
+    double Density;
+    double Pressure;
+    double Soundspeed;
+    double Alpha;
+    double Beta;
+    double Vt;
+  } in;
 
 protected:
   eType Type;