Merge branch 'jmt/gps'

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

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index b029316e1a597728b4774046f47708e6668a7b06..e15ecae20370967dd2ecd978152957e805fa76d3 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -24,18 +24,22 @@
 #  include <config.h>
 #endif
 
+#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/scene/sky/sky.hxx>
 #include <simgear/environment/visual_enviro.hxx>
+#include <simgear/scene/model/particles.hxx>
 
 #include <Main/main.hxx>
 #include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>
+#include <FDM/flight.hxx>
 
 #include "environment.hxx"
-#include "environment_ctrl.hxx"
 #include "environment_mgr.hxx"
+#include "environment_ctrl.hxx"
 #include "fgclouds.hxx"
+#include "precipitation_mgr.hxx"
 
 class SGSky;
 extern SGSky *thesky;
@@ -46,22 +50,39 @@ FGEnvironmentMgr::FGEnvironmentMgr ()
   : _environment(new FGEnvironment)
 {
 
-   if (fgGetBool("/environment/params/real-world-weather-fetch") == true)
-       _controller = new FGMetarEnvironmentCtrl;
-   else
-       _controller = new FGInterpolateEnvironmentCtrl;
-
+  _controller = new FGInterpolateEnvironmentCtrl;
   _controller->setEnvironment(_environment);
-  set_subsystem("controller", _controller, 0.5);
-  fgClouds = new FGClouds( _controller );
+  set_subsystem("controller", _controller, 0.1 );
+
+  fgClouds = new FGClouds();
+
+  _metarcontroller = new FGMetarCtrl(_controller );
+  set_subsystem("metarcontroller", _metarcontroller, 0.1 );
+
+  _metarfetcher = new FGMetarFetcher();
+  set_subsystem("metarfetcher", _metarfetcher, 1.0 );
+
+  _precipitationManager = new FGPrecipitationMgr;
+  set_subsystem("precipitation", _precipitationManager);
 }
 
 FGEnvironmentMgr::~FGEnvironmentMgr ()
 {
-  delete _environment;
+  remove_subsystem("precipitation");
+  delete _precipitationManager;
+
+  remove_subsystem("metarcontroller");
+  delete _metarfetcher;
+
+  remove_subsystem("metarfetcher");
+  delete _metarcontroller;
+
+  delete fgClouds;
+
   remove_subsystem("controller");
   delete _controller;
-  delete fgClouds;
+
+  delete _environment;
 }
 
 void
@@ -83,6 +104,7 @@ FGEnvironmentMgr::reinit ()
 void
 FGEnvironmentMgr::bind ()
 {
+  SGSubsystemGroup::bind();
   fgTie("/environment/visibility-m", _environment,
        &FGEnvironment::get_visibility_m, &FGEnvironment::set_visibility_m);
   fgSetArchivable("/environment/visibility-m");
@@ -137,6 +159,16 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::get_wind_from_down_fps,
        &FGEnvironment::set_wind_from_down_fps);
   fgSetArchivable("/environment/wind-from-down-fps");
+
+  fgTie("/environment/thermal-lift-fps", _environment,
+       &FGEnvironment::get_thermal_lift_fps,
+       &FGEnvironment::set_thermal_lift_fps);
+  fgSetArchivable("/environment/thermal-lift-fps");
+  fgTie("/environment/ridge-lift-fps", _environment,
+       &FGEnvironment::get_ridge_lift_fps,
+       &FGEnvironment::set_ridge_lift_fps);
+  fgSetArchivable("/environment/ridge-lift-fps");
+
   fgTie("/environment/turbulence/magnitude-norm", _environment,
         &FGEnvironment::get_turbulence_magnitude_norm,
         &FGEnvironment::set_turbulence_magnitude_norm);
@@ -174,23 +206,22 @@ FGEnvironmentMgr::bind ()
          &FGEnvironmentMgr::set_cloud_layer_coverage);
     fgSetArchivable(buf);
   }
-  fgTie("/sim/rendering/clouds3d-enable", &sgEnviro,
-         &SGEnviro::get_clouds_enable_state,
-         &SGEnviro::set_clouds_enable_state);
-  fgTie("/sim/rendering/clouds3d-vis-range", &sgEnviro,
-         &SGEnviro::get_clouds_visibility,
-         &SGEnviro::set_clouds_visibility);
-  fgTie("/sim/rendering/clouds3d-density", &sgEnviro,
-         &SGEnviro::get_clouds_density,
-         &SGEnviro::set_clouds_density);
-  fgTie("/sim/rendering/clouds3d-cache-size", &sgEnviro,
-         &SGEnviro::get_clouds_CacheSize,
-         &SGEnviro::set_clouds_CacheSize);
-  fgTie("/sim/rendering/clouds3d-cache-resolution", &sgEnviro,
-         &SGEnviro::get_CacheResolution,
-         &SGEnviro::set_CacheResolution);
+
+  fgTie("/environment/metar/data", _metarcontroller,
+          &FGMetarCtrl::get_metar, &FGMetarCtrl::set_metar );
+
+  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,
@@ -221,6 +252,10 @@ FGEnvironmentMgr::unbind ()
   fgUntie("/environment/wind-from-north-fps");
   fgUntie("/environment/wind-from-east-fps");
   fgUntie("/environment/wind-from-down-fps");
+
+  fgUntie("/environment/thermal-lift-fps");
+  fgUntie("/environment/ridge-lift-fps");
+
   fgUntie("/environment/atmosphere/altitude-half-to-sun");
   fgUntie("/environment/atmosphere/altitude-troposphere-top");
   for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
@@ -239,12 +274,12 @@ 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");
+  SGSubsystemGroup::unbind();
 }
 
 void
@@ -258,6 +293,10 @@ FGEnvironmentMgr::update (double dt)
                                   _environment->get_wind_from_east_fps(),
                                   _environment->get_wind_from_down_fps());
   _environment->set_elevation_ft(fgGetDouble("/position/altitude-ft"));
+  osg::Vec3 windVec(-_environment->get_wind_from_north_fps(),
+                    -_environment->get_wind_from_east_fps(),
+                    _environment->get_wind_from_down_fps());
+  simgear::Particles::setWindVector(windVec * SG_FEET_TO_METER);
 
   _update_fdm();
 }
@@ -279,6 +318,18 @@ FGEnvironmentMgr::getEnvironment (double lat, double lon, double alt) const
   return env;
 }
 
+FGEnvironment
+FGEnvironmentMgr::getEnvironment(const SGGeod& aPos) const
+{
+  // Always returns the same environment
+  // for now; we'll make it interesting
+  // later.
+  FGEnvironment env = *_environment;
+  env.set_elevation_ft(aPos.getElevationFt());
+  return env;
+
+}
+
 void
 FGEnvironmentMgr::_update_fdm () const
 {