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

Add setBlock overload, handle collision values of 2 or 3

Browse source
This commit is contained in:
GriffinR 2022-08-03 15:14:25 -04:00
parent 0fa71dc4c8
commit 4feb913fe8
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mainwindow.h
View file

@ -46,7 +46,8 @@ public:
Q_INVOKABLE QJSValue getBlock(int x, int y); Q_INVOKABLE QJSValue getBlock(int x, int y);
void tryRedrawMapArea(bool forceRedraw); void tryRedrawMapArea(bool forceRedraw);
void tryCommitMapChanges(bool commitChanges); void tryCommitMapChanges(bool commitChanges);
Q_INVOKABLE void setBlock(int x, int y, int tile, int collision, int elevation, bool forceRedraw = true, bool commitChanges = true); Q_INVOKABLE void setBlock(int x, int y, int metatileId, int collision, int elevation, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE void setBlock(int x, int y, int rawValue, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE void setBlocksFromSelection(int x, int y, bool forceRedraw = true, bool commitChanges = true); Q_INVOKABLE void setBlocksFromSelection(int x, int y, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE int getMetatileId(int x, int y); Q_INVOKABLE int getMetatileId(int x, int y);
Q_INVOKABLE void setMetatileId(int x, int y, int metatileId, bool forceRedraw = true, bool commitChanges = true); Q_INVOKABLE void setMetatileId(int x, int y, int metatileId, bool forceRedraw = true, bool commitChanges = true);

2
src/editor.cpp
View file

@ -1075,7 +1075,7 @@ QString Editor::getMovementPermissionText(uint16_t collision, uint16_t elevation
} else if (collision == 0) { } else if (collision == 0) {
message = QString("Collision: Passable, Elevation: %1").arg(elevation); message = QString("Collision: Passable, Elevation: %1").arg(elevation);
} else { } else {
message = QString("Collision: Impassable, Elevation: %1").arg(elevation); message = QString("Collision: Impassable (%1), Elevation: %2").arg(collision).arg(elevation);
} }
return message; return message;
} }

12
src/mainwindow_scriptapi.cpp
View file

@ -50,10 +50,18 @@ void MainWindow::tryCommitMapChanges(bool commitChanges) {
} }
} }
void MainWindow::setBlock(int x, int y, int tile, int collision, int elevation, bool forceRedraw, bool commitChanges) { void MainWindow::setBlock(int x, int y, int metatileId, int collision, int elevation, bool forceRedraw, bool commitChanges) {
if (!this->editor || !this->editor->map) if (!this->editor || !this->editor->map)
return; return;
this->editor->map->setBlock(x, y, Block(tile, collision, elevation)); this->editor->map->setBlock(x, y, Block(metatileId, collision, elevation));
this->tryCommitMapChanges(commitChanges);
this->tryRedrawMapArea(forceRedraw);
}
void MainWindow::setBlock(int x, int y, int rawValue, bool forceRedraw, bool commitChanges) {
if (!this->editor || !this->editor->map)
return;
this->editor->map->setBlock(x, y, Block(static_cast<uint16_t>(rawValue)));
this->tryCommitMapChanges(commitChanges); this->tryCommitMapChanges(commitChanges);
this->tryRedrawMapArea(forceRedraw); this->tryRedrawMapArea(forceRedraw);
} }

2
src/ui/imageproviders.cpp
View file

@ -8,7 +8,7 @@ QImage getCollisionMetatileImage(Block block) {
} }
QImage getCollisionMetatileImage(int collision, int elevation) { QImage getCollisionMetatileImage(int collision, int elevation) {
int x = collision * 16; int x = (collision != 0) * 16;
int y = elevation * 16; int y = elevation * 16;
QPixmap collisionImage = QPixmap(":/images/collisions.png").copy(x, y, 16, 16); QPixmap collisionImage = QPixmap(":/images/collisions.png").copy(x, y, 16, 16);
return collisionImage.toImage(); return collisionImage.toImage();

2
src/ui/movementpermissionsselector.cpp
View file

@ -16,7 +16,7 @@ uint16_t MovementPermissionsSelector::getSelectedElevation() {
} }
void MovementPermissionsSelector::select(uint16_t collision, uint16_t elevation) { void MovementPermissionsSelector::select(uint16_t collision, uint16_t elevation) {
SelectablePixmapItem::select(collision, elevation, 0, 0); SelectablePixmapItem::select(collision != 0, elevation, 0, 0);
} }
void MovementPermissionsSelector::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { void MovementPermissionsSelector::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {