cleanup of precipitation contribution

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

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index e299a4942036442b3d123f5757e6b51c3751ba13..98178b5b25739290491d373354024412655074eb 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -36,6 +36,7 @@
 #include "environment_ctrl.hxx"
 #include "environment_mgr.hxx"
 #include "fgclouds.hxx"
+#include "precipitation_mgr.hxx"
 
 class SGSky;
 extern SGSky *thesky;
@@ -54,14 +55,18 @@ FGEnvironmentMgr::FGEnvironmentMgr ()
   _controller->setEnvironment(_environment);
   set_subsystem("controller", _controller, 0.5);
   fgClouds = new FGClouds( _controller );
+  _precipitationManager = new FGPrecipitationMgr;
+  set_subsystem("precipitation", _precipitationManager);
 }
 
 FGEnvironmentMgr::~FGEnvironmentMgr ()
 {
   delete _environment;
   remove_subsystem("controller");
+  remove_subsystem("precipitation");
   delete _controller;
   delete fgClouds;
+  delete _precipitationManager;
 }
 
 void
@@ -86,6 +91,8 @@ FGEnvironmentMgr::bind ()
   fgTie("/environment/visibility-m", _environment,
        &FGEnvironment::get_visibility_m, &FGEnvironment::set_visibility_m);
   fgSetArchivable("/environment/visibility-m");
+  fgTie("/environment/effective-visibility-m", thesky,
+       &SGSky::get_visibility );
   fgTie("/environment/temperature-sea-level-degc", _environment,
        &FGEnvironment::get_temperature_sea_level_degc,
        &FGEnvironment::set_temperature_sea_level_degc);
@@ -108,6 +115,16 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::get_pressure_inhg); // FIXME: read-only for now
   fgTie("/environment/density-slugft3", _environment,
        &FGEnvironment::get_density_slugft3); // read-only
+  fgTie("/environment/relative-humidity", _environment,
+       &FGEnvironment::get_relative_humidity); //ro
+  fgTie("/environment/atmosphere/density-tropo-avg", _environment,
+       &FGEnvironment::get_density_tropo_avg_kgm3); //ro
+  fgTie("/environment/atmosphere/altitude-half-to-sun", _environment,
+       &FGEnvironment::get_altitude_half_to_sun_m, 
+       &FGEnvironment::set_altitude_half_to_sun_m);
+  fgTie("/environment/atmosphere/altitude-troposphere-top", _environment,
+        &FGEnvironment::get_altitude_tropo_top_m,
+        &FGEnvironment::set_altitude_tropo_top_m);
   fgTie("/environment/wind-from-heading-deg", _environment,
        &FGEnvironment::get_wind_from_heading_deg,
        &FGEnvironment::set_wind_from_heading_deg);
@@ -180,7 +197,7 @@ FGEnvironmentMgr::bind ()
   fgTie("/sim/rendering/precipitation-enable", &sgEnviro,
          &SGEnviro::get_precipitation_enable_state,
          &SGEnviro::set_precipitation_enable_state);
-  fgTie("/environment/rebuild_layers", fgClouds,
+  fgTie("/environment/rebuild-layers", fgClouds,
       &FGClouds::get_update_event,
       &FGClouds::set_update_event);
   fgTie("/sim/rendering/lightning-enable", &sgEnviro,
@@ -189,12 +206,14 @@ FGEnvironmentMgr::bind ()
   fgTie("/environment/turbulence/use-cloud-turbulence", &sgEnviro,
       &SGEnviro::get_turbulence_enable_state,
       &SGEnviro::set_turbulence_enable_state);
+  sgEnviro.config(fgGetNode("/sim/rendering/precipitation"));
 }
 
 void
 FGEnvironmentMgr::unbind ()
 {
   fgUntie("/environment/visibility-m");
+  fgUntie("/environment/effective-visibility-m");
   fgUntie("/environment/temperature-sea-level-degc");
   fgUntie("/environment/temperature-degc");
   fgUntie("/environment/dewpoint-sea-level-degc");
@@ -202,9 +221,13 @@ FGEnvironmentMgr::unbind ()
   fgUntie("/environment/pressure-sea-level-inhg");
   fgUntie("/environment/pressure-inhg");
   fgUntie("/environment/density-inhg");
+  fgUntie("/environment/relative-humidity");
+  fgUntie("/environment/atmosphere/density-tropo-avg");
   fgUntie("/environment/wind-from-north-fps");
   fgUntie("/environment/wind-from-east-fps");
   fgUntie("/environment/wind-from-down-fps");
+  fgUntie("/environment/atmosphere/altitude-half-to-sun");
+  fgUntie("/environment/atmosphere/altitude-troposphere-top");
   for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
     char buf[128];
     sprintf(buf, "/environment/clouds/layer[%d]/span-m", i);
@@ -224,7 +247,7 @@ FGEnvironmentMgr::unbind ()
   fgUntie("/sim/rendering/clouds3d-cache-size");
   fgUntie("/sim/rendering/clouds3d-cache-resolution");
   fgUntie("/sim/rendering/precipitation-enable");
-  fgUntie("/environment/rebuild_layers");
+  fgUntie("/environment/rebuild-layers");
   fgUntie("/sim/rendering/lightning-enable");
   fgUntie("/environment/turbulence/use-cloud-turbulence");
 }