Reorganize library code into libs/ (#3119)

* Reorganize files into libs/{dolphin,JSystem,PowerPC_EABI_Support,revolution,TRK_MINNOW_DOLPHIN} * Update configure.py and project.py for new libs structure * Refactor `#include <dolphin/x.h>` -> `<x.h>` * Remove `__REVOLUTION_SDK__` forwards from dolphin * Fix dolphin/ references in revolution * Wrap `#include <dolphin.h>` in `!__REVOLUTION_SDK__` * Always build TRK against dolphin headers * Resolve revolution SDK header resolution issues
2026-05-31 08:51:29 -04:00 · 2026-03-01 15:35:36 -07:00
parent c9a46bd65b
commit 4df8ccc871
1740 changed files with 583 additions and 825 deletions
@@ -0,0 +1,389 @@
+#include "JSystem/JSystem.h" // IWYU pragma: keep
+
+#include "JSystem/J3DGraphBase/J3DPacket.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
+#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
+#include "JSystem/J3DGraphBase/J3DShapeMtx.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include <os.h>
+#include <cstring>
+#include "global.h"
+
+J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {
+    mMaxSize = ALIGN_NEXT(maxSize, 0x20);
+    mpDisplayList[0] = new (0x20) char[mMaxSize];
+    mpDisplayList[1] = new (0x20) char[mMaxSize];
+    mSize = 0;
+
+    if (mpDisplayList[0] == NULL || mpDisplayList[1] == NULL)
+        return kJ3DError_Alloc;
+
+    return kJ3DError_Success;
+}
+
+J3DError J3DDisplayListObj::newSingleDisplayList(u32 maxSize) {
+    mMaxSize = ALIGN_NEXT(maxSize, 0x20);
+    mpDisplayList[0] = new (0x20) char[mMaxSize];
+    mpDisplayList[1] = mpDisplayList[0];
+    mSize = 0;
+
+    if (mpDisplayList[0] == NULL)
+        return kJ3DError_Alloc;
+
+    return kJ3DError_Success;
+}
+
+int J3DDisplayListObj::single_To_Double() {
+    if (mpDisplayList[0] == mpDisplayList[1]) {
+        mpDisplayList[1] = new (0x20) char[mMaxSize];
+
+        if (mpDisplayList[1] == NULL)
+            return kJ3DError_Alloc;
+
+        memcpy(mpDisplayList[1], mpDisplayList[0], mMaxSize);
+        DCStoreRange(mpDisplayList[1], mMaxSize);
+    }
+
+    return kJ3DError_Success;
+}
+
+void J3DDisplayListObj::setSingleDisplayList(void* pDLData, u32 size) {
+    J3D_ASSERT_NULLPTR(148, pDLData != NULL);
+
+    mMaxSize = ALIGN_NEXT(size, 0x20);
+    mpDisplayList[0] = pDLData;
+    mpDisplayList[1] = mpDisplayList[0];
+    mSize = size;
+}
+
+void J3DDisplayListObj::swapBuffer() {
+    void* pTmp = mpDisplayList[0];
+    mpDisplayList[0] = mpDisplayList[1];
+    mpDisplayList[1] = pTmp;
+}
+
+void J3DDisplayListObj::callDL() const {
+    GXCallDisplayList(mpDisplayList[0], mSize);
+}
+
+GDLObj J3DDisplayListObj::sGDLObj;
+
+s32 J3DDisplayListObj::sInterruptFlag;
+
+void J3DDisplayListObj::beginDL() {
+    swapBuffer();
+    sInterruptFlag = OSDisableInterrupts();
+    GDInitGDLObj(&sGDLObj, (u8*)mpDisplayList[0], mMaxSize);
+    GDSetCurrent(&sGDLObj);
+}
+
+u32 J3DDisplayListObj::endDL() {
+    GDPadCurr32();
+    OSRestoreInterrupts(sInterruptFlag);
+    mSize = GDGetGDLObjOffset(&sGDLObj);
+    GDFlushCurrToMem();
+    GDSetCurrent(NULL);
+    return mSize;
+}
+
+void J3DDisplayListObj::beginPatch() {
+    beginDL();
+}
+
+u32 J3DDisplayListObj::endPatch() {
+    OSRestoreInterrupts(sInterruptFlag);
+    GDSetCurrent(NULL);
+    return mSize;
+}
+
+int J3DPacket::entry(J3DDrawBuffer* pBuffer) {
+    J3D_ASSERT_NULLPTR(290, pBuffer != NULL);
+    return 1;
+}
+
+void J3DPacket::addChildPacket(J3DPacket* pPacket) {
+    J3D_ASSERT_NULLPTR(304, pPacket != NULL);
+
+    if (mpFirstChild == NULL) {
+        mpFirstChild = pPacket;
+    } else {
+        pPacket->setNextPacket(mpFirstChild);
+        mpFirstChild = pPacket;
+    }
+}
+
+static u32 sDifferedRegister[8] = {
+    J3DDiffFlag_AmbColor,
+    J3DDiffFlag_MatColor,
+    J3DDiffFlag_ColorChan,
+    J3DDiffFlag_TevReg,
+    J3DDiffFlag_Fog,
+    J3DDiffFlag_Blend,
+    J3DDiffFlag_KonstColor,
+    J3DDiffFlag_TevStageIndirect,
+};
+
+static s32 sSizeOfDiffered[8] = {
+    13,
+    13,
+    21,
+    120,
+    55,
+    15,
+    19,
+    45,
+};
+
+J3DDrawPacket::J3DDrawPacket() {
+    mFlags = 0;
+    mpDisplayListObj = NULL;
+    mpTexMtxObj = NULL;
+}
+
+J3DDrawPacket::~J3DDrawPacket() {}
+
+J3DError J3DDrawPacket::newDisplayList(u32 size) {
+    mpDisplayListObj = new J3DDisplayListObj();
+
+    if (mpDisplayListObj == NULL)
+        return kJ3DError_Alloc;
+
+    J3DError ret = mpDisplayListObj->newDisplayList(size);
+    if (ret != kJ3DError_Success)
+        return ret;
+
+    return kJ3DError_Success;
+}
+
+J3DError J3DDrawPacket::newSingleDisplayList(u32 size) {
+    mpDisplayListObj = new J3DDisplayListObj();
+
+    if (mpDisplayListObj == NULL)
+        return kJ3DError_Alloc;
+
+    J3DError ret = mpDisplayListObj->newSingleDisplayList(size);
+    if (ret != kJ3DError_Success)
+        return ret;
+
+    return kJ3DError_Success;
+}
+
+void J3DDrawPacket::draw() {
+    callDL();
+}
+
+J3DMatPacket::J3DMatPacket() {
+    mpInitShapePacket = NULL;
+    mpShapePacket = NULL;
+    mpMaterial = NULL;
+    mDiffFlag = 0xFFFFFFFF;
+    mpTexture = NULL;
+    mpMaterialAnm = NULL;
+}
+
+J3DMatPacket::~J3DMatPacket() {}
+
+void J3DMatPacket::addShapePacket(J3DShapePacket* pShape) {
+    if (mpShapePacket == NULL) {
+        mpShapePacket = pShape;
+    } else {
+        pShape->setNextPacket(mpShapePacket);
+        mpShapePacket = pShape;
+    }
+}
+
+void J3DMatPacket::beginDiff() {
+    mpInitShapePacket->beginDL();
+}
+
+void J3DMatPacket::endDiff() {
+    mpInitShapePacket->endDL();
+}
+
+bool J3DMatPacket::isSame(J3DMatPacket* pOther) const {
+    J3D_ASSERT_NULLPTR(521, pOther != NULL);
+    return mDiffFlag == pOther->mDiffFlag && (mDiffFlag >> 31) == 0;
+}
+
+void J3DMatPacket::draw() {
+    mpMaterial->load();
+    callDL();
+
+    J3DShapePacket* packet = getShapePacket();
+    packet->getShape()->loadPreDrawSetting();
+
+    while (packet != NULL) {
+        if (packet->getDisplayListObj() != NULL) {
+            packet->getDisplayListObj()->callDL();
+        }
+
+        packet->drawFast();
+        packet = (J3DShapePacket*)packet->getNextPacket();
+    }
+
+    J3DShape::resetVcdVatCache();
+}
+
+J3DShapePacket::J3DShapePacket() {
+    mpShape = NULL;
+    mpMtxBuffer = NULL;
+    mpBaseMtxPtr = NULL;
+    mDiffFlag = 0;
+    mpModel = NULL;
+}
+
+J3DShapePacket::~J3DShapePacket() {}
+
+u32 J3DShapePacket::calcDifferedBufferSize(u32 diffFlags) {
+    u32 bufferSize = 0;
+
+    for (u32 i = 0; i < 8; i++) {
+        if ((diffFlags & sDifferedRegister[i]) != 0) {
+            bufferSize += sSizeOfDiffered[i];
+        }
+    }
+
+    u32 lightObjNum = getDiffFlag_LightObjNum(diffFlags);
+    bufferSize += lightObjNum * 0x48;
+
+    u32 texGenNum = getDiffFlag_TexGenNum(diffFlags);
+    if (texGenNum != 0) {
+        u32 mat_texGenNum = mpShape->getMaterial()->getTexGenNum();
+        u32 sp30 = texGenNum > mat_texGenNum ? texGenNum : mat_texGenNum;
+
+        if (diffFlags & J3DDiffFlag_TexGen) {
+            bufferSize += calcDifferedBufferSize_TexGenSize(sp30);
+        } else {
+            bufferSize += calcDifferedBufferSize_TexMtxSize(sp30);
+        }
+    }
+
+    u32 texNoNum = getDiffFlag_TexNoNum(diffFlags);
+    if (texNoNum != 0) {
+        u8 sp9;
+        if (mpShape->getMaterial()->getTevStageNum() > 8) {
+            sp9 = 8;
+        } else {
+            sp9 = mpShape->getMaterial()->getTevStageNum();
+        }
+
+        u32 mat_texNoNum = sp9;
+        u32 sp24 = texNoNum > mat_texNoNum ? texNoNum : mat_texNoNum;
+
+        if (diffFlags & J3DDiffFlag_TexCoordScale) {
+            bufferSize += calcDifferedBufferSize_TexNoAndTexCoordScaleSize(sp24);
+        } else {
+            bufferSize += calcDifferedBufferSize_TexNoSize(sp24);
+        }
+    }
+
+    u32 tevStageNum = getDiffFlag_TevStageNum(diffFlags);
+    if (tevStageNum != 0) {
+        u8 sp8;
+        if (mpShape->getMaterial()->getTevStageNum() > 8) {
+            sp8 = 8;
+        } else {
+            sp8 = mpShape->getMaterial()->getTevStageNum();
+        }
+
+        u32 mat_tevStageNum = sp8;
+        u32 sp18 = tevStageNum > mat_tevStageNum ? tevStageNum : mat_tevStageNum;
+
+        bufferSize += calcDifferedBufferSize_TevStageSize(sp18);
+        if (diffFlags & J3DDiffFlag_TevStageIndirect) {
+            bufferSize += calcDifferedBufferSize_TevStageDirectSize(sp18);
+        }
+    }
+
+    return OSRoundUp32B(bufferSize);
+}
+
+int J3DShapePacket::newDifferedDisplayList(u32 diffFlags) {
+    mDiffFlag = diffFlags;
+
+    u32 bufSize = calcDifferedBufferSize(diffFlags);
+    int ret = newDisplayList(bufSize);
+    if (ret != kJ3DError_Success) {
+        return ret;
+    }
+
+    J3DDisplayListObj* dlobj = getDisplayListObj();
+    setDisplayListObj(dlobj);
+    return kJ3DError_Success;
+}
+
+void J3DShapePacket::prepareDraw() const {
+    mpModel->getVertexBuffer()->setArray();
+    j3dSys.setModel(mpModel);
+    j3dSys.setShapePacket((J3DShapePacket*)this);
+
+    J3DShapeMtx::setLODFlag(mpModel->checkFlag(J3DMdlFlag_EnableLOD) != 0);
+
+    if (mpModel->checkFlag(J3DMdlFlag_SkinPosCpu)) {
+        mpShape->onFlag(J3DShpFlag_SkinPosCpu);
+    } else {
+        mpShape->offFlag(J3DShpFlag_SkinPosCpu);
+    }
+
+    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());
+
+    if (!mpShape->getNBTFlag()) {
+        mpShape->setNrmMtx(mpMtxBuffer->getNrmMtxPtrPtr());
+    } else {
+        mpShape->setNrmMtx(mpMtxBuffer->mpBumpMtxArr[1][mpShape->getBumpMtxOffset()]);
+    }
+
+    mpModel->getModelData()->syncJ3DSysFlags();
+}
+
+void J3DShapePacket::draw() {
+    if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) {
+        prepareDraw();
+
+        if (mpTexMtxObj != NULL) {
+            J3DDifferedTexMtx::sTexGenBlock = mpShape->getMaterial()->getTexGenBlock();
+            J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj();
+        } else {
+            J3DDifferedTexMtx::sTexGenBlock = NULL;
+        }
+
+        if (mpDisplayListObj != NULL) {
+            mpDisplayListObj->callDL();
+        }
+
+        mpShape->draw();
+    }
+}
+
+void J3DShapePacket::drawFast() {
+    if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) {
+        prepareDraw();
+
+        if (mpTexMtxObj != NULL) {
+            J3DDifferedTexMtx::sTexGenBlock = mpShape->getMaterial()->getTexGenBlock();
+            J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj();
+        } else {
+            J3DDifferedTexMtx::sTexGenBlock = NULL;
+        }
+
+        mpShape->drawFast();
+    }
+}
+
+void J3DPacket::draw() {}
+
+int J3DMatPacket::entry(J3DDrawBuffer* pBuffer) {
+    J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[pBuffer->getSortMode()];
+    return (pBuffer->*func)(this);
+}