diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-02-10 11:20:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-10 21:20:42 +0200 |
| commit | 2453c0e3333157090e839eeab768d19b6a2b0ba1 (patch) | |
| tree | f51d7bcca7a8227966fc05ee7ef25cd508075a4c /src/JSystem/J3DGraphLoader | |
| parent | 6c24ff192933300faf555f1411e03432c751afe5 (diff) | |
copy dolsdk2004 to tp / b_bh + e_mb done (#2299)
* move dolsdk2004 over
* cleanup some temp work
* finish and cleanup gf
* b_bh done
* d_a_e_mb done
Diffstat (limited to 'src/JSystem/J3DGraphLoader')
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 6 | ||||
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 1 | ||||
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index a306d5427f..d35577179b 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -263,9 +263,9 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla /* 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->mAttrib != GX_VA_NULL; i_fmtList++) { - if (i_fmtList->mAttrib == i_attr) { - return i_fmtList->mCompType; + for (; i_fmtList->attr != GX_VA_NULL; i_fmtList++) { + if (i_fmtList->attr == i_attr) { + return i_fmtList->type; } } return GX_F32; diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index 06ce608403..3926a26753 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -11,6 +11,7 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/JSupport/JSupport.h" #include "dolphin/os.h" +#include "global.h" /* 80336794-803367D4 3310D4 0040+00 0/0 3/0 0/0 .text countMaterialNum__14J3DModelLoaderFPCv */ diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 3db0f75b40..898b9201e2 100644 --- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -8,6 +8,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSupport.h" #include "dolphin/os.h" +#include "global.h" /* 80337350-80337400 331C90 00B0+00 0/0 2/2 0/0 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */ J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) { |