Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Environment / environment.hxx

diff --git a/src/Environment/environment.hxx b/src/Environment/environment.hxx
index 38123e843885a93de70ad236840aad10a5bf020d..c270132262f7883c2fd9a20a4c4f458653918084 100644 (file)
--- a/src/Environment/environment.hxx
+++ b/src/Environment/environment.hxx
@@ -70,6 +70,9 @@ public:
   virtual double get_wind_from_north_fps () const;
   virtual double get_wind_from_east_fps () const;
   virtual double get_wind_from_down_fps () const;
+  virtual double get_thermal_lift_fps () const;
+  virtual double get_ridge_lift_fps () const;  
+  virtual double get_local_weather_lift_fps () const;
 
   virtual double get_turbulence_magnitude_norm () const;
   virtual double get_turbulence_rate_hz () const;
@@ -88,6 +91,9 @@ public:
   virtual void set_wind_from_north_fps (double n);
   virtual void set_wind_from_east_fps (double e);
   virtual void set_wind_from_down_fps (double d);
+  virtual void set_thermal_lift_fps (double th);
+  virtual void set_ridge_lift_fps (double ri);
+  virtual void set_local_weather_lift_fps (double lwl);
 
   virtual void set_turbulence_magnitude_norm (double t);
   virtual void set_turbulence_rate_hz (double t);
@@ -97,21 +103,23 @@ public:
   virtual void set_altitude_half_to_sun_m (double alt);
   virtual void set_altitude_tropo_top_m (double alt);
 
+  virtual bool set_live_update(bool live_update);
+
+  void _recalc_ne ();
+  void _recalc_alt_dewpoint ();
+  void _recalc_density ();
+  void _recalc_relative_humidity ();
+  void _recalc_alt_pt ();
 private:
   void _init();
   void _recalc_hdgspd ();
-  void _recalc_ne ();
+  void _recalc_updraft ();
 
   void _recalc_sl_temperature ();
   void _recalc_sl_dewpoint ();
-  void _recalc_alt_dewpoint ();
   void _recalc_sl_pressure ();
-  void _recalc_alt_pt ();
-
-  void _recalc_density ();
 
   void _recalc_density_tropo_avg_kgm3 ();
-  void _recalc_relative_humidity ();
 
   double elevation_ft;
   double visibility_m;
@@ -139,6 +147,11 @@ private:
   double wind_from_north_fps;
   double wind_from_east_fps;
   double wind_from_down_fps;
+  double thermal_lift_fps;
+  double ridge_lift_fps;
+  double local_weather_lift_fps;
+
+  bool     live_update;
 
 };