mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-04 00:38:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_Do cleanup, d_resource, drawlist stuff (#145)

Browse Source 
* d_resource / some d_stage

* setup dDlst_list_c / d_select_icon OK

* JUTXfb / some JUTVideo + various

* some J2D classes / JUTVideo/Fader attempts

* bunch of m_Do cleanup + matches / f_ap_game OK

* mDoLib_clipper::setup OK

* most of d_meter_HIO OK

* pane_class / kantera_icon_meter
This commit is contained in:
TakaRikka
2021-09-24 08:11:10 -07:00
committed by GitHub
parent 6dcfdaf8a3
commit 7374f5f2f7
261 changed files with 6757 additions and 10882 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J3DGraphBase/J3DShape.cpp
+1 -41
View File
@@ -11,47 +11,8 @@
// Types:
//
struct _GXVtxFmt {};
struct _GXVtxAttrFmtList {};
struct _GXAttr {};
struct Vec {};
struct J3DShapeMtx {
/* 803130A8 */ void resetMtxLoadCache();
static u8 sCurrentPipeline[4];
static u8 sCurrentScaleFlag[4];
static u8 sTexMtxLoadType[4];
};
struct J3DShapeDraw {
/* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
/* 80314AD4 */ void draw() const;
};
struct J3DShape {
/* 80314B48 */ void initialize();
/* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
/* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
/* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
/* 80314E28 */ void countBumpMtxNum() const;
/* 80314EEC */ void loadVtxArray() const;
/* 80314F5C */ void isSameVcdVatCmd(J3DShape*);
/* 80314F98 */ void makeVtxArrayCmd();
/* 80315260 */ void makeVcdVatCmd();
/* 80315300 */ void loadPreDrawSetting() const;
/* 80315398 */ void setArrayAndBindPipeline() const;
/* 8031544C */ void drawFast() const;
/* 803155E0 */ void draw() const;
/* 80315628 */ void simpleDraw() const;
/* 803156AC */ void simpleDrawCache() const;
static u8 sOldVcdVatCmd[4];
};
//
// Forward References:
//
@@ -92,7 +53,6 @@ extern "C" void OSRestoreInterrupts();
extern "C" void OSDisableScheduler();
extern "C" void OSEnableScheduler();
extern "C" void GXSetArray();
extern "C" void GXCallDisplayList();
extern "C" void GDInitGDLObj();
extern "C" void GDFlushCurrToMem();
extern "C" void GDPadCurr32();
@@ -252,7 +212,7 @@ asm void J3DShape::makeVcdVatCmd() {
/* ############################################################################################## */
/* 804515D0-804515D4 000AD0 0004+00 5/5 25/25 9/9 .sbss sOldVcdVatCmd__8J3DShape */
u8 J3DShape::sOldVcdVatCmd[4];
void* J3DShape::sOldVcdVatCmd;
/* 80315300-80315398 30FC40 0098+00 2/2 6/6 3/3 .text loadPreDrawSetting__8J3DShapeCFv */
#pragma push
libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
-12
View File
@@ -7,18 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct J3DShapeDraw {
/* 80314924 */ void countVertex(u32);
/* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
/* 80314ABC */ J3DShapeDraw(u8 const*, u32);
/* 80314AD4 */ void draw() const;
/* 80314B00 */ ~J3DShapeDraw();
};
//
// Forward References:
//
libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp
-25
View File
@@ -11,8 +11,6 @@
// Types:
//
struct Vec {};
struct J3DTextureSRTInfo {};
struct J3DSys {
@@ -68,26 +66,6 @@ struct J3DShapeMtxBBoardConcatView {
/* 80314610 */ void getType() const;
};
struct J3DShapeMtx {
/* 80273E08 */ bool getUseMtxNum() const;
/* 803130A8 */ void resetMtxLoadCache();
/* 803130E4 */ void loadMtxIndx_PNGP(int, u16) const;
/* 80313128 */ void loadMtxIndx_PCPU(int, u16) const;
/* 80313188 */ void loadMtxIndx_NCPU(int, u16) const;
/* 803131D4 */ void loadMtxIndx_PNCPU(int, u16) const;
/* 80313B94 */ void load() const;
/* 80313BF0 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
/* 8031459C */ void getUseMtxIndex(u16) const;
/* 80314798 */ ~J3DShapeMtx();
/* 803147E0 */ void getType() const;
static u8 sMtxLoadPipeline[48];
static u8 sMtxLoadCache[20 + 4 /* padding */];
static u8 sCurrentPipeline[4];
static u8 sCurrentScaleFlag[4];
static u8 sTexMtxLoadType[4];
};
struct J3DDifferedTexMtx {
/* 8031322C */ void loadExecute(f32 const (*)[4]);
@@ -174,9 +152,6 @@ extern "C" void J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f();
extern "C" void J3DScaleNrmMtx__FPA4_fRC3Vec();
extern "C" void J3DScaleNrmMtx33__FPA3_fRC3Vec();
extern "C" void J3DMtxProjConcat__FPA4_fPA4_fPA4_f();
extern "C" void PSMTXCopy();
extern "C" void PSMTXConcat();
extern "C" void PSMTXInverse();
extern "C" void GXSetArray();
extern "C" void GXLoadTexMtxImm();
extern "C" void __ptmf_scall();
libs/JSystem/J3DGraphBase/J3DSys.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ extern "C" extern u32 j3dDefaultTevKColor;
J3DSys j3dSys;
/* 80434BE4-80434C14 061904 0030+00 0/0 17/17 154/154 .bss mCurrentMtx__6J3DSys */
u8 J3DSys::mCurrentMtx[48];
Mtx J3DSys::mCurrentMtx;
/* 80434C14-80434C20 061934 000C+00 0/0 6/6 0/0 .bss mCurrentS__6J3DSys */
f32 J3DSys::mCurrentS[3];
@@ -120,7 +120,7 @@ f32 J3DSys::mCurrentS[3];
f32 J3DSys::mParentS[3];
/* 80434C2C-80434C70 06194C 0040+04 1/1 17/17 0/0 .bss sTexCoordScaleTable__6J3DSys */
u8 J3DSys::sTexCoordScaleTable[64 + 4 /* padding */];
u16 J3DSys::sTexCoordScaleTable[34];
/* 8030FDE8-8030FEC0 30A728 00D8+00 1/1 0/0 0/0 .text __ct__6J3DSysFv */
#pragma push