diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-04-09 01:17:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-08 22:17:20 -0700 |
| commit | 6672817e41064e04951ec28d51070b66fc8377ac (patch) | |
| tree | eea728f5e693d69e48800875a281350d59841789 /include/JSystem/J3DGraphLoader | |
| parent | 396a464cc743a2b104e6d9b21a07c90e130860bc (diff) | |
JSystem work (#2384)
* object-id 100% on debug
Can't be linked due to .text alignment issues?
* J3DMaterialFactory and J3DMaterialFactory_v21 OK
* Match dKy_bg_MAxx_proc
Diffstat (limited to 'include/JSystem/J3DGraphLoader')
| -rw-r--r-- | include/JSystem/J3DGraphLoader/J3DMaterialFactory.h | 5 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h | 5 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphLoader/J3DModelLoader.h | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index f871acfced..c82d075f5b 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -143,11 +143,6 @@ public: u16 getMaterialID(int idx) const { 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* mpMaterialInitData; /* 0x08 */ u16* mpMaterialID; diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index 7a95300953..16351f7daa 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -80,11 +80,6 @@ public: 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; /* 0x08 */ u16* mpMaterialID; diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index 28dced7a4c..2a8de73bb8 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -239,6 +239,12 @@ enum J3DModelLoaderFlagTypes { J3DMLF_Material_Color_AmbientOn = 0x80000000 }; +static inline u32 getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } +static inline u32 getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } +static inline u32 getMdlDataFlag_ColorFlag(u32 flags) { return flags & 0xc0000000; } +static inline u32 getMdlDataFlag_PEFlag(u32 flags) { return flags & 0x30000000; } +static inline u32 getMdlDataFlag_MtxLoadType(u32 flags) { return flags & 0x10; } + /** * @ingroup jsystem-j3d * |