mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match LegoExtraActor::VTable0x94 (#759)

Browse Source 
* Implement/match LegoExtraActor::VTable0x94

* attempt to fix gcc

* WIP fixes

* Match

* Match

* Match

* add TODO

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-03-30 12:18:15 -04:00
committed by GitHub
parent 4fd6642be9
commit 3839b3278c
26 changed files with 223 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/act2brick.h
View File

@@ -26,7 +26,7 @@ public:
return !strcmp(p_name, Act2Brick::ClassName()) || LegoEntity::IsA(p_name);
}
MxS32 VTable0x94() override; // vtable+0x94
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
// SYNTHETIC: LEGO1 0x1007a450
// Act2Brick::`scalar deleting destructor'

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

@@ -20,9 +20,9 @@ public:
return !strcmp(p_name, Doors::ClassName()) || LegoPathActor::IsA(p_name);
}
void ParseAction(char*) override; // vtable+0x20
void VTable0x70(float p_float) override; // vtable+0x70
MxS32 VTable0x94() override; // vtable+0x94
void ParseAction(char*) override; // vtable+0x20
void VTable0x70(float p_float) override; // vtable+0x70
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
// SYNTHETIC: LEGO1 0x1000e580
// Doors::`scalar deleting destructor'

2
LEGO1/lego/legoomni/include/legoanimactor.h
View File

@@ -12,6 +12,8 @@ struct LegoAnimActorStruct {
float GetDuration();
inline float GetUnknown0x00() { return m_unk0x00; }
float m_unk0x00; // 0x00
LegoAnim* m_AnimTreePtr; // 0x04
LegoROI** m_roiMap; // 0x08

2
LEGO1/lego/legoomni/include/legocachsound.h
View File

@@ -34,7 +34,7 @@ public:
inline const undefined GetUnk0x58() const { return m_unk0x58; }
LegoCacheSound* FUN_10006960();
MxResult FUN_10006a30(char* p_str, MxBool);
MxResult FUN_10006a30(const char* p_str, MxBool);
void FUN_10006b80();
void FUN_10006be0();

12
LEGO1/lego/legoomni/include/legocarraceactor.h
View File

@@ -27,12 +27,12 @@ public:
return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name);
}
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_10080590();

35
LEGO1/lego/legoomni/include/legoextraactor.h
View File

@@ -2,6 +2,7 @@
#define LEGOEXTRAACTOR_H
#include "legoanimactor.h"
#include "legoanimpresenter.h"
// VTABLE: LEGO1 0x100d6c00 LegoAnimActor
// VTABLE: LEGO1 0x100d6c10 LegoPathActor
@@ -34,17 +35,18 @@ public:
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x68(Mx3DPointFloat& p_point1, Mx3DPointFloat& p_point2, Mx3DPointFloat& p_point3)
override; // vtable+0x68
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxU32 VTable0x90(float p_float, Matrix4& p_matrix) override; // vtable+0x90
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x9c() override; // vtable+0x9c
void VTable0xa4(MxU8& p_und1, MxS32& p_und2) override; // vtable+0xa4
void VTable0xc4() override; // vtable+0xc4
override; // vtable+0x68
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxU32 VTable0x90(float p_float, Matrix4& p_matrix) override; // vtable+0x90
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void VTable0x9c() override; // vtable+0x9c
void VTable0xa4(MxU8& p_und1, MxS32& p_und2) override; // vtable+0xa4
void VTable0xc4() override; // vtable+0xc4
virtual MxResult FUN_1002aae0();
inline void FUN_1002ad8a();
// SYNTHETIC: LEGO1 0x1002b760
// LegoExtraActor::`scalar deleting destructor'
@@ -54,12 +56,12 @@ private:
undefined m_unk0x0c; // 0x0c
MxU8 m_axis; // 0x0d
undefined m_unk0x0e; // 0x0e
undefined4 m_unk0x10; // 0x10
MxFloat m_unk0x10; // 0x10
MxU8 m_unk0x14; // 0x14
MxU8 m_unk0x15; // 0x15
MxMatrix m_unk0x18; // 0x18
LegoAnimActorStruct* m_unk0x60; // 0x60
LegoAnimActorStruct* m_unk0x64; // 0x64
LegoAnimActorStruct* m_assAnim; // 0x60
LegoAnimActorStruct* m_disAnim; // 0x64
};
// GLOBAL: LEGO1 0x100d6be8
@@ -68,4 +70,13 @@ private:
// GLOBAL: LEGO1 0x100d6bf0
// LegoExtraActor::`vbtable'{for `LegoExtraActor'}
// TEMPLATE: LEGO1 0x1002b200
// vector<unsigned char *,allocator<unsigned char *> >::vector<unsigned char *,allocator<unsigned char *> >
// TEMPLATE: LEGO1 0x1002b270
// vector<unsigned char *,allocator<unsigned char *> >::size
// TEMPLATE: LEGO1 0x1002b720
// uninitialized_copy
#endif // LEGOEXTRAACTOR_H

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

