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

Allow 6-wide selections in tileset editor when triple layer is enabled

Browse source
This commit is contained in:
Marcus Huderle 2020-07-14 17:54:56 -05:00
parent 00ad1ec22a
commit 45cfb3aabd
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ui/metatilelayersitem.h
View file

@ -9,7 +9,7 @@
class MetatileLayersItem: public SelectablePixmapItem { class MetatileLayersItem: public SelectablePixmapItem {
Q_OBJECT Q_OBJECT
public: public:
MetatileLayersItem(Metatile *metatile, Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 4, 2) { MetatileLayersItem(Metatile *metatile, Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 6, 2) {
this->metatile = metatile; this->metatile = metatile;
this->primaryTileset = primaryTileset; this->primaryTileset = primaryTileset;
this->secondaryTileset = secondaryTileset; this->secondaryTileset = secondaryTileset;

3
include/ui/tileseteditortileselector.h
View file

@ -7,7 +7,8 @@
class TilesetEditorTileSelector: public SelectablePixmapItem { class TilesetEditorTileSelector: public SelectablePixmapItem {
Q_OBJECT Q_OBJECT
public: public:
TilesetEditorTileSelector(Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 4, 2) { TilesetEditorTileSelector(Tileset *primaryTileset, Tileset *secondaryTileset, bool isTripleLayer)
: SelectablePixmapItem(16, 16, isTripleLayer ? 6 : 4, 2) {
this->primaryTileset = primaryTileset; this->primaryTileset = primaryTileset;
this->secondaryTileset = secondaryTileset; this->secondaryTileset = secondaryTileset;
this->numTilesWide = 16; this->numTilesWide = 16;

2
src/ui/tileseteditor.cpp
View file

@ -172,7 +172,7 @@ void TilesetEditor::initMetatileSelector(Map *map)
void TilesetEditor::initTileSelector() void TilesetEditor::initTileSelector()
{ {
this->tileSelector = new TilesetEditorTileSelector(this->primaryTileset, this->secondaryTileset); this->tileSelector = new TilesetEditorTileSelector(this->primaryTileset, this->secondaryTileset, projectConfig.getTripleLayerMetatilesEnabled());
connect(this->tileSelector, SIGNAL(hoveredTileChanged(uint16_t)), connect(this->tileSelector, SIGNAL(hoveredTileChanged(uint16_t)),
this, SLOT(onHoveredTileChanged(uint16_t))); this, SLOT(onHoveredTileChanged(uint16_t)));
connect(this->tileSelector, SIGNAL(hoveredTileCleared()), connect(this->tileSelector, SIGNAL(hoveredTileCleared()),