Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-20 07:36:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable multi-tile selections in tileset editor

Browse Source
This commit is contained in:
Marcus Huderle
2018-10-02 19:01:27 -05:00
parent 3ca284d5f3
commit da13b8ea5e
7 changed files with 96 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/metatilelayersitem.h
View File

@@ -21,7 +21,7 @@ private:
Tileset *primaryTileset;
Tileset *secondaryTileset;
signals:
void tileChanged(int);
void tileChanged(int, int);
protected:
void mousePressEvent(QGraphicsSceneMouseEvent*);
};

6
include/ui/tileseteditor.h
View File

@@ -26,8 +26,8 @@ private slots:
void onSelectedMetatileChanged(uint16_t);
void onHoveredTileChanged(uint16_t);
void onHoveredTileCleared();
void onSelectedTileChanged(uint16_t);
void onMetatileLayerTileChanged(int);
void onSelectedTilesChanged();
void onMetatileLayerTileChanged(int, int);
void on_spinBox_paletteSelector_valueChanged(int arg1);
@@ -50,7 +50,7 @@ private:
void initTileSelector();
void initSelectedTileItem();
void initMetatileLayersItem();
void drawSelectedTile();
void drawSelectedTiles();
void importTilesetTiles(Tileset*, bool);
void refresh();
Ui::TilesetEditor *ui;

13
include/ui/tileseteditortileselector.h
View File

@@ -7,7 +7,7 @@
class TilesetEditorTileSelector: public SelectablePixmapItem {
Q_OBJECT
public:
TilesetEditorTileSelector(Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 1, 1) {
TilesetEditorTileSelector(Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 2, 2) {
this->primaryTileset = primaryTileset;
this->secondaryTileset = secondaryTileset;
this->numTilesWide = 16;
@@ -18,7 +18,8 @@ public:
void select(uint16_t metatileId);
void setTilesets(Tileset*, Tileset*);
void setPaletteId(int);
uint16_t getSelectedTile();
void setTileFlips(bool, bool);
QList<uint16_t> getSelectedTiles();
protected:
void mousePressEvent(QGraphicsSceneMouseEvent*);
@@ -30,10 +31,12 @@ protected:
private:
Tileset *primaryTileset;
Tileset *secondaryTileset;
uint16_t selectedTile;
QList<uint16_t> selectedTiles;
int numTilesWide;
int paletteId;
void updateSelectedTile();
bool xFlip;
bool yFlip;
void updateSelectedTiles();
uint16_t getTileId(int x, int y);
QPoint getTileCoords(uint16_t);
QList<QRgb> getCurPaletteTable();
@@ -41,7 +44,7 @@ private:
signals:
void hoveredTileChanged(uint16_t);
void hoveredTileCleared();
void selectedTileChanged(uint16_t);
void selectedTilesChanged();
};
#endif // TILESETEDITORTILESELECTOR_H