FGEnvironmentMgr::FGEnvironmentMgr ()
: _environment(new FGEnvironment),
- _controller(new FGUserDefEnvironmentCtrl)
+ _controller(new FGInterpolateEnvironmentCtrl)
{
+ _controller->setEnvironment(_environment);
+ set_subsystem("controller", _controller, 0.5);
}
FGEnvironmentMgr::~FGEnvironmentMgr ()
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();
}
&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];
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(),