FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect precipitation-enable property

Browse Source 
From Csaba Halász
This commit is contained in:
timoore
2008-10-31 09:46:23 +00:00
parent 6afd7e1a38
commit cc17cc4af7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/environment/precipitation.cxx
+4 -2
View File
@@ -25,6 +25,7 @@
*/ */
#include "precipitation.hxx" #include "precipitation.hxx"
#include "visual_enviro.hxx"
#include <simgear/constants.h> #include <simgear/constants.h>
@@ -146,7 +147,8 @@ bool SGPrecipitation::update(void)
this->_snow_intensity = this->_rain_intensity; 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->setWind(_wind_vec);
_precipitationEffect->setParticleSpeed( -0.75f - 0.25f*_snow_intensity); _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->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); _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->setWind(_wind_vec);
_precipitationEffect->setParticleSpeed( -2.0f + -5.0f*_rain_intensity); _precipitationEffect->setParticleSpeed( -2.0f + -5.0f*_rain_intensity);