- catch exception from readProperties and exit

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

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 47aa735c6bdb802b21dc3d4147da6cff92d91708..a09520f2d44148b147b76bd20a317f4b4e471d90 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -94,9 +94,9 @@
 
 #include <Main/fgfs.hxx>
 
-FG_USING_STD(list);
-FG_USING_STD(vector);
-FG_USING_STD(string);
+SG_USING_STD(list);
+SG_USING_STD(vector);
+SG_USING_STD(string);
 
 
 typedef double FG_VECTOR_3[3];
@@ -274,7 +274,11 @@ private:
     double altitude_agl;
     double Tank1Fuel;             // Gals
     double Tank2Fuel;             // Gals
-    
+
+    double daux[16];           // auxilliary doubles
+    float  faux[16];           // auxilliary floats
+    int    iaux[16];           // auxilliary ints
+
     // Engine list
     engine_list engines;
 
@@ -282,6 +286,12 @@ private:
     // SGTimeStamp next_stamp;           // time this record is valid
 
 protected:
+
+                               // deliberately not virtual so that
+                               // FGInterface constructor will call
+                               // the right version
+    void _setup();
+
     void _busdump(void);
     void _updatePosition( double lat_geoc, double lon, double alt );
     void _updateWeather( void );
@@ -436,6 +446,10 @@ protected:
        cos_latitude = cos(parm);
     }
 
+    inline void _set_daux( int n, double value ) { daux[n] = value; }
+    inline void _set_faux( int n, float value ) { faux[n] = value; }
+    inline void _set_iaux( int n, int value ) { iaux[n] = value; }
+
 public:
   
     FGInterface();
@@ -447,6 +461,8 @@ public:
     virtual void unbind ();
     virtual void update ();
     virtual bool update( int multi_loop );
+    virtual bool ToggleDataLogging(bool state) { return false; }
+    virtual bool ToggleDataLogging(void) { return false; }
 
     // Define the various supported flight models (many not yet implemented)
     enum {
@@ -496,23 +512,35 @@ public:
     virtual void set_Altitude(double alt);  // triggers re-calc of AGL altitude
     virtual void set_AltitudeAGL(double altagl); // and vice-versa
     virtual void set_Latitude_deg (double lat) {
-      set_Latitude(lat * DEG_TO_RAD);
+      set_Latitude(lat * SGD_DEGREES_TO_RADIANS);
     }
     virtual void set_Longitude_deg (double lon) {
-      set_Longitude(lon * DEG_TO_RAD);
+      set_Longitude(lon * SGD_DEGREES_TO_RADIANS);
     }
     
     // Speeds -- setting any of these will trigger a re-calc of the rest
     virtual void set_V_calibrated_kts(double vc);
     virtual void set_Mach_number(double mach);
     virtual void set_Velocities_Local( double north, double east, double down );
-    inline void set_V_north (double north) { v_local_v[0] = north; }
-    inline void set_V_east (double east) { v_local_v[1] = east; }
-    inline void set_V_down (double down) { v_local_v[2] = down; }
+    inline void set_V_north (double north) { 
+      set_Velocities_Local(north, v_local_v[1], v_local_v[2]);
+    }
+    inline void set_V_east (double east) { 
+      set_Velocities_Local(v_local_v[0], east, v_local_v[2]);
+    }
+    inline void set_V_down (double down) { 
+      set_Velocities_Local(v_local_v[0], v_local_v[1], down);
+    }
     virtual void set_Velocities_Wind_Body( double u, double v, double w);
-    virtual void set_uBody (double uBody) { v_wind_body_v[0] = uBody; }
-    virtual void set_vBody (double vBody) { v_wind_body_v[1] = vBody; }
-    virtual void set_wBody (double wBody) { v_wind_body_v[2] = wBody; }
+    virtual void set_uBody (double uBody) { 
+      set_Velocities_Wind_Body(uBody, v_wind_body_v[1], v_wind_body_v[2]);
+    }
+    virtual void set_vBody (double vBody) { 
+      set_Velocities_Wind_Body(v_wind_body_v[0], vBody, v_wind_body_v[2]);
+    }
+    virtual void set_wBody (double wBody) {
+      set_Velocities_Wind_Body(v_wind_body_v[0], v_wind_body_v[1], wBody);
+    }
     
     // Euler angles 
     virtual void set_Euler_Angles( double phi, double theta, double psi );
@@ -525,11 +553,11 @@ 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 * DEG_TO_RAD); }
+    virtual void set_Phi_deg (double phi) { set_Phi(phi * SGD_DEGREES_TO_RADIANS); }
     virtual void set_Theta_deg (double theta) {
-      set_Theta(theta * DEG_TO_RAD); 
+      set_Theta(theta * SGD_DEGREES_TO_RADIANS); 
     }
-    virtual void set_Psi_deg (double psi) { set_Psi(psi * DEG_TO_RAD); }
+    virtual void set_Psi_deg (double psi) { set_Psi(psi * SGD_DEGREES_TO_RADIANS); }
     
     // Flight Path
     virtual void set_Climb_Rate( double roc);
@@ -891,19 +919,19 @@ public:
     inline double get_Altitude_AGL(void) const { return altitude_agl; }
 
     inline double get_Latitude_deg () const {
-      return get_Latitude() * RAD_TO_DEG;
+      return get_Latitude() * SGD_RADIANS_TO_DEGREES;
     }
     inline double get_Longitude_deg () const {
-      return get_Longitude() * RAD_TO_DEG;
+      return get_Longitude() * SGD_RADIANS_TO_DEGREES;
     }
 
     // inline double * get_Euler_angles_v() { return euler_angles_v; }
     inline double get_Phi() const { return euler_angles_v[0]; }
     inline double get_Theta() const { return euler_angles_v[1]; }
     inline double get_Psi() const { return euler_angles_v[2]; }
-    inline double get_Phi_deg () const { return get_Phi() * RAD_TO_DEG; }
-    inline double get_Theta_deg () const { return get_Theta() * RAD_TO_DEG; }
-    inline double get_Psi_deg () const { return get_Psi() * RAD_TO_DEG; }
+    inline double get_Phi_deg () const { return get_Phi() * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Theta_deg () const { return get_Theta() * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Psi_deg () const { return get_Psi() * SGD_RADIANS_TO_DEGREES; }
 
 
     // ========== Miscellaneous quantities ==========
@@ -1099,6 +1127,11 @@ public:
        return cos_latitude;
     }
 
+    // Auxilliary variables
+    inline double get_daux( int n ) const { return daux[n]; }
+    inline float  get_faux( int n ) const { return faux[n]; }
+    inline int    get_iaux( int n ) const { return iaux[n]; }
+
     // Consumables
     inline double get_Tank1Fuel() const { return Tank1Fuel; }
     inline double get_Tank2Fuel() const { return Tank2Fuel; }
@@ -1134,5 +1167,8 @@ void fgFDMForceAltitude(const string &model, double alt_meters);
 // Set the local ground elevation
 void fgFDMSetGroundElevation(const string &model, double alt_meters);
 
+// Toggle data logging on/off
+void fgToggleFDMdataLogging(void);
+
 
 #endif // _FLIGHT_HXX