isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-15 04:31:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Further names for unknowns

Browse Source
This commit is contained in:
Fabian Neundorf 2025-05-01 14:42:27 +02:00 committed by Florian Kaiser
parent c0bf0df33e
commit 1baaad3da0
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/legoworldpresenter.h
View File

@ -50,10 +50,10 @@ class LegoWorldPresenter : public LegoEntityPresenter {
// LegoWorldPresenter::`scalar deleting destructor' // LegoWorldPresenter::`scalar deleting destructor'
private: private:
MxResult FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile); MxResult LoadWorldPart(ModelDbPart& p_part, FILE* p_wdbFile);
MxResult FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world); MxResult LoadWorldModel(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world);
undefined4 m_unk0x50; undefined4 m_maxObjectId;
}; };
#endif // LEGOWORLDPRESENTER_H #endif // LEGOWORLDPRESENTER_H

28
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@ -46,7 +46,7 @@ void LegoWorldPresenter::configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQ
// FUNCTION: LEGO1 0x100665c0 // FUNCTION: LEGO1 0x100665c0
LegoWorldPresenter::LegoWorldPresenter() LegoWorldPresenter::LegoWorldPresenter()
{ {
m_unk0x50 = 50000; m_maxObjectId = 50000;
} }
// FUNCTION: LEGO1 0x10066770 // FUNCTION: LEGO1 0x10066770
@ -261,7 +261,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
while (cursor.Next(part)) { while (cursor.Next(part)) {
if (GetViewLODListManager()->Lookup(part->m_roiName.GetData()) == NULL && if (GetViewLODListManager()->Lookup(part->m_roiName.GetData()) == NULL &&
FUN_10067360(*part, wdbFile) != SUCCESS) { LoadWorldPart(*part, wdbFile) != SUCCESS) {
return FAILURE; return FAILURE;
} }
} }
@ -287,15 +287,15 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
} }
else if (g_legoWorldPresenterQuality <= 1 && !strnicmp(worlds[i].m_models[j].m_modelName, "haus", 4)) { else if (g_legoWorldPresenterQuality <= 1 && !strnicmp(worlds[i].m_models[j].m_modelName, "haus", 4)) {
if (worlds[i].m_models[j].m_modelName[4] == '3') { if (worlds[i].m_models[j].m_modelName[4] == '3') {
if (FUN_100674b0(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
if (FUN_100674b0(worlds[i].m_models[j - 2], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j - 2], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
if (FUN_100674b0(worlds[i].m_models[j - 1], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j - 1], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
} }
@ -303,7 +303,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
continue; continue;
} }
if (FUN_100674b0(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
} }
@ -314,7 +314,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
} }
// FUNCTION: LEGO1 0x10067360 // FUNCTION: LEGO1 0x10067360
MxResult LegoWorldPresenter::FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile) MxResult LegoWorldPresenter::LoadWorldPart(ModelDbPart& p_part, FILE* p_wdbFile)
{ {
MxResult result; MxResult result;
MxU8* buff = new MxU8[p_part.m_partDataLength]; MxU8* buff = new MxU8[p_part.m_partDataLength];
@ -340,17 +340,17 @@ MxResult LegoWorldPresenter::FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile)
} }
// FUNCTION: LEGO1 0x100674b0 // FUNCTION: LEGO1 0x100674b0
MxResult LegoWorldPresenter::FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world) MxResult LegoWorldPresenter::LoadWorldModel(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world)
{ {
MxU8* buff = new MxU8[p_model.m_unk0x04]; MxU8* buff = new MxU8[p_model.m_modelDataLength];
fseek(p_wdbFile, p_model.m_unk0x08, SEEK_SET); fseek(p_wdbFile, p_model.m_modelDataOffset, SEEK_SET);
if (fread(buff, p_model.m_unk0x04, 1, p_wdbFile) != 1) { if (fread(buff, p_model.m_modelDataLength, 1, p_wdbFile) != 1) {
return FAILURE; return FAILURE;
} }
MxDSChunk chunk; MxDSChunk chunk;
chunk.SetLength(p_model.m_unk0x04); chunk.SetLength(p_model.m_modelDataLength);
chunk.SetData(buff); chunk.SetData(buff);
MxDSAction action; MxDSAction action;
@ -359,8 +359,8 @@ MxResult LegoWorldPresenter::FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile
action.SetDirection(p_model.m_direction); action.SetDirection(p_model.m_direction);
action.SetUp(p_model.m_up); action.SetUp(p_model.m_up);
MxU32 objectId = m_unk0x50; MxU32 objectId = m_maxObjectId;
m_unk0x50++; m_maxObjectId++;
action.SetObjectId(objectId); action.SetObjectId(objectId);
action.SetAtomId(atom); action.SetAtomId(atom);

4
LEGO1/modeldb/modeldb.cpp
View File

@ -28,10 +28,10 @@ MxResult ModelDbModel::Read(FILE* p_file)
return FAILURE; return FAILURE;
} }
if (fread(&m_unk0x04, sizeof(m_unk0x04), 1, p_file) != 1) { if (fread(&m_modelDataLength, sizeof(m_modelDataLength), 1, p_file) != 1) {
return FAILURE; return FAILURE;
} }
if (fread(&m_unk0x08, sizeof(m_unk0x08), 1, p_file) != 1) { if (fread(&m_modelDataOffset, sizeof(m_modelDataOffset), 1, p_file) != 1) {
return FAILURE; return FAILURE;
} }
if (fread(&len, sizeof(len), 1, p_file) != 1) { if (fread(&len, sizeof(len), 1, p_file) != 1) {

16
LEGO1/modeldb/modeldb.h
View File

@ -94,14 +94,14 @@ struct ModelDbModel {
void Free(); void Free();
MxResult Read(FILE* p_file); MxResult Read(FILE* p_file);
char* m_modelName; // 0x00 char* m_modelName; // 0x00
undefined4 m_unk0x04; // 0x04 MxU32 m_modelDataLength; // 0x04
undefined4 m_unk0x08; // 0x08 MxU32 m_modelDataOffset; // 0x08
char* m_presenterName; // 0x0c char* m_presenterName; // 0x0c
float m_location[3]; // 0x10 float m_location[3]; // 0x10
float m_direction[3]; // 0x1c float m_direction[3]; // 0x1c
float m_up[3]; // 0x28 float m_up[3]; // 0x28
undefined m_unk0x34; // 0x34 undefined m_unk0x34; // 0x34
}; };
// SIZE 0x18 // SIZE 0x18