diff options
Diffstat (limited to 'src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp')
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 77 |
1 files changed, 5 insertions, 72 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index d1ede78221..c53246008e 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -11,54 +11,7 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/JSupport/JSupport.h" #include "dolphin/os.h" -#include "dol2asm.h" -// -// Forward References: -// - -extern "C" void countMaterialNum__14J3DModelLoaderFPCv(); -extern "C" void calcLoadSize__14J3DModelLoaderFPCvUl(); -extern "C" void calcLoadMaterialTableSize__14J3DModelLoaderFPCv(); -extern "C" void calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl(); -extern "C" void calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl(); -extern "C" void calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock(); -extern "C" void calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock(); -extern "C" void calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock(); -extern "C" void calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl(); -extern "C" void calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl(); -extern "C" void calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock(); -extern "C" void calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl(); -extern "C" void calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock(); -extern "C" void calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl(); -extern "C" void calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl(); -extern "C" extern char const* const J3DModelLoaderCalcSize__stringBase0; - -// -// External References: -// - -extern "C" void __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock(); -extern "C" void __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock(); -extern "C" void countUniqueMaterials__18J3DMaterialFactoryFv(); -extern "C" void -calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl(); -extern "C" void func_8033674C(void* _this, void const*, void const*); -extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock(); -extern "C" void calcSize__15J3DShapeFactoryFiUl(); -extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); - -// -// Declarations: -// /* 80336794-803367D4 3310D4 0040+00 0/0 3/0 0/0 .text countMaterialNum__14J3DModelLoaderFPCv */ u16 J3DModelLoader::countMaterialNum(const void* stream) { @@ -73,18 +26,8 @@ u16 J3DModelLoader::countMaterialNum(const void* stream) { return 0; } -/* ############################################################################################## */ -/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0"; -#pragma pop - /* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */ -// size load issue. -#ifdef NONMATCHING +// NONMATCHING size load issue u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) { int flags = flags_; const J3DModelFileData* header = static_cast<const J3DModelFileData*>(stream); @@ -128,11 +71,6 @@ u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) { } return size; } -#else -u32 J3DModelLoader::calcLoadSize(void const* param_0, u32 param_1) { - // NONMATCHING -} -#endif /* 803369A0-80336A98 3312E0 00F8+00 0/0 3/0 0/0 .text * calcLoadMaterialTableSize__14J3DModelLoaderFPCv */ @@ -176,13 +114,13 @@ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) { /* 80336A98-80336CD8 3313D8 0240+00 0/0 3/0 0/0 .text * calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl */ -// flags issue -#ifdef NONMATCHING +// NONMATCHING flags issue u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) { const J3DModelFileData* header = (const J3DModelFileData*)stream; const J3DModelBlock* nextBlock = header->mBlocks; u32 i = 0; u32 matFlags = flags & (J3DMLF_Material_UseIndirect | J3DMLF_26); + u32 flags2; int size = sizeof(J3DModelData); for (; i < header->mBlockNum; i++) { switch (nextBlock->mBlockType) { @@ -204,7 +142,7 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) case 'MAT2': break; case 'MAT3': - u32 flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn); + flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn); flags2 |= matFlags; mpMaterialBlock = (const J3DMaterialBlock*)nextBlock; if ((flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc)) == 0) { @@ -231,11 +169,6 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) } return size; } -#else -u32 J3DModelLoader::calcLoadBinaryDisplayListSize(void const* param_0, u32 param_1) { - // NONMATCHING -} -#endif /* 80336CD8-80336D64 331618 008C+00 2/2 0/0 0/0 .text * calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl */ @@ -404,4 +337,4 @@ u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flag return size; } -/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
\ No newline at end of file +/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ |