atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Clean up loadTilesetMetatiles

Browse source
This commit is contained in:
GriffinR 2022-08-20 12:14:11 -04:00
parent 0fa71dc4c8
commit 774c60cc88
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/project.cpp
View file

@ -1583,14 +1583,14 @@ void Project::loadTilesetMetatiles(Tileset* tileset) {
QFile metatiles_file(tileset->metatiles_path); QFile metatiles_file(tileset->metatiles_path);
if (metatiles_file.open(QIODevice::ReadOnly)) { if (metatiles_file.open(QIODevice::ReadOnly)) {
QByteArray data = metatiles_file.readAll(); QByteArray data = metatiles_file.readAll();
int metatile_data_length = projectConfig.getTripleLayerMetatilesEnabled() ? 24 : 16; int tilesPerMetatile = projectConfig.getTripleLayerMetatilesEnabled() ? 12 : 8;
int num_metatiles = data.length() / metatile_data_length; int bytesPerMetatile = 2 * tilesPerMetatile;
int num_layers = projectConfig.getTripleLayerMetatilesEnabled() ? 3 : 2; int num_metatiles = data.length() / bytesPerMetatile;
QList<Metatile*> metatiles; QList<Metatile*> metatiles;
for (int i = 0; i < num_metatiles; i++) { for (int i = 0; i < num_metatiles; i++) {
Metatile *metatile = new Metatile; Metatile *metatile = new Metatile;
int index = i * (2 * 4 * num_layers); int index = i * bytesPerMetatile;
for (int j = 0; j < 4 * num_layers; j++) { for (int j = 0; j < tilesPerMetatile; j++) {
uint16_t tileRaw = static_cast<unsigned char>(data[index++]); uint16_t tileRaw = static_cast<unsigned char>(data[index++]);
tileRaw |= static_cast<unsigned char>(data[index++]) << 8; tileRaw |= static_cast<unsigned char>(data[index++]) << 8;
metatile->tiles.append(Tile(tileRaw)); metatile->tiles.append(Tile(tileRaw));