Adjust sunset/sun rise color scheme

diff --git a/simgear/scene/sky/oursun.cxx b/simgear/scene/sky/oursun.cxx
index 70dca1cc182a43f0f0bc67b28ca9340b03c63224..f94d0af4c7b5d5f0bfe2d62f69a33cf8c431efb5 100644 (file)
--- a/simgear/scene/sky/oursun.cxx
+++ b/simgear/scene/sky/oursun.cxx
@@ -347,7 +347,7 @@ bool SGSun::repaint( double sun_angle ) {
        sgVec4 color;
        sgSetVec4( color,
                   (ambient * 6.0)  - 1.0, // minimum value = 0.8
-                  (ambient * 11.0) - 3.0, // minimum value = 0.3
+                  (ambient * 11.0) - 2.8, // minimum value = 0.5
                   (ambient * 12.0) - 3.6, // minimum value = 0.0
                   1.0 );
     

diff --git a/simgear/scene/sky/sky.cxx b/simgear/scene/sky/sky.cxx
index 012fdd92cbc2f2802cc92d1669363558369a9026..0a767aa2291b5e0829d0bad33fbd6fc7353cbc39 100644 (file)
--- a/simgear/scene/sky/sky.cxx
+++ b/simgear/scene/sky/sky.cxx
@@ -105,7 +105,7 @@ void SGSky::build(  double sun_size, double moon_size,
 // 0 degrees = high noon
 // 90 degrees = sun rise/set
 // 180 degrees = darkest midnight
-bool SGSky::repaint( sgVec4 sky_color, sgVec4 fog_color,
+bool SGSky::repaint( sgVec4 sky_color, sgVec4 fog_color, sgVec4 cloud_color,
                     double sun_angle, double moon_angle,
                     int nplanets, sgdVec3 *planet_data,
                     int nstars, sgdVec3 *star_data )
@@ -120,7 +120,7 @@ bool SGSky::repaint( sgVec4 sky_color, sgVec4 fog_color,
 
        for ( int i = 0; i < (int)cloud_layers.size(); ++i ) {
             if (cloud_layers[i]->getCoverage() != SGCloudLayer::SG_CLOUD_CLEAR){
-                cloud_layers[i]->repaint( fog_color );
+                cloud_layers[i]->repaint( cloud_color );
             }
        }
     } else {

diff --git a/simgear/scene/sky/sky.hxx b/simgear/scene/sky/sky.hxx
index fba4d48621777c00919cacfd13b071db46d7a401..7ddb440a4714dc3186c1084e06623598c93d84d5 100644 (file)
--- a/simgear/scene/sky/sky.hxx
+++ b/simgear/scene/sky/sky.hxx
@@ -261,7 +261,7 @@ public:
      * @param star_data an array of star right ascensions, declinations,
      *        and magnitudes
      */
-    bool repaint( sgVec4 sky_color, sgVec4 fog_color,
+    bool repaint( sgVec4 sky_color, sgVec4 fog_color, sgVec4 cloud_color,
                  double sun_angle, double moon_angle,
                  int nplanets, sgdVec3 *planet_data,
                  int nstars, sgdVec3 *star_data );