fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Torsten Dreyer 2011-06-04 15:58:54 +02:00
commit c9bb9f6044
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Time/light.cxx
View file

@ -76,7 +76,6 @@ FGLight::FGLight ()
_cloud_color(0, 0, 0, 0),
_adj_fog_color(0, 0, 0, 0),
_adj_sky_color(0, 0, 0, 0),
_humidity(69.5),
_saturation(1.0),
_scattering(0.8),
_dt_total(0)
@ -146,7 +145,6 @@ void FGLight::bind () {
// Write Only
prop->tie("/rendering/scene/saturation",SGRawValuePointer<float>(&_saturation));
prop->tie("/rendering/scene/scattering",SGRawValuePointer<float>(&_scattering));
prop->tie("/environment/relative-humidity",SGRawValuePointer<float>(&_humidity));
// Read Only
prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer<double>(&_sun_angle));
@ -225,7 +223,8 @@ void FGLight::update_sky_color () {
// calculate lighting parameters based on sun's relative angle to
// local up
float av = _humidity * 45;
static SGConstPropertyNode_ptr humidity = fgGetNode("/environment/relative-humidity");
float av = humidity->getFloatValue() * 45;
float visibility_log = log(av)/11.0;
float visibility_inv = (45000.0 - av)/45000.0;

1
src/Time/light.hxx
View file

@ -98,7 +98,6 @@ private:
SGVec4f _adj_sky_color;
// input parameters affected by the weather system
float _humidity;
float _saturation;
float _scattering;