Avoid a potential segfault.

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

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index fe0a11eddba0aac376df3c572e064a1fcc1bf157..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];
 
@@ -124,11 +124,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 +224,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 +406,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 +449,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
@@ -502,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);
@@ -825,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]; }
@@ -1068,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; }
+
 };