Night sky: Fix brightness threshold for applying night colours (#7859)

paramat · web-flow · commit 85b01eacd220 · 2018-11-12T22:25:35.000Z
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.
diff --git a/src/sky.cpp b/src/sky.cpp
@@ -610,22 +610,22 @@ 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(
 				skycolor_bright_dawn_f, color_change_fraction);
 			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(
