Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-10 01:45:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #448 from GriffinRichards/handle-collision

Browse Source 
Various minor API improvements
This commit is contained in:
Marcus Huderle
2022-09-03 12:49:07 -05:00
committed by GitHub
parent a5136849b8 e9ac799ed2
commit fe02c7ea70
13 changed files with 94 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/core/tile.h
View File

@@ -8,15 +8,14 @@ class Tile
{
public:
Tile();
Tile(int tileId, bool xflip, bool yflip, int palette);
Tile(uint16_t tileId, uint16_t xflip, uint16_t yflip, uint16_t palette);
Tile(uint16_t raw);
public:
int tileId;
bool xflip;
bool yflip;
int palette;
uint16_t tileId:10;
uint16_t xflip:1;
uint16_t yflip:1;
uint16_t palette:4;
uint16_t rawValue() const;
static int getIndexInTileset(int);

5
include/mainwindow.h
View File

@@ -46,7 +46,8 @@ public:
Q_INVOKABLE QJSValue getBlock(int x, int y);
void tryRedrawMapArea(bool forceRedraw);
void tryCommitMapChanges(bool commitChanges);
Q_INVOKABLE void setBlock(int x, int y, int tile, int collision, int elevation, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE void setBlock(int x, int y, int metatileId, int collision, int elevation, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE void setBlock(int x, int y, int rawValue, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE void setBlocksFromSelection(int x, int y, bool forceRedraw = true, bool commitChanges = true);
Q_INVOKABLE int getMetatileId(int x, int y);
Q_INVOKABLE void setMetatileId(int x, int y, int metatileId, bool forceRedraw = true, bool commitChanges = true);
@@ -182,6 +183,8 @@ public:
Q_INVOKABLE void setMetatileTerrainType(int metatileId, int terrainType);
Q_INVOKABLE int getMetatileBehavior(int metatileId);
Q_INVOKABLE void setMetatileBehavior(int metatileId, int behavior);
Q_INVOKABLE int getMetatileAttributes(int metatileId);
Q_INVOKABLE void setMetatileAttributes(int metatileId, int attributes);
Q_INVOKABLE QJSValue getMetatileTile(int metatileId, int tileIndex);
Q_INVOKABLE void setMetatileTile(int metatileId, int tileIndex, int tileId, bool xflip, bool yflip, int palette, bool forceRedraw = true);
Q_INVOKABLE void setMetatileTile(int metatileId, int tileIndex, QJSValue tileObj, bool forceRedraw = true);