Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 780d75c92f3776282602183c3b0b04f3bf32f983..8dc1aaebb3dc48c8c2198e494519b988e196990a 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -90,9 +90,12 @@
 #include <string>
 
 #include <simgear/constants.h>
-#include <simgear/timing/timestamp.hxx>
+// #include <simgear/timing/timestamp.hxx>
 
 #include <Main/fgfs.hxx>
+#include <Model/acmodel.hxx>
+#include <Model/model.hxx>
+#include <Main/location.hxx>
 
 SG_USING_STD(list);
 SG_USING_STD(vector);
@@ -124,11 +127,11 @@ private:
     // next elapsed time.  This yields a small amount of temporal
     // jitter ( < dt ) but in practice seems to work well.
 
-    double delta_t;            // delta "t"
-    SGTimeStamp time_stamp;    // time stamp of last run
-    long elapsed;              // time elapsed since last run
-    long remainder;            // remainder time from last run
-    int multi_loop;            // number of iterations of "delta_t" to run
+//     double delta_t;         // delta "t"
+//     SGTimeStamp time_stamp; // time stamp of last run
+//     long elapsed;           // time elapsed since last run
+    double remainder;          // remainder time from last run
+//     int multi_loop;         // number of iterations of "delta_t" to run
 
     // Pilot location rel to ref pt
     FG_VECTOR_3 d_pilot_rp_body_v;
@@ -224,7 +227,13 @@ private:
     // SGTimeStamp valid_stamp;          // time this record is valid
     // SGTimeStamp next_stamp;           // time this record is valid
 
-// protected:
+    // Model tied to FDM
+    FGAircraftModel * _acmodel;
+
+protected:
+
+    int _calc_multiloop (double dt);
+
 public:
 
                                // deliberately not virtual so that
@@ -400,7 +409,7 @@ public:
     virtual void init ();
     virtual void bind ();
     virtual void unbind ();
-    virtual void update(int dt);
+    virtual void update(double dt);
     virtual bool ToggleDataLogging(bool state) { return false; }
     virtual bool ToggleDataLogging(void) { return false; }
 
@@ -443,17 +452,17 @@ public:
     void common_init();
 
     // time and update management values
-    inline double get_delta_t() const { return delta_t; }
-    inline void set_delta_t( double dt ) { delta_t = dt; }
-    inline SGTimeStamp get_time_stamp() const { return time_stamp; }
-    inline void set_time_stamp( SGTimeStamp s ) { time_stamp = s; }
-    inline void stamp() { time_stamp.stamp(); }
-    inline long get_elapsed() const { return elapsed; }
-    inline void set_elapsed( long e ) { elapsed = e; }
-    inline long get_remainder() const { return remainder; }
-    inline void set_remainder( long r ) { remainder = r; }
-    inline int get_multi_loop() const { return multi_loop; }
-    inline void set_multi_loop( int ml ) { multi_loop = ml; }
+//     inline double get_delta_t() const { return delta_t; }
+//     inline void set_delta_t( double dt ) { delta_t = dt; }
+//     inline SGTimeStamp get_time_stamp() const { return time_stamp; }
+//     inline void set_time_stamp( SGTimeStamp s ) { time_stamp = s; }
+//     inline void stamp() { time_stamp.stamp(); }
+//     inline long get_elapsed() const { return elapsed; }
+//     inline void set_elapsed( long e ) { elapsed = e; }
+//     inline long get_remainder() const { return remainder; }
+//     inline void set_remainder( long r ) { remainder = r; }
+//     inline int get_multi_loop() const { return multi_loop; }
+//     inline void set_multi_loop( int ml ) { multi_loop = ml; }
 
     // Positions
     virtual void set_Latitude(double lat);       // geocentric
@@ -513,8 +522,6 @@ public:
     virtual void set_Gamma_vert_rad( double gamma);
     
     // Earth
-    virtual void set_Sea_level_radius(double slr);
-    virtual void set_Runway_altitude(double ralt);
     
     virtual void set_Static_pressure(double p);
     virtual void set_Static_temperature(double T);
@@ -693,7 +700,7 @@ public:
     //    n_pilot_body_v[2] = z;
     // }
 
-    inline double get_Nlf(void) { return nlf; }
+    inline double get_Nlf(void) const { return nlf; }
 
     // inline double * get_Omega_dot_body_v() { return omega_dot_body_v; }
     // inline double get_P_dot_body() const { return omega_dot_body_v[0]; }
@@ -777,7 +784,7 @@ public:
     inline double get_V_rel_wind() const { return v_rel_wind; }
     // inline void set_V_rel_wind(double wind) { v_rel_wind = wind; }
 
-    // inline double get_V_true_kts() const { return v_true_kts; }
+    inline double get_V_true_kts() const { return v_true_kts; }
     // inline void set_V_true_kts(double kts) { v_true_kts = kts; }
 
     // inline double get_V_rel_ground() const { return v_rel_ground; }
@@ -912,10 +919,12 @@ public:
     // }
 
     inline double get_Alpha() const { return alpha; }
+    inline double get_Alpha_deg() const { return alpha * SGD_RADIANS_TO_DEGREES; }
     inline double get_Beta() const { return beta; }
-    // inline double get_Alpha_dot() const { return alpha_dot; }
+    inline double get_Beta_deg() const { return beta * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Alpha_dot() const { return alpha_dot; }
     // inline void set_Alpha_dot( double ad ) { alpha_dot = ad; }
-    // inline double get_Beta_dot() const { return beta_dot; }
+    inline double get_Beta_dot() const { return beta_dot; }
     // inline void set_Beta_dot( double bd ) { beta_dot = bd; }
 
     // inline double get_Cos_alpha() const { return cos_alpha; }
@@ -950,15 +959,15 @@ public:
     inline double get_Mach_number() const { return mach_number; }
 
     inline double get_Static_pressure() const { return static_pressure; }
-    // inline double get_Total_pressure() const { return total_pressure; }
+    inline double get_Total_pressure() const { return total_pressure; }
     // inline void set_Total_pressure( double tp ) { total_pressure = tp; }
     // inline double get_Impact_pressure() const { return impact_pressure; }
     // inline void set_Impact_pressure( double ip ) { impact_pressure = ip; }
-    // inline double get_Dynamic_pressure() const { return dynamic_pressure; }
+    inline double get_Dynamic_pressure() const { return dynamic_pressure; }
     // inline void set_Dynamic_pressure( double dp ) { dynamic_pressure = dp; }
 
     inline double get_Static_temperature() const { return static_temperature; }
-    // inline double get_Total_temperature() const { return total_temperature; }
+    inline double get_Total_temperature() const { return total_temperature; }
     // inline void set_Total_temperature( double t ) { total_temperature = t; }
 
     inline double get_Sea_level_radius() const { return sea_level_radius; }
@@ -1068,6 +1077,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; }
+
 };
 
 
@@ -1081,8 +1096,6 @@ extern FGInterface * cur_fdm_state;
 
 // General interface to the flight model routines
 
-// Set the altitude (force)
-void fgFDMForceAltitude(const string &model, double alt_meters);
 
 // Toggle data logging on/off
 void fgToggleFDMdataLogging(void);