#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"
: _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("controller");
remove_subsystem("precipitation");
- delete _controller;
- delete fgClouds;
delete _precipitationManager;
+
+ remove_subsystem("metarcontroller");
+ delete _metarfetcher;
+
+ remove_subsystem("metarfetcher");
+ delete _metarcontroller;
+
+ delete fgClouds;
+
+ remove_subsystem("controller");
+ delete _controller;
+
+ delete _environment;
}
void
void
FGEnvironmentMgr::bind ()
{
+ SGSubsystemGroup::bind();
fgTie("/environment/visibility-m", _environment,
&FGEnvironment::get_visibility_m, &FGEnvironment::set_visibility_m);
fgSetArchivable("/environment/visibility-m");
&FGEnvironmentMgr::set_cloud_layer_coverage);
fgSetArchivable(buf);
}
+
+ fgTie("/environment/metar/data", _metarcontroller,
+ &FGMetarCtrl::get_metar, &FGMetarCtrl::set_metar );
+
fgTie("/sim/rendering/clouds3d-enable", fgClouds,
&FGClouds::get_3dClouds,
&FGClouds::set_3dClouds);
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);
fgUntie("/environment/weather-scenario");
fgUntie("/sim/rendering/lightning-enable");
fgUntie("/environment/turbulence/use-cloud-turbulence");
+ SGSubsystemGroup::unbind();
}
void