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

diff --git a/src/Environment/environment.hxx b/src/Environment/environment.hxx
index ba98d4652..048b17992 100644
--- a/src/Environment/environment.hxx
+++ b/src/Environment/environment.hxx
@@ -16,24 +16,16 @@
 //
 // 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$
-
 
 #ifndef _ENVIRONMENT_HXX
 #define _ENVIRONMENT_HXX
 
 #include <simgear/compiler.h>
 
-#include <Main/fgfs.hxx>
-
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
-
+#include <cmath>
+#include "tiedpropertylist.hxx"
 
 /**
  * Model the natural environment.
@@ -52,27 +44,36 @@ public:
   FGEnvironment (const FGEnvironment &environment);
   virtual ~FGEnvironment();
 
-  virtual void copy (const FGEnvironment &environment);
+  FGEnvironment & operator = ( const FGEnvironment & other );
 
   virtual void read (const SGPropertyNode * node);
+  virtual void Tie( SGPropertyNode_ptr base, bool setArchivable = true );
+  virtual void Untie();
   
   virtual double get_visibility_m () const;
 
   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_turbulence_norm () const;
+  virtual double get_turbulence_magnitude_norm () const;
+  virtual double get_turbulence_rate_hz () const;
 
   virtual void set_visibility_m (double v);
 
@@ -89,29 +90,38 @@ public:
   virtual void set_wind_from_east_fps (double e);
   virtual void set_wind_from_down_fps (double d);
 
-  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);
+
+  virtual bool set_live_update(bool live_update);
 
-private:
 
+  FGEnvironment & interpolate (const FGEnvironment & env2, double fraction, FGEnvironment * result) const;
+private:
+  virtual void copy (const FGEnvironment &environment);
+  void _init();
   void _recalc_hdgspd ();
-  void _recalc_ne ();
 
   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_tropo_avg_kgm3 ();
+  void _recalc_ne ();
+  void _recalc_alt_dewpoint ();
   void _recalc_density ();
+  void _recalc_relative_humidity ();
+  void _recalc_alt_pt ();
 
   double elevation_ft;
-
   double visibility_m;
 
-				// Atmosphere
+  // Atmosphere
   double temperature_sea_level_degc;
   double temperature_degc;
   double dewpoint_sea_level_degc;
@@ -120,7 +130,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;
@@ -129,9 +145,9 @@ private:
   double wind_from_east_fps;
   double wind_from_down_fps;
 
-};
+  bool     live_update;
+  TiedPropertyList _tiedProperties;
 
-void interpolate (const FGEnvironment * env1, const FGEnvironment * env2,
-                  double fraction, FGEnvironment * result);
+};
 
 #endif // _ENVIRONMENT_HXX