Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added ability to reorder terrains (#1802)
Closes #1603
- Loading branch information
Showing
12 changed files
with
286 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
* moveterrain.cpp | ||
* Copyright 2012, Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | ||
* Copyright 2017, Justin Jacobs <jajdorkster@gmail.com> | ||
* | ||
* This file is part of Tiled. | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License as published by the Free | ||
* Software Foundation; either version 2 of the License, or (at your option) | ||
* any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
* more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#include "moveterrain.h" | ||
|
||
#include "terrain.h" | ||
#include "tileset.h" | ||
#include "tilesetdocument.h" | ||
#include "tilesetterrainmodel.h" | ||
|
||
#include <QCoreApplication> | ||
|
||
using namespace Tiled; | ||
using namespace Tiled::Internal; | ||
|
||
MoveTerrain::MoveTerrain(TilesetDocument *tilesetDocument, int index) | ||
: mTilesetDocument(tilesetDocument) | ||
, mTileset(tilesetDocument->tileset().data()) | ||
, mIndex(index) | ||
{ | ||
} | ||
|
||
MoveTerrain::~MoveTerrain() | ||
{ | ||
} | ||
|
||
void MoveTerrain::moveTerrainUp() | ||
{ | ||
mTilesetDocument->terrainModel()->swapTerrains(mIndex, mIndex - 1); | ||
mIndex -= 1; | ||
} | ||
|
||
void MoveTerrain::moveTerrainDown() | ||
{ | ||
mTilesetDocument->terrainModel()->swapTerrains(mIndex, mIndex + 1); | ||
mIndex += 1; | ||
} | ||
|
||
|
||
MoveTerrainUp::MoveTerrainUp(TilesetDocument *tilesetDocument, Terrain *terrain) | ||
: MoveTerrain(tilesetDocument, terrain->id()) | ||
{ | ||
setText(QCoreApplication::translate("Undo Commands", "Move Terrain Up")); | ||
} | ||
|
||
MoveTerrainDown::MoveTerrainDown(TilesetDocument *tilesetDocument, Terrain *terrain) | ||
: MoveTerrain(tilesetDocument, terrain->id()) | ||
{ | ||
setText(QCoreApplication::translate("Undo Commands", "Move Terrain Down")); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/* | ||
* moveterrain.h | ||
* Copyright 2012, Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | ||
* Copyright 2017, Justin Jacobs <jajdorkster@gmail.com> | ||
* | ||
* This file is part of Tiled. | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License as published by the Free | ||
* Software Foundation; either version 2 of the License, or (at your option) | ||
* any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
* more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include <QUndoCommand> | ||
|
||
namespace Tiled { | ||
|
||
class Terrain; | ||
class Tileset; | ||
|
||
namespace Internal { | ||
|
||
class TilesetDocument; | ||
|
||
/** | ||
* Abstract base class for MoveTerrainUp and MoveTerrainDown. | ||
*/ | ||
class MoveTerrain : public QUndoCommand | ||
{ | ||
public: | ||
MoveTerrain(TilesetDocument *tilesetDocument, | ||
int index); | ||
~MoveTerrain(); | ||
|
||
protected: | ||
void moveTerrainUp(); | ||
void moveTerrainDown(); | ||
|
||
private: | ||
TilesetDocument *mTilesetDocument; | ||
Tileset *mTileset; | ||
int mIndex; | ||
}; | ||
|
||
|
||
/** | ||
* Moves a terrain up in the list of terrains. | ||
*/ | ||
class MoveTerrainUp : public MoveTerrain | ||
{ | ||
public: | ||
MoveTerrainUp(TilesetDocument *tilesetDocument, Terrain *terrain); | ||
|
||
void undo() override { moveTerrainDown(); } | ||
void redo() override { moveTerrainUp(); } | ||
}; | ||
|
||
/** | ||
* Moves a terrain down in the list of terrains. | ||
*/ | ||
class MoveTerrainDown : public MoveTerrain | ||
{ | ||
public: | ||
MoveTerrainDown(TilesetDocument *tilesetDocument, Terrain *terrain); | ||
|
||
void undo() override { moveTerrainUp(); } | ||
void redo() override { moveTerrainDown(); } | ||
}; | ||
|
||
} // namespace Internal | ||
} // namespace Tiled |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.