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

Use custom attribute masks in API and Tileset Editor

Browse Source
This commit is contained in:
GriffinR
2022-10-26 02:42:55 -04:00
parent 1641ac00b0
commit 1283f5c19d
5 changed files with 113 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/core/metatile.h
View File

@@ -41,9 +41,9 @@ public:
public:
QList<Tile> tiles;
uint32_t behavior;
uint32_t layerType;
uint32_t encounterType;
uint32_t terrainType;
uint32_t encounterType;
uint32_t layerType;
uint32_t unusedAttributes;
QString label;
@@ -61,22 +61,28 @@ public:
static const QHash<Metatile::Attr, Metatile::AttrLayout> defaultLayoutFRLG;
static const QHash<Metatile::Attr, Metatile::AttrLayout> defaultLayoutRSE;
static QHash<Metatile::Attr, Metatile::AttrLayout> customLayout;
uint32_t getAttributes();
void setAttributes(uint32_t data);
void convertAttributes(uint32_t data, BaseGameVersion version);
void setBehavior(uint32_t);
void setTerrainType(uint32_t);
void setEncounterType(uint32_t);
void setLayerType(uint32_t);
static int getIndexInTileset(int);
static QPoint coordFromPixmapCoord(const QPointF &pixelCoord);
static int getDefaultAttributesSize(BaseGameVersion version);
static void setCustomLayout();
private:
static QHash<Metatile::Attr, Metatile::AttrLayout> customLayout;
static uint32_t unusedAttrMask;
void setAttributes(uint32_t, const QHash<Metatile::Attr, Metatile::AttrLayout>*);
static void setCustomAttributeLayout(Metatile::AttrLayout *, uint32_t, uint32_t, QString);
static void setCustomAttributeLayout(Metatile::AttrLayout *, uint32_t, uint32_t);
static bool isMaskTooSmall(Metatile::AttrLayout * layout, int n);
static bool doMasksOverlap(QList<uint32_t>);
};

4
include/ui/tileseteditor.h
View File

@@ -111,9 +111,7 @@ private slots:
private:
void initUi();
void setMetatileBehaviors();
void setMetatileLayersUi();
void setVersionSpecificUi();
void setAttributesUi();
void setMetatileLabelValidator();
void initMetatileSelector();
void initTileSelector();