@@ -31,13 +31,13 @@ public:
return !strcmp(p_name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(p_name);
}
void ParseAction(char*) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
void ParseAction(char*) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_100136f0(float p_worldSpeed);

7
LEGO1/lego/legoomni/include/legopathactor.h
View File

@@ -49,7 +49,7 @@ public:
virtual MxU32 VTable0x90(float, Matrix4&) { return FALSE; } // vtable+0x90
// FUNCTION: LEGO1 0x10002d50
virtual MxS32 VTable0x94() { return 0; } // vtable+0x94
virtual MxResult VTable0x94(LegoPathActor*, MxBool) { return 0; } // vtable+0x94
virtual void VTable0x98(); // vtable+0x98
virtual void VTable0x9c(); // vtable+0x9c
@@ -85,10 +85,11 @@ public:
virtual void VTable0xc8(MxU8 p_unk0x148) { m_unk0x148 = p_unk0x148; } // vtable+0xc8
inline LegoPathBoundary* GetBoundary() { return m_boundary; }
inline MxU32 GetState() { return m_state; }
inline LegoPathController* GetController() { return m_controller; }
inline void SetBoundary(LegoPathBoundary* p_boundary) { m_boundary = p_boundary; }
inline void SetUnknownDC(MxU32 p_unk0xdc) { m_unk0xdc = p_unk0xdc; }
inline void SetState(MxU32 p_state) { m_state = p_state; }
inline void ClearController() { m_controller = NULL; }
// SYNTHETIC: LEGO1 0x1002d800
@@ -103,7 +104,7 @@ protected:
undefined m_unk0x8c[0x14]; // 0x8c
MxFloat m_unk0xa0; // 0xa0
undefined m_unk0xa4[0x38]; // 0xa4
MxU32 m_unk0xdc; // 0xdc
MxU32 m_state; // 0xdc
Edge* m_destEdge; // 0xe0
undefined4 m_unk0xe4; // 0xe4
undefined2 m_unk0xe8; // 0xe8

2
LEGO1/lego/legoomni/include/legoraceactor.h
View File

@@ -32,7 +32,7 @@ public:
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90
MxS32 VTable0x94() override; // vtable+0x94
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
// FUNCTION: LEGO1 0x10014aa0
virtual MxResult FUN_10014aa0() { return SUCCESS; }

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

@@ -31,13 +31,13 @@ public:
return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
}
void ParseAction(char*) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
void ParseAction(char*) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x6c() override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_10012ea0(float p_worldSpeed);
virtual void FUN_10012ff0(float);

4
LEGO1/lego/legoomni/include/legounknown100d6b4c.h
View File

@@ -54,8 +54,8 @@ public:
LegoCacheSound* FUN_1003d170(const char* p_key);
LegoCacheSound* FUN_1003d290(LegoCacheSound* p_sound);
void FUN_1003dae0(char* p_one, char* p_two, MxBool p_three);
LegoCacheSound* FUN_1003db10(LegoCacheSound* p_one, char* p_two, MxBool p_three);
void FUN_1003dae0(const char* p_one, const char* p_two, MxBool p_three);
LegoCacheSound* FUN_1003db10(LegoCacheSound* p_one, const char* p_two, MxBool p_three);
void FUN_1003dc40(LegoCacheSound** p_und);
private: