Adjust sunset/sun rise color scheme

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 93e2f43dca7eb0b7b2b55157ee7c88fb51ba817d..2893c5d66d887f6b7d2ee21bc74ee33a2a6f99ae 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -593,6 +593,7 @@ void fgRenderFrame() {
             */
             thesky->repaint( cur_light_params.sky_color,
                              cur_light_params.adj_fog_color,
+                             cur_light_params.cloud_color,
                              cur_light_params.sun_angle,
                              cur_light_params.moon_angle,
                              globals->get_ephem()->getNumPlanets(),

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index a6021b17480206367ff866dd01ee21c290313ad9..1e3a15d722795c6628b80acee766ca45790c6063 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -122,14 +122,6 @@ void fgLIGHT::Update( void ) {
     // calculate lighting parameters based on sun's relative angle to
     // local up
 
-    // base fog color
-    float *sun_color = thesky->get_sun_color();
-
-    base_fog_color[0] *= (1.25 - sun_color[0]/4.0);    // 100% red
-    base_fog_color[1] *= (0.48 + sun_color[1]/1.923);  //  40% green
-    base_fog_color[2] *= sun_color[2];                 //   0% blue
-
-
     deg = sun_angle * SGD_RADIANS_TO_DEGREES;
     SG_LOG( SG_EVENT, SG_INFO, "  Sun angle = " << deg );
 
@@ -169,11 +161,18 @@ void fgLIGHT::Update( void ) {
     sky_color[2] = base_sky_color[2] * sky_brightness;
     sky_color[3] = base_sky_color[3];
 
+    // set cloud color
+    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;
+    cloud_color[3] = base_fog_color[3];
+
     // set fog color
-    fog_color[0] = base_fog_color[0] * sky_brightness;
-    fog_color[1] = base_fog_color[1] * sky_brightness;
-    fog_color[2] = base_fog_color[2] * sky_brightness;
-    fog_color[3] = base_fog_color[3];
+    float *sun_color = thesky->get_sun_color();
+    fog_color[0] = cloud_color[0] * (1.25 - sun_color[0]/4.0);    // 100% red
+    fog_color[1] = cloud_color[1] * (0.48 + sun_color[1]/1.923);  //  40% green
+    fog_color[2] = cloud_color[2] * sun_color[2];                 //   0% blue
+    fog_color[3] = cloud_color[3];
 }
 
 

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index 98a5f7dc31bfbb30012b529732e0d4760d7c66ad..582409e912ab2b67cf624d31c4be65a6a11abbf5 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -127,6 +127,9 @@ public:
     // fog color adjusted for sunset effects
     GLfloat adj_fog_color[4];
 
+    // cloud color
+    GLfloat cloud_color[4];
+
     // clear screen color
     GLfloat sky_color[4];