J3DPacket, J3DShape OK (#366)

4 files changed, 69 insertions, 135 deletions

diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
index 561cf05391..3131b264f5 100644
--- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -24,64 +24,10 @@
 // Forward References:
 //
 
-extern "C" void newDisplayList__17J3DDisplayListObjFUl();
-extern "C" void newSingleDisplayList__17J3DDisplayListObjFUl();
-extern "C" void single_To_Double__17J3DDisplayListObjFv();
-extern "C" void setSingleDisplayList__17J3DDisplayListObjFPvUl();
-extern "C" void swapBuffer__17J3DDisplayListObjFv();
-extern "C" void callDL__17J3DDisplayListObjCFv();
-extern "C" void beginDL__17J3DDisplayListObjFv();
-extern "C" void endDL__17J3DDisplayListObjFv();
-extern "C" void beginPatch__17J3DDisplayListObjFv();
-extern "C" void endPatch__17J3DDisplayListObjFv();
-extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer();
-extern "C" void addChildPacket__9J3DPacketFP9J3DPacket();
-extern "C" void __ct__13J3DDrawPacketFv();
-extern "C" void __dt__13J3DDrawPacketFv();
-extern "C" void newDisplayList__13J3DDrawPacketFUl();
-extern "C" void newSingleDisplayList__13J3DDrawPacketFUl();
-extern "C" void draw__13J3DDrawPacketFv();
-extern "C" void __ct__12J3DMatPacketFv();
-extern "C" void __dt__12J3DMatPacketFv();
-extern "C" void addShapePacket__12J3DMatPacketFP14J3DShapePacket();
-extern "C" void beginDiff__12J3DMatPacketFv();
-extern "C" void endDiff__12J3DMatPacketFv();
-extern "C" void isSame__12J3DMatPacketCFP12J3DMatPacket();
-extern "C" void draw__12J3DMatPacketFv();
-extern "C" void __ct__14J3DShapePacketFv();
-extern "C" void __dt__14J3DShapePacketFv();
-extern "C" void calcDifferedBufferSize__14J3DShapePacketFUl();
-extern "C" void newDifferedDisplayList__14J3DShapePacketFUl();
-extern "C" void prepareDraw__14J3DShapePacketCFv();
-extern "C" void draw__14J3DShapePacketFv();
-extern "C" void drawFast__14J3DShapePacketFv();
-extern "C" void draw__9J3DPacketFv();
-extern "C" void entry__12J3DMatPacketFP13J3DDrawBuffer();
-extern "C" u8 sGDLObj__17J3DDisplayListObj[16];
-extern "C" u8 sInterruptFlag__17J3DDisplayListObj[4 + 4 /* padding */];
-
 //
 // External References:
 //
 
-extern "C" void __dt__9J3DPacketFv();
-extern "C" void* __nw__FUl();
-extern "C" void* __nwa__FUli();
-extern "C" void __dl__FPv();
-extern "C" void setArray__15J3DVertexBufferCFv();
-extern "C" void loadPreDrawSetting__8J3DShapeCFv();
-extern "C" void syncJ3DSysFlags__12J3DModelDataCFv();
-extern "C" void GDFlushCurrToMem();
-extern "C" void GDPadCurr32();
-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 struct_804515B0[4];
-extern "C" u8 sTexGenBlock__17J3DDifferedTexMtx[4];
-extern "C" u8 sTexMtxObj__17J3DDifferedTexMtx[4];
-extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
-
 //
 // Declarations:
 //
@@ -324,14 +270,63 @@ J3DShapePacket::~J3DShapePacket() {}
 
 /* 80312BD4-80312DBC 30D514 01E8+00 1/1 0/0 0/0 .text calcDifferedBufferSize__14J3DShapePacketFUl
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm u32 J3DShapePacket::calcDifferedBufferSize(u32 flag) {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DPacket/calcDifferedBufferSize__14J3DShapePacketFUl.s"
+u32 J3DShapePacket::calcDifferedBufferSize(u32 flag) {
+    int iVar5 = 0;
+    for (int i = 0; i < 8; i++) {
+        if ((flag & sDifferedRegister[i]) != 0) {
+            iVar5 += sSizeOfDiffered[i];
+        }
+    }
+
+    iVar5 += getDiffFlag_LightObjNum(flag) * 0x48;
+    u32 uVar2 = getDiffFlag_TexGenNum(flag);
+    if (uVar2 != 0) {
+        u32 local_4c = mpShape->getMaterial()->getTexGenNum();
+        if (uVar2 > local_4c) {
+            local_4c = uVar2;
+        }
+        if ((flag & 0x1000)) {
+            iVar5 += calcDifferedBufferSize_TexGenSize(local_4c);
+        } else {
+            iVar5 += calcDifferedBufferSize_TexMtxSize(local_4c);
+        }
+    }
+
+    uVar2 = getDiffFlag_TexNoNum(flag);
+    if (uVar2 != 0) {
+        u8 local_58;
+        if (mpShape->getMaterial()->getTevStageNum() > 8) {
+            local_58 = 8;
+        } else {
+            local_58 = mpShape->getMaterial()->getTevStageNum();
+        }
+        u32 local_50 = local_58;
+        local_50 = uVar2 > local_50 ? uVar2 : local_50;
+        if ((flag & 0x4000000)) {
+            iVar5 += calcDifferedBufferSize_TexNoAndTexCoordScaleSize(local_50);
+        } else {
+            iVar5 += calcDifferedBufferSize_TexNoSize(local_50);
+        }
+    }
+
+    uVar2 = getDiffFlag_TevStageNum(flag);
+    if (uVar2 != 0) {
+        u8 local_58;
+        if (mpShape->getMaterial()->getTevStageNum() > 8) {
+            local_58 = 8;
+        } else {
+            local_58 = mpShape->getMaterial()->getTevStageNum();
+        }
+        u32 local_50 = local_58;
+        local_50 = uVar2 > local_50 ? uVar2 : local_50;
+        iVar5 += calcDifferedBufferSize_TevStageSize(local_50);
+        if (flag & 0x8000000) {
+            iVar5 += calcDifferedBufferSize_TevStageDirectSize(local_50);
+        }
+    }
+
+    return (iVar5 + 0x1f) & ~0x1f;
 }
-#pragma pop
 
 /* 80312DBC-80312E08 30D6FC 004C+00 0/0 1/1 0/0 .text newDifferedDisplayList__14J3DShapePacketFUl
  */
@@ -349,7 +344,6 @@ J3DError J3DShapePacket::newDifferedDisplayList(u32 flag) {
 }
 
 /* 80312E08-80312F24 30D748 011C+00 2/2 0/0 0/0 .text            prepareDraw__14J3DShapePacketCFv */
-#if defined NONMATCHING
 void J3DShapePacket::prepareDraw() const {
     mpModel->getVertexBuffer()->setArray();
     j3dSys.setModel(mpModel);
@@ -364,34 +358,25 @@ void J3DShapePacket::prepareDraw() const {
         mpShape->offFlag(J3DShpFlag_SkinPosCpu);
     }
 
-    if (mpModel->checkFlag(J3DMdlFlag_SkinNrmCpu) && !mpShape->checkFlag(J3DShpFlag_EnableLod)) {
+    if (mpModel->checkFlag(J3DMdlFlag_SkinNrmCpu) && mpShape->checkFlag(J3DShpFlag_EnableLod) == false) {
         mpShape->onFlag(J3DShpFlag_SkinNrmCpu);
     } else {
         mpShape->offFlag(J3DShpFlag_SkinNrmCpu);
     }
 
-    mpShape->setCurrentViewNoPtr(mpMtxBuffer->getCurrentViewNoPtr());
-    mpShape->setScaleFlagArray(mpMtxBuffer->getScaleFlagArray());
-    mpShape->setDrawMtx(mpMtxBuffer->getDrawMtxPtrPtr());
+    J3DMtxBuffer* buffer = mpMtxBuffer;
+    mpShape->setCurrentViewNoPtr(buffer->getCurrentViewNoPtr());
+    mpShape->setScaleFlagArray(buffer->getScaleFlagArray());
+    mpShape->setDrawMtx(buffer->getDrawMtxPtrPtr());
 
     if (!mpShape->getNBTFlag()) {
-        mpShape->setNrmMtx(mpMtxBuffer->getNrmMtxPtrPtr());
+        mpShape->setNrmMtx(buffer->getNrmMtxPtrPtr());
     } else {
-        mpShape->setNrmMtx(mpMtxBuffer->getBumpMtxPtrPtr()[mpShape->getBumpMtxOffset()]);
+        mpShape->setNrmMtx(buffer->getBumpMtxPtrPtr()[mpShape->getBumpMtxOffset()]);
     }
 
     mpModel->getModelData()->syncJ3DSysFlags();
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DShapePacket::prepareDraw() const {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DPacket/prepareDraw__14J3DShapePacketCFv.s"
-}
-#pragma pop
-#endif
 
 /* 80312F24-80312FBC 30D864 0098+00 1/0 0/0 0/0 .text            draw__14J3DShapePacketFv */
 void J3DShapePacket::draw() {
diff --git a/libs/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/J3DGraphBase/J3DShape.cpp
index efe817b617..04e7e85458 100644
--- a/libs/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DShape.cpp
@@ -17,26 +17,6 @@
 // Forward References:
 //
 
-extern "C" void initialize__8J3DShapeFv();
-extern "C" void addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl();
-extern "C" void addTexMtxIndexInVcd__8J3DShapeF7_GXAttr();
-extern "C" void calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f();
-extern "C" void countBumpMtxNum__8J3DShapeCFv();
-extern "C" static void J3DLoadCPCmd__FUcUl();
-extern "C" static void J3DLoadArrayBasePtr__F7_GXAttrPv();
-extern "C" void loadVtxArray__8J3DShapeCFv();
-extern "C" void isSameVcdVatCmd__8J3DShapeFP8J3DShape();
-extern "C" void makeVtxArrayCmd__8J3DShapeFv();
-extern "C" void makeVcdVatCmd__8J3DShapeFv();
-extern "C" void loadPreDrawSetting__8J3DShapeCFv();
-extern "C" void setArrayAndBindPipeline__8J3DShapeCFv();
-extern "C" void drawFast__8J3DShapeCFv();
-extern "C" void draw__8J3DShapeCFv();
-extern "C" void simpleDraw__8J3DShapeCFv();
-extern "C" void simpleDrawCache__8J3DShapeCFv();
-extern "C" extern void* __vt__8J3DShape[6];
-extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
-
 //
 // External References:
 //
@@ -45,25 +25,6 @@ void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList const*, bool);
 void J3DFifoLoadPosMtxImm(Mtx, u32);
 void J3DFifoLoadNrmMtxImm(Mtx, u32);
 
-extern "C" void* __nwa__FUl();
-extern "C" void J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb();
-extern "C" void J3DFifoLoadPosMtxImm__FPA4_fUl();
-extern "C" void J3DFifoLoadNrmMtxImm__FPA4_fUl();
-extern "C" void resetMtxLoadCache__11J3DShapeMtxFv();
-extern "C" void addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl();
-extern "C" void draw__12J3DShapeDrawCFv();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void _restgpr_29();
-extern "C" extern u32 j3dDefaultViewNo;
-extern "C" u32 sCurrentPipeline__11J3DShapeMtx;
-extern "C" u32 sCurrentScaleFlag__11J3DShapeMtx;
-extern "C" extern u8 struct_804515B0[4];
-extern "C" u32 sTexMtxLoadType__11J3DShapeMtx;
-
 //
 // Declarations:
 //
@@ -340,13 +301,12 @@ void J3DShape::setArrayAndBindPipeline() const {
     J3DShapeMtx::sCurrentScaleFlag = mScaleFlagArray;
     // The below struct_804515B0 is actually a continuation of sCurrentScaleFlag, I believe?
     // Also, there seems to be an extra entry in the array that's only there in DEBUG builds.
-    struct_804515B0[0] = mHasNBT;
+    struct_804515B0 = mHasNBT;
     data_804515D4[0] = mHasPNMTXIdx;
     J3DShapeMtx::sTexMtxLoadType = getTexMtxLoadType();
 }
 
 /* 8031544C-803155E0 30FD8C 0194+00 1/0 0/0 0/0 .text            drawFast__8J3DShapeCFv */
-#ifdef NONMATCHING
 void J3DShape::drawFast() const {
     if (sOldVcdVatCmd != mVcdVatCmd) {
         GXCallDisplayList(mVcdVatCmd, kVcdVatDLSize);
@@ -376,18 +336,6 @@ void J3DShape::drawFast() const {
                 getShapeDraw(i)->draw();
     }
 }
-#else
-
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DShape::drawFast() const {
-    nofralloc
-#include "asm/JSystem/J3DGraphBase/J3DShape/drawFast__8J3DShapeCFv.s"
-}
-#pragma pop
-
-#endif
 
 /* 803155E0-80315628 30FF20 0048+00 1/0 0/0 0/0 .text            draw__8J3DShapeCFv */
 void J3DShape::draw() const {
diff --git a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index dd9d77b10c..a4ecff84c0 100644
--- a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -355,8 +355,10 @@ u8* J3DShapeMtx::sCurrentScaleFlag;
 /* 804515B0-804515B4 -00001 0004+00 5/5 3/3 0/0 .sbss            None */
 /* 804515B0 0001+00 data_804515B0 None */
 /* 804515B1 0003+00 data_804515B1 None */
-extern u8 struct_804515B0[4];
-u8 struct_804515B0[4];
+u8 struct_804515B0;
+u8 struct_804515B1;
+u8 struct_804515B2;
+u8 struct_804515B3;
 
 /* 804515B4-804515B8 000AB4 0004+00 4/4 1/1 0/0 .sbss            sTexMtxLoadType__11J3DShapeMtx */
 u32 J3DShapeMtx::sTexMtxLoadType;
diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp
index 8ce7f16565..b3cf71f619 100644
--- a/libs/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp
@@ -400,5 +400,4 @@ void J3DSys::reinitPixelProc() {
 
 /* ############################################################################################## */
 /* 80451598-804515A0 000A98 0004+04 0/0 1/1 0/0 .sbss            j3dDefaultViewNo */
-extern u8 j3dDefaultViewNo[4 + 4 /* padding */];
-u8 j3dDefaultViewNo[4 + 4 /* padding */];
+u32 j3dDefaultViewNo;