From f0737907d562915aef7c8b725780251b98ab7cad Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 23 Sep 2023 13:34:07 -0700 Subject: [PATCH] d_resorce mostly there --- .../JSystem/J3DGraphAnimator/J3DMaterialAnm.h | 50 +- include/JSystem/J3DGraphLoader/J3DAnmLoader.h | 7 +- .../JSystem/J3DGraphLoader/J3DModelLoader.h | 7 +- include/d/d_drawlist.h | 5 + include/d/d_resorce.h | 11 +- include/m_Do/m_Do_ext.h | 16 +- src/d/d_resorce.cpp | 623 ++++++++++++++---- src/m_Do/m_Do_ext.cpp | 2 +- 8 files changed, 568 insertions(+), 153 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index b2d5316af..dec569648 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -8,8 +8,8 @@ typedef struct _GXColorS10 GXColorS10; class J3DMatColorAnm { public: - /* 8003B2B8 */ ~J3DMatColorAnm() {}; - /* 8003B2F4 */ J3DMatColorAnm() {}; + ~J3DMatColorAnm() {}; + J3DMatColorAnm() {}; void operator=(J3DMatColorAnm const& other) { mAnmColor = other.mAnmColor; @@ -29,9 +29,9 @@ private: class J3DTexNoAnm { public: - /* 8003B1F8 */ ~J3DTexNoAnm() {}; - /* 8003B240 */ J3DTexNoAnm() {}; - /* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); } + ~J3DTexNoAnm() {}; + J3DTexNoAnm() {}; + virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); } void operator=(J3DTexNoAnm const& other) { mAnmTexPattern = other.mAnmTexPattern; @@ -51,8 +51,8 @@ private: class J3DTexMtxAnm { public: - /* 8003B264 */ ~J3DTexMtxAnm() {}; - /* 8003B2A0 */ J3DTexMtxAnm() {}; + ~J3DTexMtxAnm() {}; + J3DTexMtxAnm() {}; void operator=(J3DTexMtxAnm const& other) { mAnmTransform = other.mAnmTransform; @@ -74,8 +74,8 @@ private: class J3DTevKColorAnm { public: - /* 8003B150 */ ~J3DTevKColorAnm() {}; - /* 8003B18C */ J3DTevKColorAnm() {}; + ~J3DTevKColorAnm() {}; + J3DTevKColorAnm() {}; void operator=(J3DTevKColorAnm const& other) { mAnmTevReg = other.mAnmTevReg; @@ -95,8 +95,8 @@ private: class J3DTevColorAnm { public: - /* 8003B1A4 */ ~J3DTevColorAnm() {}; - /* 8003B1E0 */ J3DTevColorAnm() {}; + ~J3DTevColorAnm() {}; + J3DTevColorAnm() {}; void operator=(J3DTevColorAnm const& other) { mAnmTevReg = other.mAnmTevReg; @@ -118,24 +118,24 @@ class J3DMaterialAnm { public: J3DMaterialAnm() { initialize(); } - /* 8032C320 */ void initialize(); - /* 8032C5A4 */ void setMatColorAnm(int, J3DMatColorAnm*); - /* 8032C5E4 */ void setTexMtxAnm(int, J3DTexMtxAnm*); - /* 8032C624 */ void setTexNoAnm(int, J3DTexNoAnm*); - /* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*); - /* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*); + void initialize(); + void setMatColorAnm(int, J3DMatColorAnm*); + void setTexMtxAnm(int, J3DTexMtxAnm*); + void setTexNoAnm(int, J3DTexNoAnm*); + void setTevColorAnm(int, J3DTevColorAnm*); + void setTevKColorAnm(int, J3DTevKColorAnm*); - /* 800A4820 */ virtual ~J3DMaterialAnm() {}; - /* 8032C3C4 */ virtual void calc(J3DMaterial*) const; + virtual ~J3DMaterialAnm() {}; + virtual void calc(J3DMaterial*) const; - const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; } + const J3DTexMtxAnm& getTexMtxAnm(int i) const { return *mTexMtxAnm[i]; } private: - /* 0x04 */ J3DMatColorAnm mMatColorAnm[2]; - /* 0x14 */ J3DTexMtxAnm mTexMtxAnm[8]; - /* 0x54 */ J3DTexNoAnm mTexNoAnm[8]; - /* 0xB4 */ J3DTevColorAnm mTevColorAnm[4]; - /* 0xD4 */ J3DTevKColorAnm mTevKColorAnm[4]; + /* 0x04 */ J3DMatColorAnm * mMatColorAnm[2]; + /* 0x14 */ J3DTexMtxAnm * mTexMtxAnm[8]; + /* 0x54 */ J3DTexNoAnm * mTexNoAnm[8]; + /* 0xB4 */ J3DTevColorAnm * mTevColorAnm[4]; + /* 0xD4 */ J3DTevKColorAnm * mTevKColorAnm[4]; }; // Size: 0xF4 #endif /* J3DMATERIALANM_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h index 937866341..9acc44d81 100644 --- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h @@ -8,10 +8,9 @@ enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 }; class J3DAnmBase; struct J3DAnmLoaderDataBase { - /* 80337B40 */ static void* load(void const*, J3DAnmLoaderDataBaseFlag); - /* 80338134 */ static void setResource(J3DAnmBase*, void const*); - - static void* load(void const* param_0) { return load(param_0, J3DLOADER_UNK_FLAG0); } + static void* load(void const*, J3DAnmLoaderDataBaseFlag); + static void* load(void const*); + static void setResource(J3DAnmBase*, void const*); }; #endif /* J3DANMLOADER_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index deff8ed97..987a74320 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -3,9 +3,14 @@ #include "dolphin/types.h" +class J3DModelData; +class J3DMaterialTable; + class J3DModelLoaderDataBase { public: - /* 803346BC */ static void* load(void const*, u32); + static J3DModelData* load(void const*, u32); + static J3DModelData* loadBinaryDisplayList(void const*, u32); + static J3DMaterialTable* loadMaterialTable(void const*); }; #endif /* J3DMODELLOADER_H */ diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index aeb763ce9..2a9b091f2 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -6,6 +6,8 @@ #include "global.h" #include "m_Do/m_Do_ext.h" +class ResTIMG; + class dDlst_base_c { public: dDlst_base_c() {} @@ -289,6 +291,9 @@ public: /* 0x00250 */ dDlst_shadowControl_c mShadowControl; /* 0x16078 */ mDoExt_3DlineMatSortPacket m3DLineMatSortPacket[2]; /* 0x160A0 */ dDlst_peekZ_c mPeekZ; + + static ResTIMG * mToonImage; + static ResTIMG * mToonExImage; }; // Size: 0x16234 STATIC_ASSERT(sizeof(dDlst_list_c) == 0x16234); diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 328393fdb..49a5e724b 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -1,6 +1,10 @@ #ifndef D_D_RESORCE_H #define D_D_RESORCE_H +#include "dolphin/types.h" +#include "global.h" +#include "JSystem/JKernel/JKRMemArchive.h" + class JKRArchive; class JKRHeap; class JKRSolidHeap; @@ -12,13 +16,12 @@ public: ~dRes_info_c(); int set(char const*, char const*, u8, JKRHeap*); int loadResource(); - void deleteArchiveRes(); int setRes(JKRArchive*, JKRHeap*); int setRes(); static void dump_long(dRes_info_c*, int); static void dump(dRes_info_c*, int); - void* getRes(u32 resIdx) { return *(mpRes + resIdx); } + void* getRes(u32 resIdx) { return *(mRes + resIdx); } int getCount() { return mCount; } char* getArchiveName() { return mArchiveName; } mDoDvdThd_mountArchive_c* getDMCommand() { return mpDMCommand; } @@ -34,8 +37,8 @@ private: /* 0x10 */ mDoDvdThd_mountArchive_c* mpDMCommand; /* 0x14 */ JKRArchive* mpArchive; /* 0x18 */ JKRHeap* mpParentHeap; - /* 0x1C */ JKRSolidHeap* mpDataHeap; - /* 0x20 */ void** mpRes; + /* 0x1C */ JKRSolidHeap* mDataHeap; + /* 0x20 */ void** mRes; }; // Size: 0x24 STATIC_ASSERT(sizeof(dRes_info_c) == 0x24); diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 1134616e4..f3f98dfb1 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -178,6 +178,17 @@ private: /* 0x4 */ J3DAnmTransform* mAnmTransform; }; // Size: 0x8 +class mDoExt_transAnmBas : public J3DAnmTransformKey { +public: + mDoExt_transAnmBas(void* bas) { mBas = bas; } + virtual ~mDoExt_transAnmBas(); + + void* getBas() { return mBas; } + +private: + /* 0x28 */ void* mBas; +}; + class mDoExt_MtxCalcOldFrame { public: /* 8000F848 */ void initOldFrameMorf(f32, u16, u16); @@ -327,9 +338,12 @@ int mDoExt_getSafeGameHeapSize(); int mDoExt_getSafeZeldaHeapSize(); int mDoExt_getSafeCommandHeapSize(); +s32 mDoExt_resIDToIndex(JKRArchive*, u16); + JKRSolidHeap * mDoExt_createSolidHeapFromGameToCurrent(u32 size, u32 align); +JKRSolidHeap * mDoExt_createSolidHeapToCurrent(u32, JKRHeap *, u32 align); void mDoExt_restoreCurrentHeap(); -void mDoExt_adjustSolidHeap(JKRSolidHeap * pHeap); +u32 mDoExt_adjustSolidHeap(JKRSolidHeap * pHeap); void mDoExt_destroySolidHeap(JKRSolidHeap * pHeap); extern JKRExpHeap* zeldaHeap; diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index be3cd5f49..0c0e51596 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -3,8 +3,25 @@ // Translation Unit: d_resorce.cpp // -#include "d_resorce.h" +#include "d/d_resorce.h" +#include "d/d_bg_s.h" +#include "d/d_com_inf_game.h" #include "m_Do/m_Do_printf.h" +#include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_dvd_thread.h" +#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "JSystem/J3DGraphLoader/J3DClusterLoader.h" +#include "JSystem/J3DGraphLoader/J3DModelLoader.h" +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JKernel/JKRFileFinder.h" +#include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "MSL_C/stdio.h" +#include "MSL_C/string.h" +#include "dolphin/os/OSCache.h" /* 8006D804-8006D824 .text __ct__11dRes_info_cFv */ dRes_info_c::dRes_info_c() @@ -12,8 +29,8 @@ dRes_info_c::dRes_info_c() , mpDMCommand(NULL) , mpArchive(NULL) , mpParentHeap(NULL) - , mpDataHeap(NULL) - , mpRes(NULL) + , mDataHeap(NULL) + , mRes(NULL) { } @@ -23,70 +40,333 @@ dRes_info_c::~dRes_info_c() { delete mpDMCommand; mpDMCommand = NULL; } else if (mpArchive != NULL) { - deleteArchiveRes(); - if (mpDataHeap != NULL) { - mDoExt_destroySolidHeap(mpDataHeap); - mpDataHeap = NULL; - mpArchive->unmount(); + if (mDataHeap != NULL) { + mDoExt_destroySolidHeap(mDataHeap); + mDataHeap = NULL; } - mpRes = NULL; + if (mRes != NULL) + mRes = NULL; + + mpArchive->unmount(); mpArchive = NULL; } } /* 8006D8F4-8006D990 .text set__11dRes_info_cFPCcPCcUcP7JKRHeap */ -int dRes_info_c::set(char const* pArcName, char const* pArcPath, u8 param_2, JKRHeap* pHeap) { +int dRes_info_c::set(char const* pArcName, char const* pArcPath, u8 direction, JKRHeap* pHeap) { char path[40]; - if (*pArcPath != NULL) { - snprintf(path, 40, "%s%s.arc", pArcPath, pArcName); - mDMCommand = mDoDvdThd_mountArchive_c::create(path, param_2, pHeap); + snprintf(path, 40, "%s%s.arc", pArcPath, pArcName); + mpDMCommand = mDoDvdThd_mountArchive_c::create(path, direction, pHeap); - if (mDMCommand == NULL) { - return false; - } - } - strncpy(mArchiveName, pArcName, 10); + if (mpDMCommand == NULL) + return false; + + strncpy(mArchiveName, pArcName, 14); return true; } /* 8006D990-8006DCEC .text setToonTex__FP12J3DModelData */ static void setToonTex(J3DModelData* pModel) { - /* Nonmatching */ + J3DTexture * pTexture = pModel->getTexture(); + if (pTexture != NULL) { + JUTNameTab * pTextureName = pModel->getTextureName(); + if (pTextureName != NULL) { + for (u16 i = 0; i < pTexture->getNum(); i++) { + const char * pName = pTextureName->getName(i); + if (pName[0] == 'Z') { + if (pName[1] == 'A') + pTexture->setResTIMG(i, *dDlst_list_c::mToonImage); + else if (pName[1] == 'B') + pTexture->setResTIMG(i, *dDlst_list_c::mToonExImage); + } + } + + j3dSys.setTexture(pTexture); + + s32 isBDL = (pModel->getJointTree().getModelDataType() == 1); + + for (u16 i = 0; i < pModel->getMaterialNum() ; i++) { + J3DMaterial * pMaterial = pModel->getMaterialNodePointer(i); + J3DTevBlock * pTevBlock = pMaterial->getTevBlock(); + + if (pTevBlock != NULL) { + GXColorS10 * pTev3 = pTevBlock->getTevColor(3); + if (pTev3 != NULL) + pTev3->a = pTevBlock->getTevStageNum(); + + if (isBDL) { + J3DDisplayListObj* pDL = pMaterial->getSharedDisplayListObj(); + BOOL ret = OSDisableInterrupts(); + GDInitGDLObj(&J3DDisplayListObj::sGDLObj, pDL->getDisplayList(0), pDL->getDisplayListSize()); + GDSetCurrent(&J3DDisplayListObj::sGDLObj); + pTevBlock->patchTexNoAndTexCoordScale(); + OSRestoreInterrupts(ret); + GDSetCurrent(NULL); + } + } + } + } + } } /* 8006DCEC-8006DFD4 .text setToonTex__FP16J3DMaterialTable */ -static void setToonTex(J3DMaterialTable* pMaterial) { - /* Nonmatching */ +static void setToonTex(J3DMaterialTable* pMaterialTable) { + J3DTexture * pTexture = pMaterialTable->getTexture(); + if (pTexture != NULL) { + JUTNameTab * pTextureName = pMaterialTable->getTextureName(); + if (pTextureName != NULL) { + for (u16 i = 0; i < pTexture->getNum(); i++) { + const char * pName = pTextureName->getName(i); + if (pName[0] == 'Z') { + if (pName[1] == 'A') + pTexture->setResTIMG(i, *dDlst_list_c::mToonImage); + else if (pName[1] == 'B') + pTexture->setResTIMG(i, *dDlst_list_c::mToonExImage); + } + } + + for (u16 i = 0; i < pMaterialTable->getMaterialNum() ; i++) { + J3DMaterial * pMaterial = pMaterialTable->getMaterialNodePointer(i); + J3DTevBlock * pTevBlock = pMaterial->getTevBlock(); + + if (pTevBlock != NULL) { + GXColorS10 * pTev3 = pTevBlock->getTevColor(3); + if (pTev3 != NULL) + pTev3->a = pTevBlock->getTevStageNum(); + } + } + } + } } /* 8006DFD4-8006E7A4 .text loadResource__11dRes_info_cFv */ -void dRes_info_c::loadResource() { - /* Nonmatching */ -} +int dRes_info_c::loadResource() { + // nonmatching, missing mDoExt_transAnmBas anm case -/* 8006E7A4-8006E7EC .text __dt__13JKRFileFinderFv */ -JKRFileFinder::~JKRFileFinder() { - /* Nonmatching */ -} + JUT_ASSERT(0x254, mRes == 0); -/* 8006E7EC-8006E858 .text __dt__18J3DAnmTransformKeyFv */ -J3DAnmTransformKey::~J3DAnmTransformKey() { - /* Nonmatching */ -} + s32 fileNum = mpArchive->countFile(); + mRes = new void*[fileNum]; + if (mRes == NULL) { + OSReport_Error("<%s.arc> setRes: res pointer buffer nothing !!\n", this); + return -1; + } -/* 8006E858-8006E8B4 .text __dt__15J3DAnmTransformFv */ -J3DAnmTransform::~J3DAnmTransform() { - /* Nonmatching */ -} + static u32 l_readResType[] = { + 'BMD ', + 'BMDM', + 'BMDC', + 'BMDS', + 'BSMD', + 'BMT ', + 'BLS ', + 'BCK ', + 'BPK ', + 'BRK ', + 'BLK ', + 'BTP ', + 'BTK ', + 'BAS ', + 'BDL ', + 'BDLM', + 'BDLC', + 'BDLI', + 'DZB ', + 'DZR ', + 'DZS ', + 'TIM ', + 'MSG ', + 'TEX ', + 'STB ', + 'BCKS', + 'DAT ', + 'BVA ', + 'BMTM', + }; -/* 8006E8B4-8006E8FC .text __dt__10J3DAnmBaseFv */ -J3DAnmBase::~J3DAnmBase() { - /* Nonmatching */ + u32 i = 0; + while (fileNum-- > 0) + mRes[i++] = NULL; + + u32 *pResType = &l_readResType[0]; + for (i = 0; i < ARRAY_SIZE(l_readResType); i++, pResType++) { + JKRArcFinder * pArcFinder = mpArchive->getFirstResource(*pResType); + + for (; pArcFinder->isAvailable(); pArcFinder->findNextFile()) { + void * pRes = JKRArchive::getGlbResource(*pResType, pArcFinder->mEntryName, mpArchive); + if (pRes == NULL) { + OSReport_Error("<%s> res == NULL !!\n", pArcFinder->mEntryName); + continue; + } + + u32 resType = *pResType; + if (resType == 'BMD ') { + pRes = J3DModelLoaderDataBase::load(pRes, 0x51240020); + if (pRes == NULL) + return -1; + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BMDM') { + pRes = J3DModelLoaderDataBase::load(pRes, 0x51240020); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DModelData*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DModelData*)pRes)->getMaterialNodePointer(j); + pMaterial->change(); + + J3DMaterialAnm* pAnm = new J3DMaterialAnm(); + if (pAnm == NULL) + return -1; + pMaterial->setMaterialAnm(pAnm); + } + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BMDC') { + pRes = J3DModelLoaderDataBase::load(pRes, 0x51240020); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DModelData*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DModelData*)pRes)->getMaterialNodePointer(j); + pMaterial->change(); + } + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BMDS') { + pRes = J3DModelLoaderDataBase::load(pRes, 0x00220020); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DModelData*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DModelData*)pRes)->getMaterialNodePointer(j); + pMaterial->change(); + + J3DMaterialAnm* pAnm = new J3DMaterialAnm(); + if (pAnm == NULL) + return -1; + pMaterial->setMaterialAnm(pAnm); + } + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BSMD') { + pRes = J3DModelLoaderDataBase::load(pRes, 0x01020020); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DModelData*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DModelData*)pRes)->getMaterialNodePointer(j); + + J3DMaterialAnm* pAnm = new J3DMaterialAnm(); + if (pAnm == NULL) + return -1; + + pMaterial->setMaterialAnm(pAnm); + } + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BDL ') { + pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x00002020); + if (pRes == NULL) + return -1; + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BDLL') { + pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x00001020); + if (pRes == NULL) + return -1; + } else if (resType == 'BDLM') { + pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x00001020); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DModelData*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DModelData*)pRes)->getMaterialNodePointer(j); + + J3DMaterialAnm* pAnm = new J3DMaterialAnm(); + if (pAnm == NULL) + return -1; + + pMaterial->setMaterialAnm(pAnm); + } + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BDLI') { + pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x01002020); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DModelData*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DModelData*)pRes)->getMaterialNodePointer(j); + + J3DMaterialAnm* pAnm = new J3DMaterialAnm(); + if (pAnm == NULL) + return -1; + pMaterial->setMaterialAnm(pAnm); + } + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BDLC') { + pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x00002020); + if (pRes == NULL) + return -1; + + setToonTex(((J3DModelData*)pRes)); + } else if (resType == 'BLS ') { + pRes = J3DClusterLoaderDataBase::load(pRes); + if (pRes == NULL) + return -1; + } else if (resType == 'BCKS' || resType == 'BCK') { + // TODO + } else if (resType == 'BTP ' || resType == 'BTK ' || resType == 'BPK ' || resType == 'BRK ' || resType == 'BLK ' || resType == 'BVA ') { + pRes = J3DAnmLoaderDataBase::load(pRes); + if (pRes == NULL) + return -1; + } else if (resType == 'BMT ') { + pRes = J3DModelLoaderDataBase::loadMaterialTable(pRes); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DMaterialTable*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DMaterialTable*)pRes)->getMaterialNodePointer(j); + pMaterial->change(); + } + + setToonTex((J3DMaterialTable*)pRes); + } else if (resType == 'BMTM') { + pRes = J3DModelLoaderDataBase::loadMaterialTable(pRes); + if (pRes == NULL) + return -1; + + for (u16 j = 0; j < ((J3DMaterialTable*)pRes)->getMaterialNum(); j++) { + J3DMaterial* pMaterial = ((J3DMaterialTable*)pRes)->getMaterialNodePointer(j); + pMaterial->change(); + + J3DMaterialAnm* pAnm = new J3DMaterialAnm(); + if (pAnm == NULL) + return -1; + pMaterial->setMaterialAnm(pAnm); + } + + setToonTex((J3DMaterialTable*)pRes); + } else if (resType == 'DZB ') { + pRes = cBgS::ConvDzb(pRes); + } + + mRes[pArcFinder->mEntryFileIndex] = pRes; + } + + delete pArcFinder; + } + + return 0; } /* 8006E8FC-8006EBD0 .text setRes__11dRes_info_cFv */ int dRes_info_c::setRes() { + // nonmatching + if (mpArchive == NULL) { if (mpDMCommand == NULL) { return -1; @@ -106,34 +386,66 @@ int dRes_info_c::setRes() { return -1; } if (mpParentHeap != NULL) { - mpParentHeap->lock(); - mpDataHeap = mDoExt_createSolidHeapToCurrent(0, mpParentHeap, 0x20); + mDataHeap = mDoExt_createSolidHeapToCurrent(0, mpParentHeap, 0x20); + JUT_ASSERT(0x3f5, mDataHeap != 0); - int rt = loadResource(); + loadResource(); mDoExt_restoreCurrentHeap(); - mDoExt_adjustSolidHeap(mpDataHeap); - heap->unlock(); - - if (rt < 0) { - return -1; - } + mDoExt_adjustSolidHeap(mDataHeap); } else { - mpDataHeap = mDoExt_createSolidHeapFromGameToCurrent(0, 0); - if (mpDataHeap == NULL) { - OSReport_Error("<%s.arc> mDMCommandsetRes: can't alloc memory\n", mArchiveName); - return -1; + mDataHeap = mDoExt_createSolidHeapFromGameToCurrent(0, 0); + if (mDataHeap == NULL) { + OSReport_Error("<%s.arc> mDMCommandsetRes: can\'t alloc memory\n", this); + return 0xFFFFFFFF; } - int rt = loadResource(); - mDoExt_restoreCurrentHeap(); - mDoExt_adjustSolidHeap(mpDataHeap); - if (rt < 0) { - return -1; + loadResource(); + mDoExt_restoreCurrentHeap(); + + static volatile s32 mode = 1; + static JKRExpHeap::EAllocMode allocMode = JKRExpHeap::ALLOC_MODE_1; + mDoExt_getGameHeap()->setAllocationMode(allocMode); + mode = 2; + + if (mode == 0) { + u32 allocSize = (mDataHeap->getSize() - mpParentHeap->getFreeSize()) + 0x8c; + JKRSolidHeap * pHeap = mDoExt_createSolidHeapFromGameToCurrent(allocSize, 0); + if (pHeap != NULL) { + mDoExt_adjustSolidHeap(mDataHeap); + mRes = NULL; + mDoExt_destroySolidHeap(mDataHeap); + loadResource(); + mDoExt_restoreCurrentHeap(); + mDoExt_adjustSolidHeap(pHeap); + mDataHeap = pHeap; + } else { + mDoExt_adjustSolidHeap(mDataHeap); + } + } else if (mode == 1) { + JKRSolidHeap * pHeap = mDoExt_createSolidHeapFromGameToCurrent(mDoExt_adjustSolidHeap(mDataHeap) + 0x10, 0); + if (pHeap != NULL) { + if (pHeap < mDataHeap) { + mRes = NULL; + mDoExt_destroySolidHeap(mDataHeap); + loadResource(); + mDoExt_adjustSolidHeap(pHeap); + mDataHeap = pHeap; + } else { + mDoExt_destroySolidHeap(pHeap); + } + + mDoExt_restoreCurrentHeap(); + } + } else { + mDoExt_adjustSolidHeap(mDataHeap); } + + JKRExpHeap * pGameHeap = mDoExt_getGameHeap(); + pGameHeap->mAllocMode = 0; } - u32 heapSize = mpDataHeap->getHeapSize(); - void* heapStartAddr = mpDataHeap->getStartAddr(); + u32 heapSize = mDataHeap->getHeapSize(); + void* heapStartAddr = mDataHeap->getStartAddr(); DCStoreRangeNoSync(heapStartAddr, heapSize); } @@ -152,42 +464,118 @@ static SArcHeader* getArcHeader(JKRArchive* pArchive) { return NULL; } +static const char * dump_str = "%5.1f %5x %5.1f %5x %3d %s\n"; + /* 8006EBF8-8006ECF4 .text dump_long__11dRes_info_cFP11dRes_info_ci */ -void dRes_info_c::dump_long(dRes_info_c*, int) { - /* Nonmatching */ +void dRes_info_c::dump_long(dRes_info_c* pRes, int num) { + // regalloc + void* header; + int size; + int heapSize; + JKRArchive * archive; + mDoDvdThd_command_c * command; + + JUTReportConsole_f("dRes_info_c::dump %08x %d\n", pRes, num); + JUTReportConsole_f("No Command Archive ArcHeader(size) SolidHeap(size) Resource Count ArchiveName\n"); + + for (s32 i = 0; i < num; i++) { + s32 refCount = pRes->getCount(); + if (refCount != 0) { + heapSize = JKRHeap::getSize(pRes->mDataHeap, NULL); + size = JKRHeap::getSize(getArcHeader(pRes->getArchive()), NULL); + archive = pRes->getArchive(); + command = pRes->getDMCommand(); + header = getArcHeader(archive); + + JUTReportConsole_f("%2d %08x %08x %08x(%5x) %08x(%5x) %08x %3d %s\n", + i, command, archive, header, size, pRes->mDataHeap, + heapSize, pRes->mRes, refCount, pRes->getArchiveName()); + } + pRes++; + } } /* 8006ECF4-8006EE6C .text dump__11dRes_info_cFP11dRes_info_ci */ -void dRes_info_c::dump(dRes_info_c*, int) { - /* Nonmatching */ +void dRes_info_c::dump(dRes_info_c* pRes, int num) { + // sda + int totalArcHeaderSize; + int totalHeapSize; + int arcHeaderSize; + int heapSize; + char* archiveName; + JUTReportConsole_f("dRes_info_c::dump %08x %d\n", pRes, num); + JUTReportConsole_f("No ArchiveSize(KB) SolidHeapSize(KB) Cnt ArchiveName\n"); + totalArcHeaderSize = 0; + totalHeapSize = 0; + for (int i = 0; i < num; i++) { + if (pRes->getCount()) { + arcHeaderSize = JKRGetMemBlockSize(NULL, getArcHeader(pRes->getArchive())); + heapSize = JKRGetMemBlockSize(NULL, pRes->mDataHeap); + archiveName = pRes->getArchiveName(); + JUTReportConsole_f("%2d %6.1f %6x %6.1f %6x %3d %s\n", i, arcHeaderSize / 1024.0f, + arcHeaderSize, heapSize / 1024.0f, heapSize, pRes->getCount(), + archiveName); + totalArcHeaderSize += arcHeaderSize; + totalHeapSize += heapSize; + } + pRes++; + } + JUTReportConsole_f( + "----------------------------------------------\n %6.1f %6x %6.1f %6x Total\n\n", + totalArcHeaderSize / 1024.0f, totalArcHeaderSize, totalHeapSize / 1024.0f, totalHeapSize); } /* 8006EE6C-8006EF34 .text __dt__14dRes_control_cFv */ dRes_control_c::~dRes_control_c() { - /* Nonmatching */ + for (s32 i = 0; i < (s32)ARRAY_SIZE(mObjectInfo); i++) + mObjectInfo[i].~dRes_info_c(); + for (s32 i = 0; i < (s32)ARRAY_SIZE(mStageInfo); i++) + mStageInfo[i].~dRes_info_c(); } /* 8006EF34-8006F01C .text setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap */ -void dRes_control_c::setRes(const char*, dRes_info_c*, int, const char*, unsigned char, JKRHeap*) { - /* Nonmatching */ +int dRes_control_c::setRes(const char* pArcName, dRes_info_c* pInfoArr, int infoNum, const char* pArcPath, u8 direction, JKRHeap* pHeap) { + // small regalloc issue + + dRes_info_c * pInfo = getResInfo(pArcName, pInfoArr, infoNum); + + if (pInfo == NULL) { + pInfo = newResInfo(pInfoArr, infoNum); + if (pInfo == NULL) { + OSReport_Error("<%s.arc> dRes_control_c::setRes: 空きリソース情報ポインタがありません\n", pInfo); + pInfo->~dRes_info_c(); + return FALSE; + } + + if (!pInfo->set(pArcName, pArcPath, direction, pHeap)) { + OSReport_Error("<%s.arc> dRes_control_c::setRes: res info set error !!\n", pInfo); + pInfo->~dRes_info_c(); + return FALSE; + } + } + + pInfo->incCount(); + return TRUE; } /* 8006F01C-8006F074 .text syncRes__14dRes_control_cFPCcP11dRes_info_ci */ -int dRes_control_c::syncRes(char const* arcName, dRes_info_c* pInfo, int infoSize) { - dRes_info_c* resInfo = getResInfo(arcName, pInfo, infoSize); +int dRes_control_c::syncRes(char const* pArcName, dRes_info_c* pInfo, int infoNum) { + dRes_info_c* resInfo = getResInfo(pArcName, pInfo, infoNum); if (resInfo == NULL) { - return -1; + OSReport_Error("<%s.arc> syncRes: リソース未登録!!\n", pArcName); + return 1; } else { return resInfo->setRes(); } } /* 8006F074-8006F0E8 .text deleteRes__14dRes_control_cFPCcP11dRes_info_ci */ -int dRes_control_c::deleteRes(char const* arcName, dRes_info_c* pInfo, int infoSize) { - dRes_info_c* resInfo = getResInfo(arcName, pInfo, infoSize); +int dRes_control_c::deleteRes(char const* pArcName, dRes_info_c* pInfo, int infoNum) { + dRes_info_c* resInfo = getResInfo(pArcName, pInfo, infoNum); if (resInfo == NULL) { + OSReport_Error("<%s.arc> deleteRes: res nothing !!\n(未登録のリソースを削除してるのを発見しました！修正してください。)\n", pArcName); return 0; } else { if (resInfo->decCount() == 0) { @@ -198,21 +586,20 @@ int dRes_control_c::deleteRes(char const* arcName, dRes_info_c* pInfo, int infoS } /* 8006F0E8-8006F164 .text getResInfo__14dRes_control_cFPCcP11dRes_info_ci */ -dRes_info_c* dRes_control_c::getResInfo(char const* pArcName, dRes_info_c* pResInfo, int infoSize) { - for (int i = 0; i < infoSize; i++) { - if (pResInfo->getCount() != 0) { - if (!stricmp(pArcName, pResInfo->getArchiveName())) { +dRes_info_c* dRes_control_c::getResInfo(char const* pArcName, dRes_info_c* pResInfo, int infoNum) { + for (s32 i = 0; i < infoNum; i++) { + if (pResInfo->getCount() != 0) + if (!strcmp(pArcName, pResInfo->getArchiveName())) return pResInfo; - } - } pResInfo++; } + return NULL; } /* 8006F164-8006F18C .text newResInfo__14dRes_control_cFP11dRes_info_ci */ -dRes_info_c* dRes_control_c::newResInfo(dRes_info_c* pResInfo, int infoSize) { - for (int i = 0; i < infoSize; i++) { +dRes_info_c* dRes_control_c::newResInfo(dRes_info_c* pResInfo, int infoNum) { + for (int i = 0; i < infoNum; i++) { if (pResInfo->getCount() == 0) { return pResInfo; } @@ -222,31 +609,32 @@ dRes_info_c* dRes_control_c::newResInfo(dRes_info_c* pResInfo, int infoSize) { } /* 8006F18C-8006F208 .text getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci */ -dRes_info_c* dRes_control_c::getResInfoLoaded(char const* arcName, dRes_info_c* pResInfo, - int infoSize) { - dRes_info_c* resInfo = getResInfo(arcName, pResInfo, infoSize); +dRes_info_c* dRes_control_c::getResInfoLoaded(char const* pArcName, dRes_info_c* pResInfo, + int infoNum) { + dRes_info_c* resInfo = getResInfo(pArcName, pResInfo, infoNum); if (resInfo == NULL) { + OSReport_Error("<%s.arc> getRes: res nothing !!\n", pArcName); resInfo = NULL; } else if (resInfo->getArchive() == NULL) { - OSReport_Warning("<%s.arc> getRes: res during reading !!\n", arcName); + OSReport_Error("<%s.arc> getRes: res during reading !!\n", pArcName); resInfo = NULL; } return resInfo; } /* 8006F208-8006F298 .text getRes__14dRes_control_cFPCclP11dRes_info_ci */ -void* dRes_control_c::getRes(char const* arcName, s32 resIdx, dRes_info_c* pInfo, int infoSize) { - dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); +void* dRes_control_c::getRes(char const* pArcName, s32 resIdx, dRes_info_c* pInfo, int infoNum) { + dRes_info_c* resInfo = getResInfoLoaded(pArcName, pInfo, infoNum); - if (resInfo == NULL) { + if (resInfo == NULL) return resInfo; - } + JKRArchive* archive = resInfo->getArchive(); u32 fileCount = archive->countFile(); if (resIdx >= (int)fileCount) { - OSReport_Error("<%s.arc> getRes: res index over !! index=%d count=%d\n", arcName, resIdx, + OSReport_Error("<%s.arc> getRes: res index over !! index=%d count=%d\n", pArcName, resIdx, fileCount); return NULL; } @@ -254,33 +642,35 @@ void* dRes_control_c::getRes(char const* arcName, s32 resIdx, dRes_info_c* pInfo } /* 8006F298-8006F34C .text getRes__14dRes_control_cFPCcPCcP11dRes_info_ci */ -void* dRes_control_c::getRes(char const* arcName, char const* resName, dRes_info_c* pInfo, int infoSize) { - dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); +void* dRes_control_c::getRes(char const* pArcName, char const* resName, dRes_info_c* pInfo, int infoNum) { + dRes_info_c* resInfo = getResInfoLoaded(pArcName, pInfo, infoNum); - if (resInfo == NULL) { + if (resInfo == NULL) return resInfo; + + s32 fileNum = resInfo->getArchive()->countFile(); + for (s32 i = 0; i < fileNum; i++) { + if (resInfo->getRes(i) != NULL) { + JKRArchive::SDirEntry dirEntry; + resInfo->getArchive()->getDirEntry(&dirEntry, i); + if (strcmp(resName, dirEntry.name) == 0) + return resInfo->getRes(i); + } } - JKRArchive* archive = resInfo->getArchive(); - JKRArchive::SDIFileEntry* entry = archive->findNameResource(resName); - - if (entry != NULL) { - return resInfo->getRes(entry - archive->mFiles); - } else { - return NULL; - } + return NULL; } /* 8006F34C-8006F3BC .text getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci */ -void* dRes_control_c::getIDRes(char const* arcName, u16 param_1, dRes_info_c* pInfo, int infoSize) { - dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); +void* dRes_control_c::getIDRes(char const* pArcName, u16 param_1, dRes_info_c* pInfo, int infoNum) { + dRes_info_c* resInfo = getResInfoLoaded(pArcName, pInfo, infoNum); if (resInfo == NULL) { return resInfo; } JKRArchive* archive = resInfo->getArchive(); - int index = mDoExt_resIDToIndex(archive, param_1); + s32 index = mDoExt_resIDToIndex(archive, param_1); if (index < 0) { return 0; @@ -290,8 +680,8 @@ void* dRes_control_c::getIDRes(char const* arcName, u16 param_1, dRes_info_c* pI } /* 8006F3BC-8006F430 .text syncAllRes__14dRes_control_cFP11dRes_info_ci */ -int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoSize) { - for (int i = 0; i < infoSize; i++) { +int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoNum) { + for (int i = 0; i < infoNum; i++) { if (pInfo->getDMCommand() != NULL && pInfo->setRes() > 0) { return 1; } @@ -301,10 +691,19 @@ int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoSize) { } /* 8006F430-8006F500 .text setStageRes__14dRes_control_cFPCcP7JKRHeap */ -int dRes_control_c::setStageRes(char const* arcName, JKRHeap* pHeap) { +int dRes_control_c::setStageRes(char const* pArcName, JKRHeap* pHeap) { + // very strange ordering of loads for the snprintf call + + bool special = false; + + if (strcmp(dComIfGp_getStartStageName(), "ma2room") == 0 && dComIfGs_isEventBit(0x1820)) + special = true; + + const char *fmt = "/res/Stage/%s/"; + char path[20]; - snprintf(path, 20, "/res/Stage/%s/", dComIfGp_getStartStageName()); - return setRes(arcName, &mStageInfo[0], 0x40, path, 1, pHeap); + snprintf(path, sizeof(path), fmt, special ? "ma3room" : dComIfGp_getStartStageName()); + return setRes(pArcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo), path, 1, pHeap); } /* 8006F500-8006F580 .text dump__14dRes_control_cFv */ @@ -317,13 +716,3 @@ void dRes_control_c::dump() { dRes_info_c::dump(&mStageInfo[0], ARRAY_SIZE(mStageInfo)); dRes_info_c::dump_long(&mStageInfo[0], ARRAY_SIZE(mStageInfo)); } - -/* 8006F580-8006F5FC .text __dt__18mDoExt_transAnmBasFv */ -mDoExt_transAnmBas::~mDoExt_transAnmBas() { - /* Nonmatching */ -} - -/* 8006F5FC-8006F62C .text getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo */ -void J3DAnmTransformKey::getTransform(unsigned short, J3DTransformInfo*) const { - /* Nonmatching */ -} diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index df949da9a..66b2d8eeb 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -764,7 +764,7 @@ void mDoExt_createSolidHeapFromGameToCurrent(unsigned long, unsigned long) { } /* 80011D0C-80011D48 .text mDoExt_adjustSolidHeap__FP12JKRSolidHeap */ -void mDoExt_adjustSolidHeap(JKRSolidHeap*) { +u32 mDoExt_adjustSolidHeap(JKRSolidHeap*) { /* Nonmatching */ }