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

do not add no-ops to edit history for map painting

Browse source
This commit is contained in:
garakmon 2020-08-04 00:32:50 -04:00 committed by garak
parent d671470cb0
commit 5e4cc9a182
3 changed files with 77 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ui/bordermetatilespixmapitem.cpp
View file

@ -23,7 +23,12 @@ void BorderMetatilesPixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
} }
Blockdata *newBorder = map->layout->border->copy(); Blockdata *newBorder = map->layout->border->copy();
map->editHistory.push(new PaintBorder(map, oldBorder, newBorder, 0)); if (newBorder->equals(oldBorder)) {
delete newBorder;
delete oldBorder;
} else {
map->editHistory.push(new PaintBorder(map, oldBorder, newBorder, 0));
}
emit borderMetatilesChanged(); emit borderMetatilesChanged();
} }

21
src/ui/collisionpixmapitem.cpp
View file

@ -49,7 +49,12 @@ void CollisionPixmapItem::paint(QGraphicsSceneMouseEvent *event) {
} }
Blockdata *newCollision = map->layout->blockdata->copy(); Blockdata *newCollision = map->layout->blockdata->copy();
map->editHistory.push(new PaintCollision(map, oldCollision, newCollision, actionId_)); if (newCollision->equals(oldCollision)) {
delete newCollision;
delete oldCollision;
} else {
map->editHistory.push(new PaintCollision(map, oldCollision, newCollision, actionId_));
}
} }
} }
@ -67,7 +72,12 @@ void CollisionPixmapItem::floodFill(QGraphicsSceneMouseEvent *event) {
map->floodFillCollisionElevation(x, y, collision, elevation); map->floodFillCollisionElevation(x, y, collision, elevation);
Blockdata *newCollision = map->layout->blockdata->copy(); Blockdata *newCollision = map->layout->blockdata->copy();
map->editHistory.push(new BucketFillCollision(map, oldCollision, newCollision)); if (newCollision->equals(oldCollision)) {
delete newCollision;
delete oldCollision;
} else {
map->editHistory.push(new BucketFillCollision(map, oldCollision, newCollision));
}
} }
} }
@ -84,7 +94,12 @@ void CollisionPixmapItem::magicFill(QGraphicsSceneMouseEvent *event) {
map->magicFillCollisionElevation(x, y, collision, elevation); map->magicFillCollisionElevation(x, y, collision, elevation);
Blockdata *newCollision = map->layout->blockdata->copy(); Blockdata *newCollision = map->layout->blockdata->copy();
map->editHistory.push(new MagicFillCollision(map, oldCollision, newCollision)); if (newCollision->equals(oldCollision)) {
delete newCollision;
delete oldCollision;
} else {
map->editHistory.push(new MagicFillCollision(map, oldCollision, newCollision));
}
} }
} }

68
src/ui/mappixmapitem.cpp
View file

