diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-30 14:23:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-30 15:23:42 -0700 |
| commit | a6e76c0841cae03cae0c0e6ac75c32f979043093 (patch) | |
| tree | 76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | |
| parent | 434415337d268e405b09f6b72935a7e918e4cfe7 (diff) | |
project cleanup (#2895)
* some wii OS fixes
* remove old dol2asm comments
* remove dol2asm.h
* remove function address comments
* normalize ATTRIBUTE_ALIGN usage
* DECL_WEAK macro
* fix gcc attribute weak macro
* wrap more mwcc specific things in ifdefs
* fixes
* fix revo sdk version flags
* fixes
Diffstat (limited to 'src/JSystem/J3DGraphLoader/J3DModelLoader.cpp')
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 403bee5c42..49b0bd5887 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -1,8 +1,3 @@ -// -// Generated By: dol2asm -// Translation Unit: J3DModelLoader -// - #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DGraphLoader/J3DModelLoader.h" @@ -17,7 +12,6 @@ #include "JSystem/JSupport/JSupport.h" #include "dolphin/os.h" -/* 8033468C-803346BC 32EFCC 0030+00 1/1 0/0 0/0 .text __ct__14J3DModelLoaderFv */ J3DModelLoader::J3DModelLoader() : mpModelData(NULL), mpMaterialTable(NULL), @@ -29,7 +23,6 @@ J3DModelLoader::J3DModelLoader() : /* empty function */ } -/* 803346BC-803347E0 32EFFC 0124+00 0/0 4/4 0/0 .text load__22J3DModelLoaderDataBaseFPCvUl */ J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) { if (i_data == NULL) { return NULL; @@ -48,7 +41,6 @@ J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) { return NULL; } -/* 803347E0-80334ABC 32F120 02DC+00 4/1 0/0 0/0 .text load__14J3DModelLoaderFPCvUl */ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) { JKRGetCurrentHeap()->getTotalFreeSize(); mpModelData = new J3DModelData(); @@ -107,7 +99,6 @@ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) { } -/* 80334ABC-80334C20 32F3FC 0164+00 3/0 0/0 0/0 .text loadMaterialTable__14J3DModelLoaderFPCv */ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) { mpMaterialTable = new J3DMaterialTable(); mpMaterialTable->clear(); @@ -136,8 +127,6 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) { return mpMaterialTable; } -/* 80334C20-80334EE0 32F560 02C0+00 3/0 0/0 0/0 .text - * loadBinaryDisplayList__14J3DModelLoaderFPCvUl */ J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_flags) { mpModelData = new J3DModelData(); mpModelData->clear(); @@ -200,8 +189,6 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_fl return mpModelData; } -/* 80334EE0-80335048 32F820 0168+00 3/0 0/0 0/0 .text setupBBoardInfo__14J3DModelLoaderFv - */ void J3DModelLoader::setupBBoardInfo() { for (u16 i = 0; i < mpModelData->getJointNum(); i++) { J3DMaterial* mesh = mpModelData->getJointNodePointer(i)->getMesh(); @@ -240,8 +227,6 @@ void J3DModelLoader::setupBBoardInfo() { } } -/* 80335048-803351A4 32F988 015C+00 2/2 0/0 0/0 .text - * readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl */ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_flags) { mpModelData->mFlags = i_flags | i_block->mFlags; mpModelData->getJointTree().setFlag(mpModelData->mFlags); @@ -263,7 +248,6 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla mpModelData->setHierarchy(JSUConvertOffsetToPtr<J3DModelHierarchy>(i_block, i_block->mpHierarchy)); } -/* 803351A4-803351D0 32FAE4 002C+00 1/1 0/0 0/0 .text getFmtType__FP17_GXVtxAttrFmtList7_GXAttr */ static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) { for (; i_fmtList->attr != GX_VA_NULL; i_fmtList++) { if (i_fmtList->attr == i_attr) { @@ -273,8 +257,6 @@ static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) { return GX_F32; } -/* 803351D0-803353F0 32FB10 0220+00 2/2 0/0 0/0 .text - * readVertex__14J3DModelLoaderFPC14J3DVertexBlock */ void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) { J3DVertexData& vertex_data = mpModelData->getVertexData(); vertex_data.mVtxAttrFmtList = @@ -333,8 +315,6 @@ void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) { } } -/* 803353F0-80335480 32FD30 0090+00 2/2 0/0 0/0 .text - * readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock */ void J3DModelLoader::readEnvelop(J3DEnvelopeBlock const* i_block) { mpModelData->getJointTree().mWEvlpMtxNum = i_block->mWEvlpMtxNum; mpModelData->getJointTree().mWEvlpMixMtxNum = @@ -347,8 +327,6 @@ void J3DModelLoader::readEnvelop(J3DEnvelopeBlock const* i_block) { JSUConvertOffsetToPtr<Mtx>(i_block, i_block->mpInvJointMtx); } -/* 80335480-80335530 32FDC0 00B0+00 2/2 0/0 0/0 .text readDraw__14J3DModelLoaderFPC12J3DDrawBlock - */ void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) { J3DJointTree& joint_tree = mpModelData->getJointTree(); joint_tree.mDrawMtxData.mEntryNum = i_block->mMtxNum - mpModelData->getJointTree().mWEvlpMtxNum; @@ -365,8 +343,6 @@ void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) { } -/* 80335530-80335614 32FE70 00E4+00 2/2 0/0 0/0 .text - * readJoint__14J3DModelLoaderFPC13J3DJointBlock */ void J3DModelLoader::readJoint(J3DJointBlock const* i_block) { J3DJointFactory factory(*i_block); mpModelData->getJointTree().mJointNum = i_block->mJointNum; @@ -383,8 +359,6 @@ void J3DModelLoader::readJoint(J3DJointBlock const* i_block) { } } -/* 80335614-80335890 32FF54 027C+00 1/0 0/0 0/0 .text - * readMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_flags) { J3DMaterialFactory factory(*i_block); mpMaterialTable->mMaterialNum = i_block->mMaterialNum; @@ -427,8 +401,6 @@ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_fla } } -/* 80335890-80335AF4 3301D0 0264+00 1/0 0/0 0/0 .text - * readMaterial_v21__18J3DModelLoader_v21FPC20J3DMaterialBlock_v21Ul */ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u32 i_flags) { J3DMaterialFactory_v21 factory(*i_block); mpMaterialTable->mMaterialNum = i_block->mMaterialNum; @@ -468,8 +440,6 @@ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u } } -/* 80335AF4-80335C18 330434 0124+00 2/2 0/0 0/0 .text - * readShape__14J3DModelLoaderFPC13J3DShapeBlockUl */ void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) { mpShapeBlock = i_block; J3DShapeTable* shape_table = mpModelData->getShapeTable(); @@ -494,8 +464,6 @@ void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) { } } -/* 80335C18-80335CE4 330558 00CC+00 2/2 0/0 0/0 .text - * readTexture__14J3DModelLoaderFPC15J3DTextureBlock */ void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) { u16 texture_num = i_block->mTextureNum; ResTIMG* texture_res = JSUConvertOffsetToPtr<ResTIMG>(i_block, i_block->mpTextureRes); @@ -508,8 +476,6 @@ void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) { mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res); } -/* 80335CE4-80335E20 330624 013C+00 1/0 0/0 0/0 .text - * readMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */ void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32 i_flags) { J3DMaterialFactory factory(*i_block); mpMaterialTable->mMaterialNum = i_block->mMaterialNum; @@ -530,8 +496,6 @@ void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32 } } -/* 80335E20-80335F5C 330760 013C+00 1/0 0/0 0/0 .text - * readMaterialTable_v21__18J3DModelLoader_v21FPC20J3DMaterialBlock_v21Ul */ void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_block, u32 i_flags) { J3DMaterialFactory_v21 factory(*i_block); mpMaterialTable->mMaterialNum = i_block->mMaterialNum; @@ -552,8 +516,6 @@ void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_blo } } -/* 80335F5C-80336028 33089C 00CC+00 1/1 0/0 0/0 .text - * readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock */ void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) { u16 texture_num = i_block->mTextureNum; ResTIMG* texture_res = JSUConvertOffsetToPtr<ResTIMG>(i_block, i_block->mpTextureRes); @@ -566,8 +528,6 @@ void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) { mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res); } -/* 80336028-80336168 330968 0140+00 1/1 0/0 0/0 .text - * readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl */ void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_flags) { J3DMaterialFactory factory(*i_block); mpMaterialTable->mMaterialNum = i_block->mMaterialNum; @@ -588,8 +548,6 @@ void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_ } } -/* 80336168-8033631C 330AA8 01B4+00 1/1 0/0 0/0 .text - * readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl */ void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_flags) { J3DMaterialFactory factory(*i_block); s32 flags; @@ -623,8 +581,6 @@ void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_fla } } -/* 8033631C-80336398 330C5C 007C+00 1/1 0/0 0/0 .text modifyMaterial__14J3DModelLoaderFUl - */ void J3DModelLoader::modifyMaterial(u32 i_flags) { if (i_flags & 0x2000) { J3DMaterialFactory factory(*mpMaterialBlock); |
