mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 10:45:16 +01:00
Code Issues Releases Wiki Activity

Refactor rct_palette to GamePalette

Browse Source
This commit is contained in:
Ted John
2020-05-27 20:12:01 +01:00
parent 10209690c2
commit 46bb30f8a1
18 changed files with 100 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/interface/Colour.cpp
View File

@@ -67,8 +67,8 @@ static uint8_t findClosestPaletteIndex(uint8_t red, uint8_t green, uint8_t blue)
for (int i = PALETTE_INDEX_0; i < PALETTE_INDEX_230; i++)
{
const int32_t distance = std::pow(gPalette[i].red - red, 2) + std::pow(gPalette[i].green - green, 2)
+ std::pow(gPalette[i].blue - blue, 2);
const int32_t distance = std::pow(gPalette[i].Red - red, 2) + std::pow(gPalette[i].Green - green, 2)
+ std::pow(gPalette[i].Blue - blue, 2);
if (distance < closestDistance)
{
@@ -90,9 +90,9 @@ uint8_t blendColours(const uint8_t paletteIndex1, const uint8_t paletteIndex2)
return BlendColourMap[cMin][cMax];
}
uint8_t red = (gPalette[cMin].red + gPalette[cMax].red) / 2;
uint8_t green = (gPalette[cMin].green + gPalette[cMax].green) / 2;
uint8_t blue = (gPalette[cMin].blue + gPalette[cMax].blue) / 2;
uint8_t red = (gPalette[cMin].Red + gPalette[cMax].Red) / 2;
uint8_t green = (gPalette[cMin].Green + gPalette[cMax].Green) / 2;
uint8_t blue = (gPalette[cMin].Blue + gPalette[cMax].Blue) / 2;
BlendColourMap[cMin][cMax] = findClosestPaletteIndex(red, green, blue);
return BlendColourMap[cMin][cMax];