More turbulence tweaks and fixes.

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

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 213da1f7ca0264c3693e06aaf159fc7c2779f564..6edbd6ca5f5e33abefc7fdc794186df1c84fc3c6 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];
@@ -120,10 +137,10 @@ FGEnvironmentMgr::bind ()
          &FGEnvironmentMgr::get_cloud_layer_transition_ft,
          &FGEnvironmentMgr::set_cloud_layer_transition_ft);
     fgSetArchivable(buf);
-    sprintf(buf, "/environment/clouds/layer[%d]/type", i);
+    sprintf(buf, "/environment/clouds/layer[%d]/coverage", i);
     fgTie(buf, this, i,
-         &FGEnvironmentMgr::get_cloud_layer_type,
-         &FGEnvironmentMgr::set_cloud_layer_type);
+         &FGEnvironmentMgr::get_cloud_layer_coverage,
+         &FGEnvironmentMgr::set_cloud_layer_coverage);
     fgSetArchivable(buf);
   }
 }
@@ -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(),
@@ -262,15 +280,17 @@ FGEnvironmentMgr::set_cloud_layer_transition_ft (int index,
 }
 
 const char *
-FGEnvironmentMgr::get_cloud_layer_type (int index) const
+FGEnvironmentMgr::get_cloud_layer_coverage (int index) const
 {
-  switch (thesky->get_cloud_layer(index)->getType()) {
+  switch (thesky->get_cloud_layer(index)->getCoverage()) {
   case SGCloudLayer::SG_CLOUD_OVERCAST:
     return "overcast";
-  case SGCloudLayer::SG_CLOUD_MOSTLY_CLOUDY:
-    return "mostly-cloudy";
-  case SGCloudLayer::SG_CLOUD_MOSTLY_SUNNY:
-    return "mostly-sunny";
+  case SGCloudLayer::SG_CLOUD_BROKEN:
+    return "broken";
+  case SGCloudLayer::SG_CLOUD_SCATTERED:
+    return "scattered";
+  case SGCloudLayer::SG_CLOUD_FEW:
+    return "few";
   case SGCloudLayer::SG_CLOUD_CIRRUS:
     return "cirrus";
   case SGCloudLayer::SG_CLOUD_CLEAR:
@@ -281,24 +301,27 @@ FGEnvironmentMgr::get_cloud_layer_type (int index) const
 }
 
 void
-FGEnvironmentMgr::set_cloud_layer_type (int index, const char * type_name)
+FGEnvironmentMgr::set_cloud_layer_coverage (int index,
+                                            const char * coverage_name)
 {
-  SGCloudLayer::Type type;
-  if (!strcmp(type_name, "overcast"))
-    type = SGCloudLayer::SG_CLOUD_OVERCAST;
-  else if (!strcmp(type_name, "mostly-cloudy"))
-    type = SGCloudLayer::SG_CLOUD_MOSTLY_CLOUDY;
-  else if (!strcmp(type_name, "mostly-sunny"))
-    type = SGCloudLayer::SG_CLOUD_MOSTLY_SUNNY;
-  else if (!strcmp(type_name, "cirrus"))
-    type = SGCloudLayer::SG_CLOUD_CIRRUS;
-  else if (!strcmp(type_name, "clear"))
-    type = SGCloudLayer::SG_CLOUD_CLEAR;
+  SGCloudLayer::Coverage coverage;
+  if (!strcmp(coverage_name, "overcast"))
+    coverage = SGCloudLayer::SG_CLOUD_OVERCAST;
+  else if (!strcmp(coverage_name, "broken"))
+    coverage = SGCloudLayer::SG_CLOUD_BROKEN;
+  else if (!strcmp(coverage_name, "scattered"))
+    coverage = SGCloudLayer::SG_CLOUD_SCATTERED;
+  else if (!strcmp(coverage_name, "few"))
+    coverage = SGCloudLayer::SG_CLOUD_FEW;
+  else if (!strcmp(coverage_name, "cirrus"))
+    coverage = SGCloudLayer::SG_CLOUD_CIRRUS;
+  else if (!strcmp(coverage_name, "clear"))
+    coverage = SGCloudLayer::SG_CLOUD_CLEAR;
   else {
-    SG_LOG(SG_INPUT, SG_WARN, "Unknown cloud type " << type_name);
-    type = SGCloudLayer::SG_CLOUD_CLEAR;
+    SG_LOG(SG_INPUT, SG_WARN, "Unknown cloud type " << coverage_name);
+    coverage = SGCloudLayer::SG_CLOUD_CLEAR;
   }
-  thesky->get_cloud_layer(index)->setType(type);
+  thesky->get_cloud_layer(index)->setCoverage(coverage);
 }