Merge branch 'maint' into next

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

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 243671932d4019e4cd03553443bbfdf101357980..0ff1abb8647be907533ab3e4db2968090ac8aa86 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -182,18 +182,25 @@ FGEnvironmentMgr::bind ()
          &FGEnvironmentMgr::set_cloud_layer_coverage);
     fgSetArchivable(buf);
   }
-  fgTie("/sim/rendering/clouds3d-enable", thesky,
-         &SGSky::get_3dClouds,
-         &SGSky::set_3dClouds);
+  fgTie("/sim/rendering/clouds3d-enable", fgClouds,
+         &FGClouds::get_3dClouds,
+         &FGClouds::set_3dClouds);
   fgTie("/sim/rendering/clouds3d-density", thesky,
          &SGSky::get_3dCloudDensity,
          &SGSky::set_3dCloudDensity);
+  fgTie("/sim/rendering/clouds3d-vis-range", thesky,
+        &SGSky::get_3dCloudVisRange,
+        &SGSky::set_3dCloudVisRange);
+  
   fgTie("/sim/rendering/precipitation-enable", &sgEnviro,
-         &SGEnviro::get_precipitation_enable_state,
+         &SGEnviro::get_precipitation_enable_state, 
          &SGEnviro::set_precipitation_enable_state);
   fgTie("/environment/rebuild-layers", fgClouds,
       &FGClouds::get_update_event,
       &FGClouds::set_update_event);
+  fgTie("/environment/weather-scenario", fgClouds,
+        &FGClouds::get_scenario,
+        &FGClouds::set_scenario);
   fgTie("/sim/rendering/lightning-enable", &sgEnviro,
       &SGEnviro::get_lightning_enable_state,
       &SGEnviro::set_lightning_enable_state);
@@ -238,10 +245,9 @@ FGEnvironmentMgr::unbind ()
   fgUntie("/sim/rendering/clouds3d-enable");
   fgUntie("/sim/rendering/clouds3d-vis-range");
   fgUntie("/sim/rendering/clouds3d-density");
-  fgUntie("/sim/rendering/clouds3d-cache-size");
-  fgUntie("/sim/rendering/clouds3d-cache-resolution");
   fgUntie("/sim/rendering/precipitation-enable");
   fgUntie("/environment/rebuild-layers");
+  fgUntie("/environment/weather-scenario");
   fgUntie("/sim/rendering/lightning-enable");
   fgUntie("/environment/turbulence/use-cloud-turbulence");
 }