diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-01-03 22:29:23 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-01-03 22:29:23 -0500 |
| commit | 5c6e6213fb042de489efcc45c1410cc8cc93d5a1 (patch) | |
| tree | f8c5dc1d3f7eeac66a2dad8147cbe6e1dd2ed75d /src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | |
| parent | 512cf5512fa27d956b4afed3987602c88fc42cc2 (diff) | |
Rename JUTDataBlockHeader
Diffstat (limited to 'src/JSystem/J3DGraphLoader/J3DModelLoader.cpp')
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 4d9defe9..8643dd7e 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -18,7 +18,7 @@ J3DModelData* J3DModelLoaderDataBase::load(const void* i_data, u32 i_flags) { if (i_data == NULL) { return NULL; } - const JSystemFileHeader* fileHeader = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (const JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D1' && fileHeader->mType == 'bmd1') { return NULL; } @@ -38,7 +38,7 @@ J3DMaterialTable* J3DModelLoaderDataBase::loadMaterialTable(const void* i_data) if (!i_data) { return NULL; } - const JSystemFileHeader* fileHeader = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (const JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D2' && fileHeader->mType == 'bmt3') { J3DModelLoader_v26 loader; return loader.loadMaterialTable(i_data); @@ -51,7 +51,7 @@ J3DModelData* J3DModelLoaderDataBase::loadBinaryDisplayList(const void* i_data, if (!i_data) { return NULL; } - const JSystemFileHeader* fileHeader = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (const JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D2' && (fileHeader->mType == 'bdl3' || fileHeader->mType == 'bdl4')) { J3DModelLoader_v26 loader; return loader.loadBinaryDisplayList(i_data, i_flags); @@ -67,8 +67,8 @@ J3DModelData* J3DModelLoader::load(const void* i_data, u32 i_flags) { mpModelData->mpRawData = i_data; mpModelData->setModelDataType(0); mpMaterialTable = &mpModelData->mMaterialTable; - const JSystemFileHeader* data = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &data->mFirstBlock; + const JUTDataFileHeader* data = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &data->mFirstBlock; for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) { switch (block->mType) { case 'INF1': @@ -120,8 +120,8 @@ J3DModelData* J3DModelLoader::load(const void* i_data, u32 i_flags) { J3DMaterialTable* J3DModelLoader::loadMaterialTable(const void* i_data) { mpMaterialTable = new J3DMaterialTable(); mpMaterialTable->clear(); - const JSystemFileHeader* data = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &data->mFirstBlock; + const JUTDataFileHeader* data = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &data->mFirstBlock; for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) { switch (block->mType) { case 'MAT3': @@ -152,8 +152,8 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(const void* i_data, u32 i_fl mpModelData->mpRawData = i_data; mpModelData->setModelDataType(1); mpMaterialTable = &mpModelData->mMaterialTable; - const JSystemFileHeader* data = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &data->mFirstBlock; + const JUTDataFileHeader* data = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &data->mFirstBlock; for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) { switch (block->mType) { case 'INF1': |