diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-11-01 16:46:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-01 13:46:27 -0700 |
| commit | 21cb60624a6cb0c518f85af7688bf618de252650 (patch) | |
| tree | 942030fd3bf1ee4f28a0542f9fdf9b909c5d6fa1 /include/JSystem/J3DGraphLoader | |
| parent | 09423b6fa00029d0325cbade59c78ae42f1014de (diff) | |
J3DMatBlock, J3DMaterialFactory work (#2233)
Diffstat (limited to 'include/JSystem/J3DGraphLoader')
| -rw-r--r-- | include/JSystem/J3DGraphLoader/J3DMaterialFactory.h | 4 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index 251d900aae..99e5edc7d5 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -143,8 +143,8 @@ public: u16 getMaterialID(int idx) const { return mpMaterialID[idx]; } u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; } - static u32 getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } - static u32 getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } + static int getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } + static int getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } static u32 getMdlDataFlag_ColorFlag(u32 flags) { return flags & 0xc0000000; } static u32 getMdlDataFlag_PEFlag(u32 flags) { return flags & 0x30000000; } diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index d6ee20b2d5..a2dc9c8f42 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -78,6 +78,12 @@ public: /* 80334074 */ J3DNBTScale newNBTScale(int) const; u16 getMaterialID(u16 idx) { return mpMaterialID[idx]; } + u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; } + + static int getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } + static int getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } + static u32 getMdlDataFlag_ColorFlag(u32 flags) { return flags & 0xc0000000; } + static u32 getMdlDataFlag_PEFlag(u32 flags) { return flags & 0x30000000; } /* 0x00 */ u16 mMaterialNum; /* 0x04 */ J3DMaterialInitData_v21* mpMaterialInitData; |