diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx index c6451eef1..e48039029 100644 --- a/src/Environment/environment_mgr.cxx +++ b/src/Environment/environment_mgr.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include
@@ -122,9 +121,9 @@ FGEnvironmentMgr::bind () &FGClouds::get_update_event, &FGClouds::set_update_event); - _tiedProperties.Tie("turbulence/use-cloud-turbulence", &sgEnviro, - &SGEnviro::get_turbulence_enable_state, - &SGEnviro::set_turbulence_enable_state); +// _tiedProperties.Tie("turbulence/use-cloud-turbulence", &sgEnviro, +// &SGEnviro::get_turbulence_enable_state, +// &SGEnviro::set_turbulence_enable_state); for (int i = 0; i < MAX_CLOUD_LAYERS; i++) { SGPropertyNode_ptr layerNode = fgGetNode("/environment/clouds",true)->getChild("layer", i, true ); @@ -176,15 +175,10 @@ FGEnvironmentMgr::bind () &SGSky::get_3dCloudVisRange, &SGSky::set_3dCloudVisRange); - _tiedProperties.Tie("precipitation-enable", &sgEnviro, - &SGEnviro::get_precipitation_enable_state, - &SGEnviro::set_precipitation_enable_state); +// _tiedProperties.Tie("lightning-enable", &sgEnviro, +// &SGEnviro::get_lightning_enable_state, +// &SGEnviro::set_lightning_enable_state); - _tiedProperties.Tie("lightning-enable", &sgEnviro, - &SGEnviro::get_lightning_enable_state, - &SGEnviro::set_lightning_enable_state); - - sgEnviro.config(fgGetNode("/sim/rendering/precipitation")); } void diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx index c57c4ee1d..d5d9fbbc0 100644 --- a/src/Environment/fgclouds.cxx +++ b/src/Environment/fgclouds.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +//#include #include #include #include @@ -47,7 +47,9 @@ extern SGSky *thesky; FGClouds::FGClouds() : +#if 0 snd_lightning(0), +#endif clouds_3d_enabled(false), index(0) { @@ -68,6 +70,7 @@ void FGClouds::set_update_event(int count) { } void FGClouds::Init(void) { +#if 0 if( snd_lightning == NULL ) { snd_lightning = new SGSoundSample("Sounds/thunder.wav", SGPath()); snd_lightning->set_max_dist(7000.0f); @@ -75,8 +78,8 @@ void FGClouds::Init(void) { SGSoundMgr *smgr = globals->get_soundmgr(); SGSampleGroup *sgr = smgr->find("weather", true); sgr->add( snd_lightning, "thunder" ); - sgEnviro.set_sampleGroup( sgr ); } +#endif globals->get_commands()->addCommand("add-cloud", do_add_3Dcloud); globals->get_commands()->addCommand("del-cloud", do_delete_3Dcloud); diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx index 9d26419ff..61ccaccfe 100644 --- a/src/Environment/fgclouds.hxx +++ b/src/Environment/fgclouds.hxx @@ -45,7 +45,9 @@ private: void buildCloudLayers(void); int update_event; +#if 0 SGSoundSample *snd_lightning; +#endif bool clouds_3d_enabled; int index; diff --git a/src/Environment/precipitation_mgr.cxx b/src/Environment/precipitation_mgr.cxx index 727087f83..1f3140547 100644 --- a/src/Environment/precipitation_mgr.cxx +++ b/src/Environment/precipitation_mgr.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include
#include
@@ -93,6 +92,19 @@ void FGPrecipitationMgr::init() fgGetNode("environment/params/precipitation-level-ft", true); } +void FGPrecipitationMgr::bind () +{ + _tiedProperties.setRoot( fgGetNode("/sim/rendering", true ) ); + _tiedProperties.Tie("precipitation-enable", precipitation.get(), + &SGPrecipitation::getEnabled, + &SGPrecipitation::setEnabled); +} + +void FGPrecipitationMgr::unbind () +{ + _tiedProperties.Untie(); +} + void FGPrecipitationMgr::setPrecipitationLevel(double a) { fgSetDouble("environment/params/precipitation-level-ft",a); @@ -206,7 +218,7 @@ void FGPrecipitationMgr::update(double dt) setPrecipitationLevel(altitudeCloudLayer); // Does the user enable the precipitation ? - if (!sgEnviro.get_precipitation_enable_state()) { + if (!precipitation->getEnabled() ) { // Disable precipitations precipitation->setRainIntensity(0); precipitation->setSnowIntensity(0); diff --git a/src/Environment/precipitation_mgr.hxx b/src/Environment/precipitation_mgr.hxx index 69a0ecfaa..449f7f47c 100644 --- a/src/Environment/precipitation_mgr.hxx +++ b/src/Environment/precipitation_mgr.hxx @@ -31,7 +31,7 @@ #include #include - +#include class FGPrecipitationMgr : public SGSubsystem { @@ -40,12 +40,15 @@ private: osg::ref_ptr transform; osg::ref_ptr precipitation; float getPrecipitationAtAltitudeMax(void); + simgear::TiedPropertyList _tiedProperties; public: FGPrecipitationMgr(); virtual ~FGPrecipitationMgr(); // SGSubsystem methods + virtual void bind (); + virtual void unbind (); virtual void init (); virtual void update (double dt); diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx index d88d0cde9..84d9f84fe 100644 --- a/src/Instrumentation/wxradar.cxx +++ b/src/Instrumentation/wxradar.cxx @@ -38,7 +38,6 @@ #include #include -#include #include #include #include @@ -137,7 +136,7 @@ wxRadarBg::init () SGPath tpath = globals->resolve_aircraft_path(path); // no mipmap or else alpha will mix with pixels on the border of shapes, ruining the effect - _wxEcho = SGLoadTexture2D(tpath, false, false); + _wxEcho = SGLoadTexture2D(tpath, NULL, false, false); _Instrument->setFloatValue("trk", 0.0); @@ -472,13 +471,16 @@ void wxRadarBg::update_weather() { string modeButton = _Instrument->getStringValue("mode", "WX"); - _radarEchoBuffer = *sgEnviro.get_radar_echo(); +// FIXME: implementation of radar echoes missing +// _radarEchoBuffer = *sgEnviro.get_radar_echo(); // pretend we have a scan angle bigger then the FOV // TODO:check real fov, enlarge if < nn, and do clipping if > mm // const float fovFactor = 1.45f; _Instrument->setStringValue("status", modeButton.c_str()); +// FIXME: implementation of radar echoes missing +#if 0 list_of_SGWxRadarEcho *radarEcho = &_radarEchoBuffer; list_of_SGWxRadarEcho::iterator iradarEcho, end = radarEcho->end(); const float LWClevel[] = { 0.1f, 0.5f, 2.1f }; @@ -558,6 +560,7 @@ wxRadarBg::update_weather() addQuad(_vertices, _texCoords, m, texBase); } } +#endif } diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx index f962045e1..2b696430a 100644 --- a/src/Instrumentation/wxradar.hxx +++ b/src/Instrumentation/wxradar.hxx @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -148,7 +147,8 @@ private: float _font_size; float _font_spacing; - list_of_SGWxRadarEcho _radarEchoBuffer; +// FIXME: implementation of radar echoes missing +// list_of_SGWxRadarEcho _radarEchoBuffer; void update_weather(); void update_aircraft(); diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx index c88003f1e..fe713ab62 100644 --- a/src/Main/renderer.cxx +++ b/src/Main/renderer.cxx @@ -82,8 +82,6 @@ #include #endif -#include - #include