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

Fix duplicated CGB color calculation in pal sorting

Browse Source 
And also the inverted alpha channel condition causing the wrong colors
to be treated as transparent
This commit is contained in:
ISSOtm
2022-03-01 00:53:42 +01:00
committed by Eldred Habert
parent 373a22660b
commit d30e507270
3 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gfx/pal_sorting.cpp
View File

@@ -7,6 +7,7 @@
#include "helpers.h"
#include "gfx/convert.hpp"
#include "gfx/main.hpp"
namespace sorting {
@@ -19,10 +20,12 @@ void indexed(std::vector<Palette> &palettes, int palSize, png_color const *palRG
std::sort(pal.begin(), pal.end(), [&](uint16_t lhs, uint16_t rhs) {
// Iterate through the PNG's palette, looking for either of the two
for (int i = 0; i < palSize; ++i) {
if (palAlpha && palAlpha[i])
continue;
auto const &c = palRGB[i];
uint16_t cgbColor = c.red >> 3 | (c.green >> 3) << 5 | (c.blue >> 3) << 10;
Rgba color(c.red, c.green, c.blue, palAlpha ? palAlpha[i] : 0xFF);
uint16_t cgbColor = color.cgbColor();
if (cgbColor == Rgba::transparent) {
continue;
}
// Return whether lhs < rhs
if (cgbColor == rhs) {
return false;