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

Implement LegoExtraActor::VTable0x90 (#739)

Browse Source 
* Implement LegoExtraActor::VTable0x90

* Improve LegoExtraActor::VTable0x90

* Match

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-03-27 15:38:13 -04:00
committed by GitHub
parent 1cf60ccda6
commit 38cfad8b17
9 changed files with 120 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
MxS32 VTable0x90() 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
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_10080590();

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

@@ -9,6 +9,13 @@
// SIZE 0x1dc
class LegoExtraActor : public virtual LegoAnimActor {
public:
enum Axis {
e_posz,
e_negz,
e_posx,
e_negx
};
LegoExtraActor();
~LegoExtraActor() override;
@@ -27,15 +34,15 @@ 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
MxS32 VTable0x90() override; // vtable+0x90
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x9c() override; // vtable+0x9c
void VTable0xa4() 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
MxS32 VTable0x94() override; // vtable+0x94
void VTable0x9c() override; // vtable+0x9c
void VTable0xa4() override; // vtable+0xa4
void VTable0xc4() override; // vtable+0xc4
virtual MxResult FUN_1002aae0();
@@ -43,9 +50,9 @@ public:
// LegoExtraActor::`scalar deleting destructor'
private:
undefined4 m_unk0x08; // 0x08
MxFloat m_scheduledTime; // 0x08
undefined m_unk0x0c; // 0x0c
undefined m_unk0x0d; // 0x0d
MxU8 m_axis; // 0x0d
undefined m_unk0x0e; // 0x0e
undefined4 m_unk0x10; // 0x10
MxU8 m_unk0x14; // 0x14

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

@@ -46,7 +46,7 @@ public:
virtual void VTable0x8c(); // vtable+0x8c
// FUNCTION: LEGO1 0x10002d40
virtual MxS32 VTable0x90() { return 0; } // vtable+0x90
virtual MxU32 VTable0x90(float, Matrix4&) { return FALSE; } // vtable+0x90
// FUNCTION: LEGO1 0x10002d50
virtual MxS32 VTable0x94() { return 0; } // vtable+0x94
@@ -97,8 +97,8 @@ public:
protected:
MxFloat m_BADuration; // 0x78
undefined4 m_unk0x7c; // 0x7c
MxFloat m_unk0x80; // 0x80
MxFloat m_unk0x84; // 0x84
MxFloat m_actorTime; // 0x80
MxFloat m_lastTime; // 0x84
LegoPathBoundary* m_boundary; // 0x88
undefined m_unk0x8c[0x14]; // 0x8c
MxFloat m_unk0xa0; // 0xa0

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

@@ -31,7 +31,7 @@ public:
void VTable0x68(Mx3DPointFloat&, Mx3DPointFloat&, Mx3DPointFloat&) override; // vtable+0x68
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxS32 VTable0x90() override; // vtable+0x90
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90
MxS32 VTable0x94() override; // vtable+0x94
// FUNCTION: LEGO1 0x10014aa0