Forgot to implment the Node.getChild(name, index) form of the function

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

diff --git a/src/Environment/environment.hxx b/src/Environment/environment.hxx
index 18a85e7e852bd355a5523d962b5e759942b52d2c..73320de1e4aa69b0d5671958b89d0bdf9d9361f8 100644 (file)
--- a/src/Environment/environment.hxx
+++ b/src/Environment/environment.hxx
@@ -26,8 +26,6 @@
 
 #include <simgear/compiler.h>
 
-#include <Main/fgfs.hxx>
-
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
 #else
@@ -51,32 +49,47 @@ public:
   FGEnvironment();
   FGEnvironment (const FGEnvironment &environment);
   virtual ~FGEnvironment();
+
+  virtual void copy (const FGEnvironment &environment);
+
+  virtual void read (const SGPropertyNode * node);
   
   virtual double get_visibility_m () const;
+
   virtual double get_temperature_sea_level_degc () const;
   virtual double get_temperature_degc () 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_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_magnitude_norm () const;
+  virtual double get_turbulence_rate_hz () const;
+
   virtual void set_visibility_m (double v);
+
   virtual void set_temperature_sea_level_degc (double t);
   virtual void set_temperature_degc (double t);
+  virtual void set_dewpoint_sea_level_degc (double d);
+  virtual void set_dewpoint_degc (double d);
   virtual void set_pressure_sea_level_inhg (double p);
   virtual void set_pressure_inhg (double p);
+
   virtual void set_wind_from_heading_deg (double h);
   virtual void set_wind_speed_kt (double s);
   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);
 
-protected:
-
-  friend class FGEnvironmentMgr;
+  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);
@@ -85,18 +98,30 @@ private:
 
   void _recalc_hdgspd ();
   void _recalc_ne ();
-  void _recalc_sl_temp ();
-  void _recalc_alt_temp ();
-  void _recalc_sl_press ();
-  void _recalc_alt_press ();
+
+  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;
 
   double visibility_m;
+
+                               // Atmosphere
   double temperature_sea_level_degc;
   double temperature_degc;
+  double dewpoint_sea_level_degc;
+  double dewpoint_degc;
   double pressure_sea_level_inhg;
   double pressure_inhg;
+  double density_slugft3;
+
+  double turbulence_magnitude_norm;
+  double turbulence_rate_hz;
 
   double wind_from_heading_deg;
   double wind_speed_kt;
@@ -107,4 +132,7 @@ private:
 
 };
 
+void interpolate (const FGEnvironment * env1, const FGEnvironment * env2,
+                  double fraction, FGEnvironment * result);
+
 #endif // _ENVIRONMENT_HXX