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

Replace vectors with unordered_sets

Browse Source
This commit is contained in:
Rangi42
2025-07-23 18:17:39 -04:00
parent 7e151f16c3
commit 18e35053fa
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gfx/process.cpp
View File

@@ -154,23 +154,23 @@ struct Image {
giveUp(); giveUp();
} }
// Holds known-conflicting color pairs to avoid warning about them twice. // Holds colors whose alpha value is ambiguous to avoid erroring about them twice.
std::unordered_set<uint32_t> ambiguous;
// Holds fused color pairs to avoid warning about them twice.
// We don't need to worry about transitivity, as ImagePalette slots are immutable once // We don't need to worry about transitivity, as ImagePalette slots are immutable once
// assigned, and conflicts always occur between that and another color. // assigned, and conflicts always occur between that and another color.
// For the same reason, we don't need to worry about order, either. // For the same reason, we don't need to worry about order, either.
std::vector<std::tuple<uint32_t, uint32_t>> conflicts; auto hashPair = [](std::pair<uint32_t, uint32_t> const &pair) {
// Holds colors whose alpha value is ambiguous return pair.first * 31 + pair.second;
std::vector<uint32_t> indeterminates; };
std::unordered_set<std::pair<uint32_t, uint32_t>, decltype(hashPair)> fusions;
// Register colors from image // Register colors from `png` into `colors`
for (uint32_t y = 0; y < png.height; ++y) { for (uint32_t y = 0; y < png.height; ++y) {
for (uint32_t x = 0; x < png.width; ++x) { for (uint32_t x = 0; x < png.width; ++x) {
Rgba const &color = pixel(x, y); if (Rgba const &color = pixel(x, y); color.isTransparent() == color.isOpaque()) {
// Report ambiguously transparent or opaque colors
// Assign a color to the given position, and register it in the image palette if (uint32_t css = color.toCSS(); ambiguous.find(css) == ambiguous.end()) {
if (color.isTransparent() == color.isOpaque()) {
uint32_t css = color.toCSS();
if (std::find(RANGE(indeterminates), css) == indeterminates.end()) {
error( error(
"Color #%08x is neither transparent (alpha < %u) nor opaque (alpha >= " "Color #%08x is neither transparent (alpha < %u) nor opaque (alpha >= "
"%u) [first seen at x: %" PRIu32 ", y: %" PRIu32 "]", "%u) [first seen at x: %" PRIu32 ", y: %" PRIu32 "]",
@@ -180,23 +180,22 @@ struct Image {
x, x,
y y
); );
indeterminates.push_back(css); ambiguous.insert(css); // Do not report this color again
} }
} else if (Rgba const *other = colors.registerColor(color); other) { } else if (Rgba const *other = colors.registerColor(color); other) {
std::tuple conflicting{color.toCSS(), other->toCSS()}; // Report fused colors that reduce to the same RGB555 value
// Do not report combinations twice if (std::pair fused{color.toCSS(), other->toCSS()};
if (std::find(RANGE(conflicts), conflicting) == conflicts.end()) { fusions.find(fused) == fusions.end()) {
warnx( warnx(
"Fusing colors #%08x and #%08x into Game Boy color $%04x [first seen " "Fusing colors #%08x and #%08x into Game Boy color $%04x [first seen "
"at x: %" PRIu32 ", y: %" PRIu32 "]", "at x: %" PRIu32 ", y: %" PRIu32 "]",
std::get<0>(conflicting), fused.first,
std::get<1>(conflicting), fused.second,
color.cgbColor(), color.cgbColor(),
x, x,
y y
); );
// Do not report this combination again fusions.insert(fused); // Do not report this fusion again
conflicts.emplace_back(conflicting);
} }
} }
} }