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

Stop passing options.columnMajor explicitly everywhere

Browse Source
This commit is contained in:
ISSOtm
2022-07-02 10:53:16 +02:00
committed by Eldred Habert
parent 0d32775a1f
commit 87092208bc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gfx/process.cpp
View File

@@ -458,8 +458,9 @@ public:
} }
}; };
public: public:
TilesVisitor visitAsTiles(bool columnMajor) const { TilesVisitor visitAsTiles() const {
return {*this, columnMajor, options.inputSlice.width ? options.inputSlice.width * 8 : width, return {*this, options.columnMajor,
options.inputSlice.width ? options.inputSlice.width * 8 : width,
options.inputSlice.height ? options.inputSlice.height * 8 : height}; options.inputSlice.height ? options.inputSlice.height * 8 : height};
} }
}; };
@@ -758,7 +759,7 @@ static void outputTileData(Png const &png, DefaultInitVec<AttrmapEntry> const &a
} }
remainingTiles -= options.trim; remainingTiles -= options.trim;
for (auto [tile, attr] : zip(png.visitAsTiles(options.columnMajor), attrmap)) { for (auto [tile, attr] : zip(png.visitAsTiles(), attrmap)) {
// If the tile is fully transparent, default to palette 0 // If the tile is fully transparent, default to palette 0
Palette const &palette = palettes[attr.getPalID(mappings)]; Palette const &palette = palettes[attr.getPalID(mappings)];
for (uint32_t y = 0; y < 8; ++y) { for (uint32_t y = 0; y < 8; ++y) {
@@ -870,7 +871,7 @@ static UniqueTiles dedupTiles(Png const &png, DefaultInitVec<AttrmapEntry> &attr
// by caching the full tile data anyway, so we might as well.) // by caching the full tile data anyway, so we might as well.)
UniqueTiles tiles; UniqueTiles tiles;
for (auto [tile, attr] : zip(png.visitAsTiles(options.columnMajor), attrmap)) { for (auto [tile, attr] : zip(png.visitAsTiles(), attrmap)) {
auto [tileID, matchType] = tiles.addTile(tile, palettes[mappings[attr.protoPaletteID]]); auto [tileID, matchType] = tiles.addTile(tile, palettes[mappings[attr.protoPaletteID]]);
attr.xFlip = matchType == TileData::HFLIP || matchType == TileData::VHFLIP; attr.xFlip = matchType == TileData::HFLIP || matchType == TileData::VHFLIP;
@@ -959,7 +960,7 @@ void process() {
std::vector<ProtoPalette> protoPalettes; std::vector<ProtoPalette> protoPalettes;
DefaultInitVec<AttrmapEntry> attrmap{}; DefaultInitVec<AttrmapEntry> attrmap{};
for (auto tile : png.visitAsTiles(options.columnMajor)) { for (auto tile : png.visitAsTiles()) {
ProtoPalette tileColors; ProtoPalette tileColors;
AttrmapEntry &attrs = attrmap.emplace_back(); AttrmapEntry &attrs = attrmap.emplace_back();