From b728ec1ef544571b02ef5fe05f418b9935c2b071 Mon Sep 17 00:00:00 2001 From: lepelog Date: Wed, 2 Jun 2021 14:13:31 +0200 Subject: J3duclip, fop_actor_mng and related stuff (#131) * J3DUClipper sinit * sincosTable_ etc * decompile JMATrigonometric sinit * f_op_actor_mng * move f_op_actor_mng and parts of mDo_ext * J3DSys sinit * f_op_scene_req * failed matching attempt for decodeSZS__9JKRDecompFPUcPUcUlUl * mX -> x * fix mCull and fopAcM_prm_class members * fix a few function parameters * move missing NON_MATCHING * remove some unneeded data * turns out that data was not unused * remove unused asm * readd asm deleted by accident --- include/JSystem/J3DGraphBase/J3DSys.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'include/JSystem/J3DGraphBase') diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h index 73cef8bde9..9320bcdd02 100644 --- a/include/JSystem/J3DGraphBase/J3DSys.h +++ b/include/JSystem/J3DGraphBase/J3DSys.h @@ -1,6 +1,7 @@ #ifndef J3DSYS_H #define J3DSYS_H +#include "dolphin/mtx/mtx.h" #include "dolphin/types.h" // Perhaps move to a new J3DEnum.h? @@ -9,4 +10,31 @@ enum J3DError { kJ3DError_Alloc = 4, }; +struct _GXTexCacheSize {}; + +struct J3DSys { + Mtx mMtx; + u8 _30[0x11C - 0x30]; + /* 8030FDE8 */ J3DSys(); + /* 8030FEC0 */ void loadPosMtxIndx(int, u16) const; + /* 8030FEE4 */ void loadNrmMtxIndx(int, u16) const; + /* 8030FF0C */ void setTexCacheRegion(_GXTexCacheSize); + /* 803100BC */ void drawInit(); + /* 8031073C */ void reinitGX(); + /* 8031079C */ void reinitGenMode(); + /* 803107E8 */ void reinitLighting(); + /* 80310894 */ void reinitTransform(); + /* 80310998 */ void reinitTexture(); + /* 80310A3C */ void reinitTevStages(); + /* 80310D44 */ void reinitIndStages(); + /* 80310E3C */ void reinitPixelProc(); + + static u8 mCurrentMtx[48]; + static f32 mCurrentS[3]; + static f32 mParentS[3]; + static u8 sTexCoordScaleTable[64 + 4 /* padding */]; +}; + +extern J3DSys j3dSys; + #endif /* J3DSYS_H */ -- cgit v1.2.3