First commit of properties code. JSBSim now has a basic property tree all

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

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 780d75c92f3776282602183c3b0b04f3bf32f983..fe0a11eddba0aac376df3c572e064a1fcc1bf157 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -513,8 +513,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 +691,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 +775,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 +910,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 +950,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; }
@@ -1081,8 +1081,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);