mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ternary into early-returning conditionals

Browse Source 
Continuing precedent set in ef5ee38
This commit is contained in:
Chris Thrasher 2024-04-22 20:59:27 -06:00
parent a05daa62b7
commit ebf916edf8
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/island/Island.cpp
View File

@ -346,19 +346,23 @@ sf::Color colorFromFloats(float r, float g, float b)
sf::Color getLowlandsTerrainColor(float moisture)
{
sf::Color color = moisture < 0.27f ? colorFromFloats(240, 240, 180)
: moisture < 0.3f ? colorFromFloats(240 - (240 * (moisture - 0.27f) / 0.03f),
240 - (40 * (moisture - 0.27f) / 0.03f),
180 - (180 * (moisture - 0.27f) / 0.03f))
: moisture < 0.4f ? colorFromFloats(0, 200, 0)
: moisture < 0.48f ? colorFromFloats(0, 200 - (40 * (moisture - 0.4f) / 0.08f), 0)
: moisture < 0.6f ? colorFromFloats(0, 160, 0)
: moisture < 0.7f ? colorFromFloats((34 * (moisture - 0.6f) / 0.1f),
160 - (60 * (moisture - 0.6f) / 0.1f),
(34 * (moisture - 0.6f) / 0.1f))
: colorFromFloats(34, 100, 34);
return color;
if (moisture < 0.27f)
return colorFromFloats(240, 240, 180);
if (moisture < 0.3f)
return colorFromFloats(240 - (240 * (moisture - 0.27f) / 0.03f),
240 - (40 * (moisture - 0.27f) / 0.03f),
180 - (180 * (moisture - 0.27f) / 0.03f));
if (moisture < 0.4f)
return colorFromFloats(0, 200, 0);
if (moisture < 0.48f)
return colorFromFloats(0, 200 - (40 * (moisture - 0.4f) / 0.08f), 0);
if (moisture < 0.6f)
return colorFromFloats(0, 160, 0);
if (moisture < 0.7f)
return colorFromFloats((34 * (moisture - 0.6f) / 0.1f),
160 - (60 * (moisture - 0.6f) / 0.1f),
(34 * (moisture - 0.6f) / 0.1f));
return colorFromFloats(34, 100, 34);
}