Remove std::

[flightgear.git] / src / FDM / flight.hxx

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index afc4ded02b29116002221d46113d02c97349b020..810ec38b80ac2f84801628128c37ef03fb74b00d 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -90,14 +90,14 @@
 #include <string>
 
 #include <simgear/constants.h>
-// #include <simgear/timing/timestamp.hxx>
-
 #include <Main/fgfs.hxx>
 
 SG_USING_STD(list);
 SG_USING_STD(vector);
 SG_USING_STD(string);
 
+class FGAircraftModel;
+
 
 typedef double FG_VECTOR_3[3];
 
@@ -224,6 +224,9 @@ private:
     // SGTimeStamp valid_stamp;          // time this record is valid
     // SGTimeStamp next_stamp;           // time this record is valid
 
+    // Model tied to FDM
+    FGAircraftModel * _acmodel;
+
 protected:
 
     int _calc_multiloop (double dt);
@@ -505,11 +508,15 @@ public:
     virtual void set_Psi (double psi) { 
       set_Euler_Angles(get_Phi(), get_Theta(), psi);
     }
-    virtual void set_Phi_deg (double phi) { set_Phi(phi * SGD_DEGREES_TO_RADIANS); }
+    virtual void set_Phi_deg (double phi) {
+      set_Phi(phi * SGD_DEGREES_TO_RADIANS);
+    }
     virtual void set_Theta_deg (double theta) {
       set_Theta(theta * SGD_DEGREES_TO_RADIANS); 
     }
-    virtual void set_Psi_deg (double psi) { set_Psi(psi * SGD_DEGREES_TO_RADIANS); }
+    virtual void set_Psi_deg (double psi) {
+      set_Psi(psi * SGD_DEGREES_TO_RADIANS);
+    }
     
     // Flight Path
     virtual void set_Climb_Rate( double roc);
@@ -828,6 +835,9 @@ public:
     inline double get_Phi_dot() const { return euler_rates_v[0]; }
     inline double get_Theta_dot() const { return euler_rates_v[1]; }
     inline double get_Psi_dot() const { return euler_rates_v[2]; }
+    inline double get_Phi_dot_degps() const { return euler_rates_v[0] * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Theta_dot_degps() const { return euler_rates_v[1] * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Psi_dot_degps() const { return euler_rates_v[2] * SGD_RADIANS_TO_DEGREES; }
 
     // inline double * get_Geocentric_rates_v() { return geocentric_rates_v; }
     inline double get_Latitude_dot() const { return geocentric_rates_v[0]; }
@@ -1071,6 +1081,12 @@ public:
     inline float  get_faux( int n ) const { return faux[n]; }
     inline int    get_iaux( int n ) const { return iaux[n]; }
 
+    // Model tied to FDM
+    FGAircraftModel * getACModel() const { return _acmodel; }
+
+    // Note that currently this is the "same" value runway altitude...
+    inline double get_ground_elev_ft() const { return runway_altitude; }
+
 };