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

Show metatile label names in map editor

Browse source
This commit is contained in:
GriffinR 2020-06-02 13:52:49 -04:00 committed by huderlem
parent edfa3cb779
commit 6cb1c532a4
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/editor.h
View file

@ -168,6 +168,7 @@ private:
Event* createNewHiddenItemEvent(); Event* createNewHiddenItemEvent();
Event* createNewSecretBaseEvent(); Event* createNewSecretBaseEvent();
QString getMovementPermissionText(uint16_t collision, uint16_t elevation); QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
QString getMetatileDisplayMessage(uint16_t metatileId);
private slots: private slots:
void onMapStartPaint(QGraphicsSceneMouseEvent *event, MapPixmapItem *item); void onMapStartPaint(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);

14
src/editor.cpp
View file

@ -867,7 +867,7 @@ void Editor::onHoveredMovementPermissionCleared() {
this->ui->statusBar->clearMessage(); this->ui->statusBar->clearMessage();
} }
void Editor::onHoveredMetatileSelectionChanged(uint16_t metatileId) { QString Editor::getMetatileDisplayMessage(uint16_t metatileId) {
Metatile *metatile = Tileset::getMetatile(metatileId, map->layout->tileset_primary, map->layout->tileset_secondary); Metatile *metatile = Tileset::getMetatile(metatileId, map->layout->tileset_primary, map->layout->tileset_secondary);
QString message; QString message;
QString hexString = QString("%1").arg(metatileId, 3, 16, QChar('0')).toUpper(); QString hexString = QString("%1").arg(metatileId, 3, 16, QChar('0')).toUpper();
@ -876,7 +876,11 @@ void Editor::onHoveredMetatileSelectionChanged(uint16_t metatileId) {
} else { } else {
message = QString("Metatile: 0x%1").arg(hexString); message = QString("Metatile: 0x%1").arg(hexString);
} }
this->ui->statusBar->showMessage(message); return message;
}
void Editor::onHoveredMetatileSelectionChanged(uint16_t metatileId) {
this->ui->statusBar->showMessage(getMetatileDisplayMessage(metatileId));
} }
void Editor::onHoveredMetatileSelectionCleared() { void Editor::onHoveredMetatileSelectionCleared() {
@ -895,11 +899,11 @@ void Editor::onHoveredMapMetatileChanged(int x, int y) {
if (map_item->paintingMode == MapPixmapItem::PaintMode::Metatiles if (map_item->paintingMode == MapPixmapItem::PaintMode::Metatiles
&& x >= 0 && x < map->getWidth() && y >= 0 && y < map->getHeight()) { && x >= 0 && x < map->getWidth() && y >= 0 && y < map->getHeight()) {
int blockIndex = y * map->getWidth() + x; int blockIndex = y * map->getWidth() + x;
int tile = map->layout->blockdata->blocks->at(blockIndex).tile; int metatileId = map->layout->blockdata->blocks->at(blockIndex).tile;
this->ui->statusBar->showMessage(QString("X: %1, Y: %2, Metatile: 0x%3, Scale = %4x") this->ui->statusBar->showMessage(QString("X: %1, Y: %2, %3, Scale = %4x")
.arg(x) .arg(x)
.arg(y) .arg(y)
.arg(QString("%1").arg(tile, 3, 16, QChar('0')).toUpper()) .arg(getMetatileDisplayMessage(metatileId))
.arg(QString::number(pow(scale_base, scale_exp), 'g', 2))); .arg(QString::number(pow(scale_base, scale_exp), 'g', 2)));
} }
} }