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

fix style issues

Browse Source
This commit is contained in:
Nathan 2024-03-14 08:11:20 -04:00
parent cbff6af77a
commit e43d487cde
3 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/animstate.h
View File

@ -5,7 +5,7 @@
struct ModelInfo {
char* m_modelName; // 0x00
MxU8 m_unk0x4; // 0x04
MxU8 m_unk0x04; // 0x04
float m_location[3]; // 0x08
float m_direction[3]; // 0x14
float m_up[3]; // 0x20
@ -15,12 +15,12 @@ struct ModelInfo {
struct AnimInfo {
char* m_animName; // 0x00
undefined4 m_unk0x4; // 0x04
MxS16 m_unk0x8; // 0x08
MxU8 m_unk0xa; // 0x0a
MxU8 m_unk0xb; // 0x0b
MxU8 m_unk0xc; // 0x0c
MxU8 m_unk0xd; // 0x0d
undefined4 m_unk0x04; // 0x04
MxS16 m_unk0x08; // 0x08
MxU8 m_unk0x0a; // 0x0a
MxU8 m_unk0x0b; // 0x0b
MxU8 m_unk0x0c; // 0x0c
MxU8 m_unk0x0d; // 0x0d
MxU32 m_unk0x10[4]; // 0x10
MxU8 m_modelCount; // 0x20
ModelInfo* m_models; // 0x24

85
LEGO1/lego/legoomni/include/legoanimationmanager.h
View File

@ -19,17 +19,17 @@ struct Vehicle {
undefined4 m_unk0x4; // 0x04
};
void C100d8ca8_Handler();
void C100d8cd8_Handler();
void LegoUnknown100d8ca8Handler();
void LegoUnknown100d8cd8Handler();
// VTABLE: LEGO1 0x100d8ca8
// SIZE 0x10
class C100d8ca8 : public MxCore {
class LegoUnknown100d8ca8 : public MxCore {
public:
inline C100d8ca8()
inline LegoUnknown100d8ca8()
{
m_unk0x8 = 0;
SetHandler(C100d8ca8_Handler);
SetHandler(LegoUnknown100d8ca8Handler);
}
inline void SetHandler(void (*p_handler)()) { m_unk0xc = p_handler; }
@ -40,9 +40,9 @@ class C100d8ca8 : public MxCore {
// VTABLE: LEGO1 0x100d8cc0
// SIZE 0x18
class C100d8cc0 : public C100d8ca8 {
class LegoUnknown100d8cc0 : public LegoUnknown100d8ca8 {
public:
inline C100d8cc0() { m_unk0x10 = m_unk0x14 = 0; }
inline LegoUnknown100d8cc0() { m_unk0x10 = m_unk0x14 = 0; }
private:
MxU32 m_unk0x10; // 0x10
@ -51,17 +51,20 @@ class C100d8cc0 : public C100d8ca8 {
// VTABLE: LEGO1 0x100d8cd8
// SIZE 0x18
class C100d8cd8 : public C100d8cc0 {
class LegoUnknown100d8cd8 : public LegoUnknown100d8cc0 {
public:
inline C100d8cd8(MxBool p_mode) { SetHandler(p_mode); }
inline void SetHandler(MxBool p_mode) { C100d8ca8::SetHandler(p_mode ? C100d8cd8_Handler : C100d8ca8_Handler); }
inline LegoUnknown100d8cd8(MxBool p_mode) { SetHandler(p_mode); }
inline void SetHandler(MxBool p_mode)
{
LegoUnknown100d8ca8::SetHandler(p_mode ? LegoUnknown100d8cd8Handler : LegoUnknown100d8ca8Handler);
}
};
// VTABLE: LEGO1 0x100d8c90
// SIZE 0x18
class C100d8c90 : public C100d8cd8 {
class LegoUnknown100d8c90 : public LegoUnknown100d8cd8 {
public:
inline C100d8c90() : C100d8cd8(FALSE) {}
inline LegoUnknown100d8c90() : LegoUnknown100d8cd8(FALSE) {}
};
// VTABLE: LEGO1 0x100d8c18
@ -92,7 +95,7 @@ class LegoAnimationManager : public MxCore {
void FUN_1005f0b0();
void FUN_1005f6d0(MxBool);
MxResult LoadScriptInfo(MxS32 p_scriptIndex);
MxBool FUN_10060140(char* p_name, MxU32& index);
MxBool FUN_10060140(char* p_name, MxU32& p_index);
MxResult ReadAnimInfo(LegoFile* p_file, AnimInfo* p_info);
MxResult ReadModelInfo(LegoFile* p_file, ModelInfo* p_info);
void FUN_100603c0();
@ -109,34 +112,34 @@ class LegoAnimationManager : public MxCore {
private:
void Init();
undefined4 m_unk0x08; // 0x08
MxU16 m_animCount; // 0x0c
MxU16 m_unk0x0e; // 0x0e
MxU32 m_unk0x10; // 0x10
AnimInfo* m_anims; // 0x14
undefined m_unk0x018[8]; // 0x18
C100d8c90* m_tranInfoList; // 0x20
C100d8c90* m_tranInfoList2; // 0x24
undefined4 m_unk0x28[2]; // 0x28
undefined4 m_unk0x30[2]; // 0x30
undefined m_unk0x38; // 0x38
undefined m_unk0x39; // 0x39
undefined m_unk0x3a; // 0x3a
undefined m_unk0x3b[0x3c1]; // 0x3b
undefined4 m_unk0x3fc; // 0x3fc
MxU8 m_unk0x400; // 0x400
undefined m_unk0x401; // 0x401
MxU8 m_unk0x402; // 0x402
undefined m_unk0x403[0x1d]; // 0x403
AnimState* m_animState; // 0x420
undefined4 m_unk0x424; // 0x424
undefined m_unk0x428; // 0x428
undefined m_unk0x429; // 0x429
undefined m_unk0x42a; // 0x42a
undefined m_unk0x42b; // 0x42b
undefined4 m_unk0x42c; // 0x42c
undefined m_unk0x430; // 0x430
undefined m_unk0x431[0xcf]; // 0x431
undefined4 m_unk0x08; // 0x08
MxU16 m_animCount; // 0x0c
MxU16 m_unk0x0e; // 0x0e
MxU32 m_unk0x10; // 0x10
AnimInfo* m_anims; // 0x14
undefined m_unk0x018[8]; // 0x18
LegoUnknown100d8c90* m_tranInfoList; // 0x20
LegoUnknown100d8c90* m_tranInfoList2; // 0x24
undefined4 m_unk0x28[2]; // 0x28
undefined4 m_unk0x30[2]; // 0x30
undefined m_unk0x38; // 0x38
undefined m_unk0x39; // 0x39
undefined m_unk0x3a; // 0x3a
undefined m_unk0x3b[0x3c1]; // 0x3b
undefined4 m_unk0x3fc; // 0x3fc
MxU8 m_unk0x400; // 0x400
undefined m_unk0x401; // 0x401
MxU8 m_unk0x402; // 0x402
undefined m_unk0x403[0x1d]; // 0x403
AnimState* m_animState; // 0x420
undefined4 m_unk0x424; // 0x424
undefined m_unk0x428; // 0x428
undefined m_unk0x429; // 0x429
undefined m_unk0x42a; // 0x42a
undefined m_unk0x42b; // 0x42b
undefined4 m_unk0x42c; // 0x42c
undefined m_unk0x430; // 0x430
undefined m_unk0x431[0xcf]; // 0x431
};
#endif // LEGOANIMATIONMANAGER_H

40
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -10,7 +10,7 @@
DECOMP_SIZE_ASSERT(LegoAnimationManager, 0x500)
// GLOBAL: LEGO1 0x100f7048
Character g_characters[0x2f];
Character g_characters[47]; // TODO: Initialize this
// GLOBAL: LEGO1 0x100f74f8
int g_legoAnimationManagerConfig = 1;
@ -143,7 +143,7 @@ MxResult LegoAnimationManager::LoadScriptInfo(MxS32 p_scriptIndex)
for (int j = 0; j < 3; j++) {
m_anims[i].m_unk0x2a[j] = -1;
}
if (m_anims[i].m_unk0x8 == -1) {
if (m_anims[i].m_unk0x08 == -1) {
for (int j = 0; j < m_anims[i].m_modelCount; j++) {
MxS32 index = FUN_10062360(m_anims[i].m_models[j].m_modelName);
if (index >= 0) {
@ -162,8 +162,8 @@ MxResult LegoAnimationManager::LoadScriptInfo(MxS32 p_scriptIndex)
}
}
m_unk0x08 = p_scriptIndex;
m_tranInfoList = new C100d8c90();
m_tranInfoList2 = new C100d8c90();
m_tranInfoList = new LegoUnknown100d8c90();
m_tranInfoList2 = new LegoUnknown100d8c90();
FUN_100617c0(-1, m_unk0x0e, m_unk0x10);
result = SUCCESS;
m_unk0x402 = 1;
@ -187,6 +187,15 @@ MxResult LegoAnimationManager::LoadScriptInfo(MxS32 p_scriptIndex)
return result;
}
// FUNCTION: LEGO1 0x1005fe50
void LegoUnknown100d8ca8Handler()
{
}
void LegoUnknown100d8cd8Handler()
{
}
// STUB: LEGO1 0x10060140
MxBool LegoAnimationManager::FUN_10060140(char* p_name, MxU32& index)
{
@ -207,22 +216,22 @@ MxResult LegoAnimationManager::ReadAnimInfo(LegoFile* p_file, AnimInfo* p_info)
goto fail;
}
p_info->m_animName[length] = 0;
if (p_file->Read(&p_info->m_unk0x4, 4) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x04, 4) == FAILURE) {
goto fail;
}
if (p_file->Read(&p_info->m_unk0x8, 2) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x08, 2) == FAILURE) {
goto fail;
}
if (p_file->Read(&p_info->m_unk0xa, 1) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x0a, 1) == FAILURE) {
goto fail;
}
if (p_file->Read(&p_info->m_unk0xb, 1) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x0b, 1) == FAILURE) {
goto fail;
}
if (p_file->Read(&p_info->m_unk0xc, 1) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x0c, 1) == FAILURE) {
goto fail;
}
if (p_file->Read(&p_info->m_unk0xd, 1) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x0d, 1) == FAILURE) {
goto fail;
}
for (i = 0; i < 4; i++) {
@ -258,7 +267,7 @@ MxResult LegoAnimationManager::ReadModelInfo(LegoFile* p_file, ModelInfo* p_info
goto fail;
}
p_info->m_modelName[length] = 0;
if (p_file->Read(&p_info->m_unk0x4, 1) == FAILURE) {
if (p_file->Read(&p_info->m_unk0x04, 1) == FAILURE) {
goto fail;
}
if (p_file->Read(p_info->m_location, 12) != SUCCESS) {
@ -320,12 +329,3 @@ MxS8 LegoAnimationManager::FUN_10062360(char*)
void LegoAnimationManager::FUN_10064670(MxBool)
{
}
// STUB: LEGO1 0x1005fe50
void C100d8ca8_Handler()
{
}
void C100d8cd8_Handler()
{
}