gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sorting RGB palettes by luminance is not a "legacy" feature

Browse Source
This commit is contained in:
Rangi42
2024-12-23 10:01:30 -05:00
parent 36b04b5dea
commit b058bb6e15
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gfx/pal_sorting.cpp
View File

@@ -48,7 +48,7 @@ void sortIndexed(
void sortGrayscale( void sortGrayscale(
std::vector<Palette> &palettes, std::array<std::optional<Rgba>, 0x8001> const &colors std::vector<Palette> &palettes, std::array<std::optional<Rgba>, 0x8001> const &colors
) { ) {
options.verbosePrint(Options::VERB_LOG_ACT, "Sorting grayscale-only palette...\n"); options.verbosePrint(Options::VERB_LOG_ACT, "Sorting palette by grayscale bins...\n");
// This method is only applicable if there are at most as many colors as colors per palette, so // This method is only applicable if there are at most as many colors as colors per palette, so
// we should only have a single palette. // we should only have a single palette.
@@ -56,7 +56,7 @@ void sortGrayscale(
Palette &palette = palettes[0]; Palette &palette = palettes[0];
std::fill(RANGE(palette.colors), Rgba::transparent); std::fill(RANGE(palette.colors), Rgba::transparent);
for (auto const &slot : colors) { for (std::optional<Rgba> const &slot : colors) {
if (!slot.has_value() || slot->isTransparent()) { if (!slot.has_value() || slot->isTransparent()) {
continue; continue;
} }
@@ -64,7 +64,7 @@ void sortGrayscale(
} }
} }
static unsigned int legacyLuminance(uint16_t color) { static unsigned int luminance(uint16_t color) {
uint8_t red = color & 0b11111; uint8_t red = color & 0b11111;
uint8_t green = color >> 5 & 0b11111; uint8_t green = color >> 5 & 0b11111;
uint8_t blue = color >> 10; uint8_t blue = color >> 10;
@@ -72,11 +72,11 @@ static unsigned int legacyLuminance(uint16_t color) {
} }
void sortRgb(std::vector<Palette> &palettes) { void sortRgb(std::vector<Palette> &palettes) {
options.verbosePrint(Options::VERB_LOG_ACT, "Sorting palettes by \"\"\"luminance\"\"\"...\n"); options.verbosePrint(Options::VERB_LOG_ACT, "Sorting palettes by luminance...\n");
for (Palette &pal : palettes) { for (Palette &pal : palettes) {
std::sort(RANGE(pal), [](uint16_t lhs, uint16_t rhs) { std::sort(RANGE(pal), [](uint16_t lhs, uint16_t rhs) {
return legacyLuminance(lhs) > legacyLuminance(rhs); return luminance(lhs) > luminance(rhs);
}); });
} }
} }