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

Correctly handle fully-transparent tiles when outputting unoptimized tilemap

Browse Source
This commit is contained in:
ISSOtm
2022-04-24 17:15:27 +02:00
committed by Eldred Habert
parent c521233499
commit 57ac07b03e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gfx/process.cpp
View File

@@ -439,6 +439,11 @@ public:
}; };
struct AttrmapEntry { struct AttrmapEntry {
/**
* This field can either be a proto-palette ID, or `transparent` to indicate that the
* corresponding tile is fully transparent. If you are looking to get the palette ID for this
* attrmap entry while correctly handling the above, use `getPalID`.
*/
size_t protoPaletteID; // Only this field is used when outputting "unoptimized" data size_t protoPaletteID; // Only this field is used when outputting "unoptimized" data
uint8_t tileID; // This is the ID as it will be output to the tilemap uint8_t tileID; // This is the ID as it will be output to the tilemap
bool bank; bool bank;
@@ -446,6 +451,10 @@ struct AttrmapEntry {
bool xFlip; bool xFlip;
static constexpr decltype(protoPaletteID) transparent = SIZE_MAX; static constexpr decltype(protoPaletteID) transparent = SIZE_MAX;
size_t getPalID(DefaultInitVec<size_t> const &mappings) const {
return protoPaletteID == transparent ? 0 : mappings[protoPaletteID];
}
}; };
static std::tuple<DefaultInitVec<size_t>, std::vector<Palette>> static std::tuple<DefaultInitVec<size_t>, std::vector<Palette>>
@@ -681,10 +690,8 @@ static void outputTileData(Png const &png, DefaultInitVec<AttrmapEntry> const &a
auto iter = attrmap.begin(); auto iter = attrmap.begin();
for (auto tile : png.visitAsTiles(options.columnMajor)) { for (auto tile : png.visitAsTiles(options.columnMajor)) {
size_t protoPaletteID = iter->protoPaletteID;
// If the tile is fully transparent, default to palette 0 // If the tile is fully transparent, default to palette 0
Palette const &palette = Palette const &palette = palettes[iter->getPalID(mappings)];
palettes[protoPaletteID != AttrmapEntry::transparent ? mappings[protoPaletteID] : 0];
for (uint32_t y = 0; y < 8; ++y) { for (uint32_t y = 0; y < 8; ++y) {
uint16_t bitplanes = TileData::rowBitplanes(tile, palette, y); uint16_t bitplanes = TileData::rowBitplanes(tile, palette, y);
output.sputc(bitplanes & 0xFF); output.sputc(bitplanes & 0xFF);
@@ -729,7 +736,7 @@ static void outputMaps(Png const &png, DefaultInitVec<AttrmapEntry> const &attrm
tilemapOutput->sputc(tileID + options.baseTileIDs[bank]); tilemapOutput->sputc(tileID + options.baseTileIDs[bank]);
} }
if (attrmapOutput.has_value()) { if (attrmapOutput.has_value()) {
uint8_t palID = mappings[iter->protoPaletteID] & 7; uint8_t palID = iter->getPalID(mappings) & 7;
attrmapOutput->sputc(palID | bank << 3); // The other flags are all 0 attrmapOutput->sputc(palID | bank << 3); // The other flags are all 0
++iter; ++iter;
} }