#545: Fix ATC chatter sound settings being ignored

[flightgear.git] / src / Time / light.cxx

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 2e380e59b265dcedaa311a818fec6f4e3bd4783f..d12d6704935375aaf73bd98bb866c13d6f256535 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -71,6 +71,7 @@ FGLight::FGLight ()
       _scene_diffuse(0, 0, 0, 0),
       _scene_specular(0, 0, 0, 0),
       _scene_chrome(0, 0, 0, 0),
+      _sun_color(1, 1, 1, 0),
       _sky_color(0, 0, 0, 0),
       _fog_color(0, 0, 0, 0),
       _cloud_color(0, 0, 0, 0),
@@ -161,6 +162,9 @@ void FGLight::bind () {
     prop->tie("/rendering/scene/specular/red",SGRawValuePointer<float>(&_scene_specular[0]));
     prop->tie("/rendering/scene/specular/green",SGRawValuePointer<float>(&_scene_specular[1]));
     prop->tie("/rendering/scene/specular/blue",SGRawValuePointer<float>(&_scene_specular[2]));
+    prop->tie("/rendering/dome/sun/red",SGRawValuePointer<float>(&_sun_color[0]));
+    prop->tie("/rendering/dome/sun/green",SGRawValuePointer<float>(&_sun_color[1]));
+    prop->tie("/rendering/dome/sun/blue",SGRawValuePointer<float>(&_sun_color[2]));
     prop->tie("/rendering/dome/sky/red",SGRawValuePointer<float>(&_sky_color[0]));
     prop->tie("/rendering/dome/sky/green",SGRawValuePointer<float>(&_sky_color[1]));
     prop->tie("/rendering/dome/sky/blue",SGRawValuePointer<float>(&_sky_color[2]));
@@ -277,7 +281,6 @@ void FGLight::update_sky_color () {
     _sky_color[3] = base_sky_color[3];
     gamma_correct_rgb( _sky_color.data() );
 
-    sqrt_sky_brightness /= _scattering;
     _cloud_color[0] = base_fog_color[0] * sky_brightness;
     _cloud_color[1] = base_fog_color[1] * sky_brightness;
     _cloud_color[2] = base_fog_color[2] * sky_brightness;
@@ -315,10 +318,10 @@ void FGLight::update_sky_color () {
             _chromeProps[i]->setValue(static_cast<double>(_scene_chrome[i]));
     }
 
-    color = thesky->get_sun_color();
-    _scene_specular[0] = color[0] * specular;
-    _scene_specular[1] = color[1] * specular;
-    _scene_specular[2] = color[2] * specular;
+    // _sun_color = thesky->get_sun_color();
+    _scene_specular[0] = _sun_color[0] * specular;
+    _scene_specular[1] = _sun_color[1] * specular;
+    _scene_specular[2] = _sun_color[2] * specular;
     _scene_specular[3] = 1.0;
     gamma_correct_rgb( _scene_specular.data() );
 }
@@ -380,9 +383,9 @@ void FGLight::update_adj_fog_color () {
     // Calculate the fog color in the direction of the sun for
     // sunrise/sunset effects.
     //
-    float s_red =   color[0]*color[0]*color[0];
-    float s_green = color[1]*color[1]*color[1];
-    float s_blue =  color[2]*color[2];
+    _sun_color[0] = color[0]*color[0]*color[0];
+    _sun_color[1] = color[1]*color[1]*color[1];
+    _sun_color[2] = color[2]*color[2];
 
     // interpolate between the sunrise/sunset color and the color
     // at the opposite direction of this effect. Take in account
@@ -402,9 +405,9 @@ void FGLight::update_adj_fog_color () {
     float rf3 = 1.0 - rf2;
 
     gamma = system_gamma * (0.9 - sif*avf);
-    _adj_fog_color[0] = rf3 * _fog_color[0] + rf2 * s_red;
-    _adj_fog_color[1] = rf3 * _fog_color[1] + rf2 * s_green;
-    _adj_fog_color[2] = rf3 * _fog_color[2] + rf2 * s_blue;
+    _adj_fog_color[0] = rf3 * _fog_color[0] + rf2 * _sun_color[0];
+    _adj_fog_color[1] = rf3 * _fog_color[1] + rf2 * _sun_color[1];
+    _adj_fog_color[2] = rf3 * _fog_color[2] + rf2 * _sun_color[2];
     gamma_correct_rgb( _adj_fog_color.data(), gamma);
 
     // make sure the colors have their original value before they are being