mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 14:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

JSystem work (#2384)

Browse Source 
* object-id 100% on debug

Can't be linked due to .text alignment issues?

* J3DMaterialFactory and J3DMaterialFactory_v21 OK

* Match dKy_bg_MAxx_proc
This commit is contained in:
LagoLunatic
2025-04-09 01:17:20 -04:00
committed by GitHub
parent 396a464cc7
commit 6672817e41
19 changed files with 159 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphLoader/J3DMaterialFactory.h
-5
View File
@@ -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;
include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
-5
View File
@@ -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;
include/JSystem/J3DGraphLoader/J3DModelLoader.h
+6
View File
@@ -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
*