mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-04 02:09:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

J3DModelLoaderCalcSize OK

Browse Source
This commit is contained in:
LagoLunatic
2024-01-08 17:29:55 -05:00
parent be6791f68f
commit 9283694f14
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -895,7 +895,7 @@ config.libs = [
Object(NonMatching, "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DModelLoader.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"),
src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+6 -8
View File
@@ -100,23 +100,21 @@ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* i_data) {
/* 802FDB0C-802FDD28 .text calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl */
u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* i_data, u32 i_flags) {
/* Nonmatching - regalloc */
u32 i;
u32 size = 0;
const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data;
const JUTDataBlockHeader* block = &header->mFirstBlock;
i = 0;
u32 i = 0;
size += sizeof(J3DModelData);
for (; i < header->mBlockNum; i++) {
switch (block->mType) {
case 'INF1':
size += calcSizeInformation((const J3DModelInfoBlock*)block, i_flags);
size += calcSizeInformation((const J3DModelInfoBlock*)block, (u32)i_flags);
break;
case 'JNT1':
size += calcSizeJoint((const J3DJointBlock*)block);
break;
case 'SHP1':
size += calcSizeShape((const J3DShapeBlock*)block, i_flags);
size += calcSizeShape((const J3DShapeBlock*)block, (u32)i_flags);
break;
case 'TEX1':
size += calcSizeTexture((const J3DTextureBlock*)block);
@@ -128,9 +126,9 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* i_data, u32 i_flag
break;
case 'MAT3':
u32 matFlags = 0x50100000;
matFlags |= i_flags & 0x03000000;
mpMaterialBlock = (J3DMaterialBlock*)block;
u32 matType = getBdlFlag_MaterialType(i_flags);
matFlags |= (u32)i_flags & 0x03000000;
mpMaterialBlock = (const J3DMaterialBlock*)block;
u32 matType = getBdlFlag_MaterialType((u32)i_flags);
if (matType == 0) {
field_0x18 = 1;
size += calcSizeMaterial((const J3DMaterialBlock*)block, matFlags);