Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 04:15:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ability to import new tiles

Browse Source
This commit is contained in:
Marcus Huderle
2018-10-02 19:01:24 -05:00
parent a77b76988b
commit 3ca284d5f3
9 changed files with 159 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/tileset.h
View File

@@ -21,6 +21,8 @@ public:
QString callback_label;
QString metatile_attrs_label;
QString metatile_attrs_path;
QString tilesImagePath;
QImage tilesImage;
QList<QImage> *tiles = nullptr;
QList<Metatile*> *metatiles = nullptr;

3
include/project.h
View File

@@ -74,6 +74,8 @@ public:
void readMapsWithConnections();
void loadMapTilesets(Map*);
void loadTilesetAssets(Tileset*);
void loadTilesetTiles(Tileset*, QImage);
void loadTilesetMetatiles(Tileset*);
void saveBlockdata(Map*);
void saveMapBorder(Map*);
@@ -133,6 +135,7 @@ private:
void saveMapConnections(Map*);
void saveTilesetMetatileAttributes(Tileset*);
void saveTilesetMetatiles(Tileset*);
void saveTilesetTilesImage(Tileset*);
void updateMapsWithConnections(Map*);
void saveMapsWithConnections();
void saveMapLayoutsTable();

6
include/ui/tileseteditor.h
View File

@@ -41,12 +41,18 @@ private slots:
void on_actionSave_Tileset_triggered();
void on_actionImport_Primary_Tiles_triggered();
void on_actionImport_Secondary_Tiles_triggered();
private:
void initMetatileSelector();
void initTileSelector();
void initSelectedTileItem();
void initMetatileLayersItem();
void drawSelectedTile();
void importTilesetTiles(Tileset*, bool);
void refresh();
Ui::TilesetEditor *ui;
TilesetEditorMetatileSelector *metatileSelector = nullptr;
TilesetEditorTileSelector *tileSelector = nullptr;