Night sky: Fix brightness threshold for applying night colours (#7859)
authorParamat <paramat@users.noreply.github.com>
Mon, 12 Nov 2018 22:25:35 +0000 (22:25 +0000)
committerGitHub <noreply@github.com>
Mon, 12 Nov 2018 22:25:35 +0000 (22:25 +0000)
Previously, 'time_brightness' never fell below the threshold so
night sky colours were not applied.

Increase the threshold value. But now also set it to a value less
sensitive to possible future small changes in 'time_brightness',
by setting it halfway between the 'time_brightness' values for
darkest night and first stage of dawn.

src/sky.cpp

index 8ae45d144ee430ae1deba638d7fc60a8451994c6..faf12ba92a614c8e06586d18b5ccb3b1dff0a6dc 100644 (file)
@@ -610,9 +610,9 @@ void Sky::update(float time_of_day, float time_brightness,
        }
 
        m_clouds_visible = true;
-       float color_change_fraction = 0.98;
+       float color_change_fraction = 0.98f;
        if (sunlight_seen) {
-               if (is_dawn) {  // Dawn
+               if (is_dawn) { // Dawn
                        m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
                                bgcolor_bright_dawn_f, color_change_fraction);
                        m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
@@ -620,12 +620,12 @@ void Sky::update(float time_of_day, float time_brightness,
                        m_cloudcolor_bright_f = m_cloudcolor_bright_f.getInterpolated(
                                cloudcolor_bright_dawn_f, color_change_fraction);
                } else {
-                       if (time_brightness < 0.07) {  // Night
+                       if (time_brightness < 0.13f) { // Night
                                m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
                                        bgcolor_bright_night_f, color_change_fraction);
                                m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(
                                        skycolor_bright_night_f, color_change_fraction);
-                       } else {  // Day
+                       } else { // Day
                                m_bgcolor_bright_f = m_bgcolor_bright_f.getInterpolated(
                                        bgcolor_bright_normal_f, color_change_fraction);
                                m_skycolor_bright_f = m_skycolor_bright_f.getInterpolated(