Add the ability to control turbulence rate as well as magnitude.

[flightgear.git] / src / Environment / environment_mgr.cxx

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 26633176f45f170eda525fbeb35437f70a3a9f7e..1875a514d22bae3378b58e45a58f80ef4cfa7bfa 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -21,7 +21,7 @@
 // $Id$
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/sky/sky.hxx>
+#include <simgear/scene/sky/sky.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>
@@ -35,8 +35,10 @@ extern SGSky *thesky;                // FIXME: from main.cxx
 
 FGEnvironmentMgr::FGEnvironmentMgr ()
   : _environment(new FGEnvironment),
-    _controller(new FGUserDefEnvironmentCtrl)
+    _controller(new FGInterpolateEnvironmentCtrl)
 {
+  _controller->setEnvironment(_environment);
+  set_subsystem("controller", _controller, 0.5);
 }
 
 FGEnvironmentMgr::~FGEnvironmentMgr ()
@@ -49,8 +51,15 @@ void
 FGEnvironmentMgr::init ()
 {
   SG_LOG( SG_GENERAL, SG_INFO, "Initializing environment subsystem");
-  _controller->setEnvironment(_environment);
-  _controller->init();
+  FGSubsystemGroup::init();
+  _update_fdm();
+}
+
+void
+FGEnvironmentMgr::reinit ()
+{
+  SG_LOG( SG_GENERAL, SG_INFO, "Reinitializing environment subsystem");
+  FGSubsystemGroup::reinit();
   _update_fdm();
 }
 
@@ -97,6 +106,14 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::get_wind_from_down_fps,
        &FGEnvironment::set_wind_from_down_fps);
   fgSetArchivable("/environment/wind-from-down-fps");
+  fgTie("/environment/turbulence/magnitude-norm", _environment,
+        &FGEnvironment::get_turbulence_magnitude_norm,
+        &FGEnvironment::set_turbulence_magnitude_norm);
+  fgSetArchivable("/environment/turbulence/magnitude-norm");
+  fgTie("/environment/turbulence/rate_hz", _environment,
+        &FGEnvironment::get_turbulence_rate_hz,
+        &FGEnvironment::set_turbulence_rate_hz);
+  fgSetArchivable("/environment/turbulence/rate_hz");
 
   for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
     char buf[128];
@@ -160,7 +177,8 @@ FGEnvironmentMgr::unbind ()
 void
 FGEnvironmentMgr::update (double dt)
 {
-  _controller->update(dt);
+  FGSubsystemGroup::update(dt);
+
                                // FIXME: the FDMs should update themselves
   current_aircraft.fdm_state
     ->set_Velocities_Local_Airmass(_environment->get_wind_from_north_fps(),