X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Fenvironment.hxx;h=d9543d5ab68704813d814df6fea66544d72ee59e;hb=11d15b451347674fba77648700d23c5aaec3c6c2;hp=ba98d465239feee820bc2acd8e9cb83d9cb1e46b;hpb=e588cbadd8eb31627e8054dfa609833141c515f2;p=flightgear.git

diff --git a/src/Environment/environment.hxx b/src/Environment/environment.hxx
index ba98d4652..d9543d5ab 100644
--- a/src/Environment/environment.hxx
+++ b/src/Environment/environment.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -26,14 +26,7 @@
 
 #include <simgear/compiler.h>
 
-#include <Main/fgfs.hxx>
-
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
-
+#include <cmath>
 
 /**
  * Model the natural environment.
@@ -60,19 +53,28 @@ public:
 
   virtual double get_temperature_sea_level_degc () const;
   virtual double get_temperature_degc () const;
+  virtual double get_temperature_degf () const;
   virtual double get_dewpoint_sea_level_degc () const;
   virtual double get_dewpoint_degc () const;
   virtual double get_pressure_sea_level_inhg () const;
   virtual double get_pressure_inhg () const;
   virtual double get_density_slugft3 () const;
 
+  virtual double get_relative_humidity () const;
+  virtual double get_density_tropo_avg_kgm3 () const;
+  virtual double get_altitude_half_to_sun_m () const;
+  virtual double get_altitude_tropo_top_m () const;
+
   virtual double get_wind_from_heading_deg () const;
   virtual double get_wind_speed_kt () const;
   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_turbulence_norm () const;
+  virtual double get_turbulence_magnitude_norm () const;
+  virtual double get_turbulence_rate_hz () const;
 
   virtual void set_visibility_m (double v);
 
@@ -88,30 +90,39 @@ 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_turbulence_norm (double t);
+  virtual void set_turbulence_magnitude_norm (double t);
+  virtual void set_turbulence_rate_hz (double t);
 
   virtual double get_elevation_ft () const;
   virtual void set_elevation_ft (double elevation_ft);
+  virtual void set_altitude_half_to_sun_m (double alt);
+  virtual void set_altitude_tropo_top_m (double alt);
 
-private:
+  virtual bool set_live_update(bool live_update);
 
-  void _recalc_hdgspd ();
   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_updraft ();
 
   void _recalc_sl_temperature ();
-  void _recalc_alt_temperature ();
   void _recalc_sl_dewpoint ();
-  void _recalc_alt_dewpoint ();
   void _recalc_sl_pressure ();
-  void _recalc_alt_pressure ();
-  void _recalc_density ();
 
-  double elevation_ft;
+  void _recalc_density_tropo_avg_kgm3 ();
 
+  double elevation_ft;
   double visibility_m;
 
-				// Atmosphere
+  // Atmosphere
   double temperature_sea_level_degc;
   double temperature_degc;
   double dewpoint_sea_level_degc;
@@ -120,7 +131,13 @@ private:
   double pressure_inhg;
   double density_slugft3;
 
-  double turbulence_norm;
+  double density_tropo_avg_kgm3;
+  double relative_humidity;
+  double altitude_half_to_sun_m;
+  double altitude_tropo_top_m;
+
+  double turbulence_magnitude_norm;
+  double turbulence_rate_hz;
 
   double wind_from_heading_deg;
   double wind_speed_kt;
@@ -128,6 +145,10 @@ private:
   double wind_from_north_fps;
   double wind_from_east_fps;
   double wind_from_down_fps;
+  double thermal_lift_fps;
+  double ridge_lift_fps;
+
+  bool     live_update;
 
 };