Fix line endings

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

diff --git a/src/Environment/environment.hxx b/src/Environment/environment.hxx
index ba98d465239feee820bc2acd8e9cb83d9cb1e46b..ba2d0f2ccfa8f7b75b84ac4ce54a5f48043efd32 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
@@ -60,6 +58,7 @@ 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;
@@ -72,7 +71,8 @@ public:
   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,7 +89,8 @@ 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);
@@ -120,7 +121,8 @@ private:
   double pressure_inhg;
   double density_slugft3;
 
-  double turbulence_norm;
+  double turbulence_magnitude_norm;
+  double turbulence_rate_hz;
 
   double wind_from_heading_deg;
   double wind_speed_kt;