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

fix metatile selector filter draw

Browse source
This commit is contained in:
garak 2021-07-23 12:11:35 -04:00
parent b1c04dd0b2
commit 2ee5676925
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/ui/tileseteditormetatileselector.cpp
View file

@ -190,9 +190,20 @@ void TilesetEditorMetatileSelector::drawUnused() {
QPainter unusedPainter(&metatilesPixmap); QPainter unusedPainter(&metatilesPixmap);
unusedPainter.setOpacity(0.5); unusedPainter.setOpacity(0.5);
for (int tile = 0; tile < this->usedMetatiles.size(); tile++) { int primaryLength = this->primaryTileset->metatiles.length();
int length_ = primaryLength + this->secondaryTileset->metatiles.length();
int height_ = length_ / this->numMetatilesWide;
if (length_ % this->numMetatilesWide != 0) {
height_++;
}
for (int i = 0; i < length_; i++) {
int tile = i;
if (i >= primaryLength) {
tile += Project::getNumMetatilesPrimary() - primaryLength;
}
if (!usedMetatiles[tile]) { if (!usedMetatiles[tile]) {
unusedPainter.drawPixmap((tile % 8) * 32, (tile / 8) * 32, redX); unusedPainter.drawPixmap((i % 8) * 32, (i / 8) * 32, redX);
} }
} }
@ -222,11 +233,22 @@ void TilesetEditorMetatileSelector::drawCounts() {
whitePen.setWidth(1); whitePen.setWidth(1);
countPainter.setPen(whitePen); countPainter.setPen(whitePen);
for (int tile = 0; tile < this->usedMetatiles.size(); tile++) { int primaryLength = this->primaryTileset->metatiles.length();
int length_ = primaryLength + this->secondaryTileset->metatiles.length();
int height_ = length_ / this->numMetatilesWide;
if (length_ % this->numMetatilesWide != 0) {
height_++;
}
for (int i = 0; i < length_; i++) {
int tile = i;
if (i >= primaryLength) {
tile += Project::getNumMetatilesPrimary() - primaryLength;
}
int count = usedMetatiles[tile]; int count = usedMetatiles[tile];
QString countText = QString::number(count); QString countText = QString::number(count);
if (count > 1000) countText = ">1k"; if (count > 1000) countText = ">1k";
countPainter.drawText((tile % 8) * 32 + 1, (tile / 8) * 32 + 32 - 1, countText); countPainter.drawText((i % 8) * 32 + 1, (i / 8) * 32 + 32 - 1, countText);
} }
countPainter.end(); countPainter.end();