]> git.mxchange.org Git - flightgear.git/commitdiff
Add a /rendering/scene/overcast option to color the skydome gray in case of overcast
authorErik Hofman <erik@ehofman.com>
Sun, 5 Jun 2011 08:20:16 +0000 (10:20 +0200)
committerErik Hofman <erik@ehofman.com>
Sun, 5 Jun 2011 08:20:16 +0000 (10:20 +0200)
src/Time/light.cxx
src/Time/light.hxx

index 861c496e99c1e0f9a9862ad7e412fb2d78989276..19b996153102b9e3159bb392b23b64d74c17d3b1 100644 (file)
@@ -78,6 +78,7 @@ FGLight::FGLight ()
       _adj_sky_color(0, 0, 0, 0),
       _saturation(1.0),
       _scattering(0.8),
+      _overcast(0.0),
       _dt_total(0)
 {
 }
@@ -145,6 +146,7 @@ void FGLight::bind () {
     // Write Only
     prop->tie("/rendering/scene/saturation",SGRawValuePointer<float>(&_saturation));
     prop->tie("/rendering/scene/scattering",SGRawValuePointer<float>(&_scattering));
+    prop->tie("/rendering/scene/overcast",SGRawValuePointer<float>(&_overcast));
 
     // Read Only
     prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer<double>(&_sun_angle));
@@ -178,7 +180,7 @@ void FGLight::unbind () {
     SGPropertyNode *prop = globals->get_props();
     prop->untie("/rendering/scene/saturation");
     prop->untie("/rendering/scene/scattering");
-    prop->untie("/environment/relative-humidity");
+    prop->untie("/rendering/scene/overcast");
 
     prop->untie("/sim/time/sun-angle-rad");
     prop->untie("/rendering/scene/ambient/red");
@@ -261,9 +263,9 @@ void FGLight::update_sky_color () {
     gamma_correct_rgb( _fog_color.data() );
 
     // set sky color
-    _sky_color[0] = base_sky_color[0] * sky_brightness;
-    _sky_color[1] = base_sky_color[1] * sky_brightness;
-    _sky_color[2] = base_sky_color[2] * sky_brightness;
+    _sky_color[0] = (base_sky_color[0] + (1.0f-base_sky_color[0]) * _overcast) * sky_brightness;
+    _sky_color[1] = (base_sky_color[1] + (1.0f-base_sky_color[1]) * _overcast)  * sky_brightness;
+    _sky_color[2] = (base_sky_color[2] + (1.0f-base_sky_color[2]) * _overcast)  * sky_brightness;
     _sky_color[3] = base_sky_color[3];
     gamma_correct_rgb( _sky_color.data() );
 
index 69987d33799cc7921436dc6e2f9aaaef81099b91..1880c3deab0a3cf9fa34b95e39b23a0c9f5dc105 100644 (file)
@@ -100,6 +100,7 @@ private:
     // input parameters affected by the weather system
     float _saturation;
     float _scattering;
+    float _overcast;
 
     double _dt_total;