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

Implement more features and fix bugs

Browse Source
This commit is contained in:
ISSOtm
2022-03-01 19:41:27 +01:00
committed by Eldred Habert
parent d30e507270
commit 6e406b22bb
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gfx/pal_packing.cpp
View File

@@ -203,10 +203,8 @@ public:
size_t volume() const { return uniqueColors().size(); }
bool canFit(ProtoPalette const &protoPal) const {
auto &colors = uniqueColors();
for (uint16_t color : protoPal) {
colors.insert(color);
}
return colors.size() <= 4;
colors.insert(protoPal.begin(), protoPal.end());
return colors.size() <= options.maxPalSize();
}
};
@@ -274,9 +272,9 @@ std::tuple<DefaultInitVec<size_t>, size_t>
bestPal.assign(std::move(attrs));
// If this overloads the palette, get it back to normal (if possible)
while (bestPal.volume() > 4) {
options.verbosePrint("Palette %zu is overloaded! (%zu > 4)\n", bestPalIndex,
bestPal.volume());
while (bestPal.volume() > options.maxPalSize()) {
options.verbosePrint("Palette %zu is overloaded! (%zu > %" PRIu8 ")\n",
bestPalIndex, bestPal.volume(), options.maxPalSize());
// Look for a proto-pal minimizing "efficiency" (size / rel_size)
auto efficiency = [&bestPal](ProtoPalette const &pal) {
@@ -309,7 +307,7 @@ std::tuple<DefaultInitVec<size_t>, size_t>
// Deal with palettes still overloaded, by emptying them
for (AssignedProtos &pal : assignments) {
if (pal.volume() > 4) {
if (pal.volume() > options.maxPalSize()) {
for (ProtoPalAttrs &attrs : pal) {
queue.emplace(std::move(attrs));
}