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

some J3D/misc cleanup (#2628)

Browse Source 
* some j3d cleanup

* begin using uintptr_t

* j3dgraphbase cleanup

* j3dgraphanimator cleanup
This commit is contained in:
TakaRikka
2025-09-04 07:56:59 -07:00
committed by GitHub
parent ee8b843996
commit b45a089e15
290 changed files with 4221 additions and 3605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+1 -1
View File
@@ -4332,7 +4332,7 @@ public:
/* 0x032C0 */ s16 field_0x32c0[2];
/* 0x032C4 */ u16 field_0x32c4[2];
/* 0x032C8 */ u32 field_0x32c8;
/* 0x032CC */ u32 field_0x32cc;
/* 0x032CC */ uintptr_t field_0x32cc;
/* 0x032D0 */ u32 field_0x32d0;
/* 0x032D4 */ u32 field_0x32d4;
/* 0x032D8 */ firePointEff_c field_0x32d8[4];
include/d/d_drawlist.h
+3 -3
View File
@@ -192,7 +192,7 @@ public:
class dDlst_shadowRealPoly_c : public dDlst_shadowPoly_c {
public:
/* 800569A0 */ virtual dDlst_shadowTri_c* getTri() { return mShadowTri; }
/* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZE(mShadowTri); }
/* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZEU(mShadowTri); }
/* 0x8 */ dDlst_shadowTri_c mShadowTri[256];
};
@@ -346,8 +346,8 @@ public:
J3DDrawBuffer* getOpaListBG() { return mDrawBuffers[DB_OPA_LIST_BG]; }
J3DDrawBuffer* getOpaListDark() { return mDrawBuffers[DB_OPA_LIST_DARK]; }
J3DDrawBuffer* getXluListBG() { return mDrawBuffers[DB_XLU_LIST_BG]; }
void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSys_XLU_BUFFER_e); }
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSys_OPA_BUFFER_e); }
void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSysDrawBuf_Xlu); }
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSysDrawBuf_Opa); }
void setXluListSky() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); }
void setOpaListSky() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); }
void setXluListDark() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); }
include/d/d_resorce.h
+12 -12
View File
@@ -81,50 +81,50 @@ public:
static int syncAllRes(dRes_info_c* i_resInfo, int i_infoNum);
int setObjectRes(const char* i_arcName, u8 i_mountDirection, JKRHeap* i_heap) {
return setRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo), "/res/Object/", i_mountDirection,
return setRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo), "/res/Object/", i_mountDirection,
i_heap);
}
void* getObjectRes(const char* i_arcName, const char* resName) {
return getRes(i_arcName, resName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
return getRes(i_arcName, resName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
}
void* getObjectRes(const char* i_arcName, s32 i_index) {
return getRes(i_arcName, i_index, mObjectInfo, ARRAY_SIZE(mObjectInfo));
return getRes(i_arcName, i_index, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
}
void* getObjectIDRes(const char* i_arcName, u16 i_resID) {
return getIDRes(i_arcName, i_resID, mObjectInfo, ARRAY_SIZE(mObjectInfo));
return getIDRes(i_arcName, i_resID, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
}
int syncObjectRes(const char* i_arcName) {
return syncRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
return syncRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
}
int syncStageRes(const char* i_arcName) {
return syncRes(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
return syncRes(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
int syncAllObjectRes() { return syncAllRes(mObjectInfo, ARRAY_SIZE(mObjectInfo)); }
int syncAllObjectRes() { return syncAllRes(mObjectInfo, ARRAY_SIZEU(mObjectInfo)); }
int deleteObjectRes(const char* i_arcName) {
return deleteRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
return deleteRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
}
int deleteStageRes(const char* i_arcName) {
return deleteRes(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
return deleteRes(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
void* getStageRes(const char* i_arcName, const char* i_resName) {
return getRes(i_arcName, i_resName, mStageInfo, ARRAY_SIZE(mStageInfo));
return getRes(i_arcName, i_resName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
dRes_info_c* getObjectResInfo(const char* i_arcName) {
return getResInfo(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
return getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
}
dRes_info_c* getStageResInfo(const char* i_arcName) {
return getResInfo(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
/* 0x0000 */ dRes_info_c mObjectInfo[128];