Respect precipitation-enable property

From Csaba Halász

diff --git a/simgear/environment/precipitation.cxx b/simgear/environment/precipitation.cxx
index b5467a600b816f0b86a114a0c4c4bd113e7601d7..05b1b447091e83f2e4514bbe438d9d0d605cc6d8 100644 (file)
--- a/simgear/environment/precipitation.cxx
+++ b/simgear/environment/precipitation.cxx
@@ -25,6 +25,7 @@
  */
 
 #include "precipitation.hxx"
+#include "visual_enviro.hxx"
 
 #include <simgear/constants.h>
 
@@ -146,7 +147,8 @@ bool SGPrecipitation::update(void)
             this->_snow_intensity = this->_rain_intensity;
     }
 
-    if (this->_snow_intensity > 0) {
+    bool enabled = sgEnviro.get_precipitation_enable_state();
+    if (enabled && this->_snow_intensity > 0) {
         _precipitationEffect->setWind(_wind_vec);
         _precipitationEffect->setParticleSpeed( -0.75f - 0.25f*_snow_intensity);
                
@@ -158,7 +160,7 @@ bool SGPrecipitation::update(void)
         _precipitationEffect->setFarTransition(100.0f - 60.0f*sqrtf(_snow_intensity));
                
         _precipitationEffect->setParticleColor(osg::Vec4(0.85, 0.85, 0.85, 1.0) - osg::Vec4(0.1, 0.1, 0.1, 1.0) * _snow_intensity);
-    } else if (this->_rain_intensity > 0){
+    } else if (enabled && this->_rain_intensity > 0) {
         _precipitationEffect->setWind(_wind_vec);
         _precipitationEffect->setParticleSpeed( -2.0f + -5.0f*_rain_intensity);