Implement RaceSkel, add BETA10 annotations (#1088)

* Implement `RaceSkel`, add BETA10 annotations

* fix formatting

* Fix order

* Address some review comments

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2024-08-21 22:30:27 +02:00
committed by GitHub
parent b649902578
commit 1b46859cf6
15 changed files with 104 additions and 18 deletions

View File

@@ -4,6 +4,8 @@
#include "decomp.h"
#include "legorace.h"
class RaceSkel;
// VTABLE: LEGO1 0x100d4b70
// VTABLE: BETA10 0x101bd5f0
// SIZE 0x2c
@@ -59,14 +61,17 @@ public:
MxLong HandleType0Notification(MxNotificationParam&) override; // vtable+0x78
// FUNCTION: BETA10 0x100cd060
undefined4 GetUnk0x150() { return m_unk0x150; }
RaceSkel* GetSkeleton() { return m_skeleton; }
// FUNCTION: BETA10 0x100f16f0
void SetSkeleton(RaceSkel* p_skeleton) { m_skeleton = p_skeleton; }
// SYNTHETIC: LEGO1 0x10016c70
// CarRace::`scalar deleting destructor'
private:
undefined m_unk0x144[12]; // 0x144
undefined4 m_unk0x150; // 0x150
RaceSkel* m_skeleton; // 0x150
};
#endif // CARRACE_H

View File

@@ -28,13 +28,18 @@ struct LegoAnimActorStruct {
// VTABLE: LEGO1 0x100d5440 LegoPathActor
// VTABLE: LEGO1 0x100d5510 LegoAnimActor
// VTABLE: BETA10 0x101b81d8 LegoPathActor
// VTABLE: BETA10 0x101b82c8 LegoAnimActor
// SIZE 0x174
class LegoAnimActor : public virtual LegoPathActor {
public:
// FUNCTION: BETA10 0x1000f6c0
LegoAnimActor() { m_curAnim = -1; }
~LegoAnimActor() override;
// FUNCTION: LEGO1 0x1000fba0
// FUNCTION: BETA10 0x10012400
const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f057c
@@ -42,6 +47,7 @@ public:
}
// FUNCTION: LEGO1 0x1000fbc0
// FUNCTION: BETA10 0x10012440
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoAnimActor::ClassName()) || LegoPathActor::IsA(p_name);

View File

@@ -6,6 +6,7 @@
// VTABLE: LEGO1 0x100d6c00 LegoAnimActor
// VTABLE: LEGO1 0x100d6c10 LegoPathActor
// VTABLE: LEGO1 0x100d6cdc LegoExtraActor
// VTABLE: BETA10 0x101bc2b8 LegoAnimActor
// SIZE 0x1dc
class LegoExtraActor : public virtual LegoAnimActor {
public:

View File

@@ -106,6 +106,7 @@
X(AnimState)
// VTABLE: LEGO1 0x100d4768
// VTABLE: BETA10 0x101bccd8
// SIZE 0x1c8
class LegoObjectFactory : public MxObjectFactory {
public:

View File

@@ -3,19 +3,30 @@
#include "legoanimactor.h"
/*
VTABLE: LEGO1 0x100d7668 LegoPathActor
VTABLE: LEGO1 0x100d7738 LegoAnimActor
*/
// VTABLE: LEGO1 0x100d93f8 LegoPathActor
// VTABLE: LEGO1 0x100d94c8 LegoAnimActor
// VTABLE: BETA10 0x101bf9d0 LegoPathActor
// VTABLE: BETA10 0x101bfac0 LegoAnimActor
// SIZE 0x178
class RaceSkel : public LegoAnimActor {
public:
RaceSkel();
~RaceSkel() override;
void ParseAction(char* p_extra) override; // vtable+0x20
MxResult FUN_1001c360(float p_und, Matrix4& p_transform) override;
void GetCurrentAnimData(float* p_outCurAnimPosition, float* p_outCurAnimDuration);
// SYNTHETIC: LEGO1 0x10071cf0
// RaceSkel::`scalar deleting destructor'
private:
float m_animPosition; // 0x1c
};
// GLOBAL: LEGO1 0x100d93f0
// RaceSkel::`vbtable'
#endif // RACESKEL_H