Skip to content

Commit

Permalink
Sun colour: Undo colour change. Remove double assignment (#7227)
Browse files Browse the repository at this point in the history
Commit 5070ca2 changed sun colour by
fixing what seemed to be a code mistake.
Return to the standard colour but comment-out the first assignment of the
double-assignment for performance.
Add a comment to explain.
  • Loading branch information
paramat authored Apr 9, 2018
1 parent 746ca41 commit af86842
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions src/sky.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,17 @@ void Sky::render()
if (m_sunlight_seen) {
float sunsize = 0.07;
video::SColorf suncolor_f(1, 1, 0, 1);
suncolor_f.r = 1;
suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.7 + m_time_brightness * 0.5));
suncolor_f.b = MYMAX(0.0, m_brightness * 0.95);
//suncolor_f.r = 1;
//suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.7 + m_time_brightness * 0.5));
//suncolor_f.b = MYMAX(0.0, m_brightness * 0.95);
video::SColorf suncolor2_f(1, 1, 1, 1);
suncolor2_f.r = 1;
suncolor2_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5));
suncolor2_f.b = MYMAX(0.0, m_brightness);
// The values below were probably meant to be suncolor2_f instead of a
// reassignment of suncolor_f. However, the resulting colour was chosen
// and is our long-running classic colour. So preserve, but comment-out
// the unnecessary first assignments above.
suncolor_f.r = 1;
suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5));
suncolor_f.b = MYMAX(0.0, m_brightness);

float moonsize = 0.04;
video::SColorf mooncolor_f(0.50, 0.57, 0.65, 1);
Expand Down

0 comments on commit af86842

Please sign in to comment.