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 ineffective sorting of palettes pre-packing

Browse Source 
We were sorting the *IDs*, not the proto-palettes...
This commit is contained in:
ISSOtm
2024-08-08 11:31:46 +02:00
parent 1ad9383042
commit 0f1137c6ec
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gfx/pal_packing.cpp
View File

@@ -362,7 +362,19 @@ std::tuple<DefaultInitVec<size_t>, size_t>
DefaultInitVec<size_t> sortedProtoPalIDs(protoPalettes.size()); DefaultInitVec<size_t> sortedProtoPalIDs(protoPalettes.size());
sortedProtoPalIDs.clear(); sortedProtoPalIDs.clear();
for (size_t i = 0; i < protoPalettes.size(); ++i) { for (size_t i = 0; i < protoPalettes.size(); ++i) {
sortedProtoPalIDs.insert(std::lower_bound(RANGE(sortedProtoPalIDs), i), i); sortedProtoPalIDs.insert(
std::lower_bound(
RANGE(sortedProtoPalIDs),
i,
[&protoPalettes](size_t left, size_t right) {
ProtoPalette const &lhs = protoPalettes[left];
ProtoPalette const &rhs = protoPalettes[right];
return lhs.size()
> rhs.size(); // We want the proto-pals to be sorted *largest first*!
}
),
i
);
} }
// Begin with all proto-palettes queued up for insertion // Begin with all proto-palettes queued up for insertion
std::queue<ProtoPalAttrs> queue(std::deque<ProtoPalAttrs>(RANGE(sortedProtoPalIDs))); std::queue<ProtoPalAttrs> queue(std::deque<ProtoPalAttrs>(RANGE(sortedProtoPalIDs)));

6
test/gfx/at-file-ref.err
View File

@@ -6,9 +6,9 @@ error: Failed to fit tile colors [$6c8a, $7f55] in specified palettes
error: Failed to fit tile colors [$6c8a] in specified palettes error: Failed to fit tile colors [$6c8a] in specified palettes
error: Failed to fit tile colors [$7fff] in specified palettes error: Failed to fit tile colors [$7fff] in specified palettes
note: The following palettes were specified: note: The following palettes were specified:
[$3f65, $36b3, $262a, $50b0]
[$5f77, $213d, $41a6, $40ee] [$5f77, $213d, $41a6, $40ee]
[$5f77, $267c, $213d, $40ee] [$3f65, $36b3, $262a, $50b0]
[$53c3, $3f65, $36b3] [$53c3, $3f65, $36b3]
[$267c, $41a6] [$5f77, $267c, $41a6]
[$267c, $213d, $40ee]
Conversion aborted after 7 errors Conversion aborted after 7 errors