summaryrefslogtreecommitdiff
path: root/libs/JSystem/J3DGraphBase
diff options
context:
space:
mode:
authorlepelog <lepelog@users.noreply.github.com>2021-06-02 14:13:31 +0200
committerGitHub <noreply@github.com>2021-06-02 08:13:31 -0400
commitb728ec1ef544571b02ef5fe05f418b9935c2b071 (patch)
treed9eff34f05e9f50033a1361745a98571f7354346 /libs/JSystem/J3DGraphBase
parente915df66c806bdff65aa243649f7abfe6cc19227 (diff)
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
Diffstat (limited to 'libs/JSystem/J3DGraphBase')
-rw-r--r--libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp1
-rw-r--r--libs/JSystem/J3DGraphBase/J3DPacket.cpp1
-rw-r--r--libs/JSystem/J3DGraphBase/J3DSys.cpp42
3 files changed, 1 insertions, 43 deletions
diff --git a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
index bd429fb830..1d6bba0f71 100644
--- a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
@@ -49,7 +49,6 @@ extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
-extern "C" extern u8 j3dSys[284];
//
// Declarations:
diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
index 1786915338..5755d6de59 100644
--- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -97,7 +97,6 @@ extern "C" void __ptmf_scall();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" u8 sortFuncTable__13J3DDrawBuffer[72];
-extern "C" extern u8 j3dSys[284];
extern "C" extern u8 struct_804515B0[4];
extern "C" u8 sTexGenBlock__17J3DDifferedTexMtx[4];
extern "C" u8 sTexMtxObj__17J3DDifferedTexMtx[4];
diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp
index ff49232f94..85eb95bde8 100644
--- a/libs/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp
@@ -13,29 +13,6 @@
struct _GXTexMapID {};
-struct _GXTexCacheSize {};
-
-struct J3DSys {
- /* 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 */];
-};
-
//
// Forward References:
//
@@ -69,7 +46,6 @@ extern "C" void makeTexCoordTable__Fv();
extern "C" void makeAlphaCmpTable__Fv();
extern "C" void makeZModeTable__Fv();
extern "C" void makeTevSwapTable__Fv();
-extern "C" void PSMTXIdentity();
extern "C" void GXSetVtxAttrFmt();
extern "C" void GXInvalidateVtxCache();
extern "C" void GXSetTexCoordGen2();
@@ -132,8 +108,7 @@ extern "C" extern u32 j3dDefaultTevKColor;
/* ############################################################################################## */
/* 80434AC8-80434BE4 0617E8 011C+00 1/1 151/151 486/486 .bss j3dSys */
-extern u8 j3dSys[284];
-u8 j3dSys[284];
+J3DSys j3dSys;
/* 80434BE4-80434C14 061904 0030+00 0/0 17/17 154/154 .bss mCurrentMtx__6J3DSys */
u8 J3DSys::mCurrentMtx[48];
@@ -349,21 +324,6 @@ asm void J3DSys::reinitPixelProc() {
}
#pragma pop
-/* 80310ED0-80310EF8 30B810 0028+00 0/0 1/0 0/0 .text __sinit_J3DSys_cpp */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void __sinit_J3DSys_cpp() {
- nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DSys/__sinit_J3DSys_cpp.s"
-}
-#pragma pop
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80310ED0, __sinit_J3DSys_cpp);
-#pragma pop
-
/* ############################################################################################## */
/* 80451598-804515A0 000A98 0004+04 0/0 1/1 0/0 .sbss j3dDefaultViewNo */
extern u8 j3dDefaultViewNo[4 + 4 /* padding */];