@ -71,7 +71,13 @@ void MapPixmapItem::shift(int xDelta, int yDelta, bool fromScriptCall) {
} }
if (!fromScriptCall) { if (!fromScriptCall) {
map->editHistory.push(new ShiftMetatiles(map, backupBlockdata, map->layout->blockdata->copy(), actionId_)); Blockdata *newMetatiles = map->layout->blockdata->copy();
if (newMetatiles->equals(backupBlockdata)) {
delete newMetatiles;
delete backupBlockdata;
} else {
map->editHistory.push(new ShiftMetatiles(map, backupBlockdata, newMetatiles, actionId_));
}
} else { } else {
delete backupBlockdata; delete backupBlockdata;
} }
@ -95,7 +101,7 @@ void MapPixmapItem::paintNormal(int x, int y, bool fromScriptCall) {
y = initialY + (yDiff / selectionDimensions.y()) * selectionDimensions.y(); y = initialY + (yDiff / selectionDimensions.y()) * selectionDimensions.y();
// for edit history // for edit history
Blockdata *oldMetatiles; Blockdata *oldMetatiles = nullptr;
if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy(); if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy();
for (int i = 0; i < selectionDimensions.x() && i + x < map->getWidth(); i++) for (int i = 0; i < selectionDimensions.x() && i + x < map->getWidth(); i++)
@ -115,7 +121,13 @@ void MapPixmapItem::paintNormal(int x, int y, bool fromScriptCall) {
} }
if (!fromScriptCall) { if (!fromScriptCall) {
map->editHistory.push(new PaintMetatile(map, oldMetatiles, map->layout->blockdata->copy(), actionId_)); Blockdata *newMetatiles = map->layout->blockdata->copy();
if (newMetatiles->equals(oldMetatiles)) {
delete newMetatiles;
delete oldMetatiles;
} else {
map->editHistory.push(new PaintMetatile(map, oldMetatiles, newMetatiles, actionId_));
}
} }
} }
@ -163,7 +175,8 @@ void MapPixmapItem::paintSmartPath(int x, int y, bool fromScriptCall) {
} }
// for edit history // for edit history
Blockdata *oldMetatiles = map->layout->blockdata->copy(); Blockdata *oldMetatiles = nullptr;
if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy();
// Fill the region with the open tile. // Fill the region with the open tile.
for (int i = 0; i <= 1; i++) for (int i = 0; i <= 1; i++)
@ -227,9 +240,15 @@ void MapPixmapItem::paintSmartPath(int x, int y, bool fromScriptCall) {
map->setBlock(actualX, actualY, *block, !fromScriptCall); map->setBlock(actualX, actualY, *block, !fromScriptCall);
} }
Blockdata *newMetatiles = map->layout->blockdata->copy(); if (!fromScriptCall) {
PaintMetatile *paintEvent = new PaintMetatile(map, oldMetatiles, newMetatiles, actionId_); Blockdata *newMetatiles = map->layout->blockdata->copy();
map->editHistory.push(paintEvent); if (newMetatiles->equals(oldMetatiles)) {
delete newMetatiles;
delete oldMetatiles;
} else {
map->editHistory.push(new PaintMetatile(map, oldMetatiles, newMetatiles, actionId_));
}
}
} }
void MapPixmapItem::updateMetatileSelection(QGraphicsSceneMouseEvent *event) { void MapPixmapItem::updateMetatileSelection(QGraphicsSceneMouseEvent *event) {
@ -342,7 +361,7 @@ void MapPixmapItem::magicFill(
return; return;
} }
Blockdata *oldMetatiles; Blockdata *oldMetatiles = nullptr;
if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy(); if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy();
bool setCollisions = selectedCollisions && selectedCollisions->length() == selectedMetatiles->length(); bool setCollisions = selectedCollisions && selectedCollisions->length() == selectedMetatiles->length();
@ -369,7 +388,13 @@ void MapPixmapItem::magicFill(
} }
if (!fromScriptCall) { if (!fromScriptCall) {
map->editHistory.push(new MagicFillMetatile(map, oldMetatiles, map->layout->blockdata->copy(), actionId_)); Blockdata *newMetatiles = map->layout->blockdata->copy();
if (newMetatiles->equals(oldMetatiles)) {
delete newMetatiles;
delete oldMetatiles;
} else {
map->editHistory.push(new MagicFillMetatile(map, oldMetatiles, newMetatiles, actionId_));
}
} }
} }
} }
@ -401,7 +426,7 @@ void MapPixmapItem::floodFill(
for (int i = 0; i < numMetatiles; i++) for (int i = 0; i < numMetatiles; i++)
visited[i] = false; visited[i] = false;
Blockdata *oldMetatiles; Blockdata *oldMetatiles = nullptr;
if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy(); if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy();
QList<QPoint> todo; QList<QPoint> todo;
@ -453,7 +478,13 @@ void MapPixmapItem::floodFill(
} }
if (!fromScriptCall) { if (!fromScriptCall) {
map->editHistory.push(new BucketFillMetatile(map, oldMetatiles, map->layout->blockdata->copy(), actionId_)); Blockdata *newMetatiles = map->layout->blockdata->copy();
if (newMetatiles->equals(oldMetatiles)) {
delete newMetatiles;
delete oldMetatiles;
} else {
map->editHistory.push(new BucketFillMetatile(map, oldMetatiles, newMetatiles, actionId_));
}
} }
delete[] visited; delete[] visited;
@ -478,7 +509,8 @@ void MapPixmapItem::floodFillSmartPath(int initialX, int initialY, bool fromScri
setCollisions = true; setCollisions = true;
} }
Blockdata *oldMetatiles = map->layout->blockdata->copy(); Blockdata *oldMetatiles = nullptr;
if (!fromScriptCall) oldMetatiles = map->layout->blockdata->copy();
// Flood fill the region with the open tile. // Flood fill the region with the open tile.
QList<QPoint> todo; QList<QPoint> todo;
@ -579,9 +611,15 @@ void MapPixmapItem::floodFillSmartPath(int initialX, int initialY, bool fromScri
} }
} }
Blockdata *newMetatiles = map->layout->blockdata->copy(); if (!fromScriptCall) {
BucketFillMetatile *paintEvent = new BucketFillMetatile(map, oldMetatiles, newMetatiles, actionId_); Blockdata *newMetatiles = map->layout->blockdata->copy();
map->editHistory.push(paintEvent); if (newMetatiles->equals(oldMetatiles)) {
delete newMetatiles;
delete oldMetatiles;
} else {
map->editHistory.push(new BucketFillMetatile(map, oldMetatiles, newMetatiles, actionId_));
}
}
delete[] visited; delete[] visited;
} }