Fix size annotations for legoomni

Fix structure and add placeholder annotations for LegoAnimActor and subclasses
2025-10-27 02:14:18 +00:00 · 2024-03-22 11:09:26 -04:00
parent 96f7219811
commit a45706a854
42 changed files with 460 additions and 37 deletions
--- a/LEGO1/lego/legoomni/include/act2actor.h
+++ b/LEGO1/lego/legoomni/include/act2actor.h
@@ -0,0 +1,16 @@
+#include "legoanimactor.h"
+
+/*
+	VTABLE: LEGO1 0x100d6078 LegoPathActor
+	VTABLE: LEGO1 0x100d6148 LegoAnimActor
+*/
+// SIZE 0x1a8
+class Act2Actor : public LegoAnimActor {
+	Act2Actor();
+
+	// SYNTHETIC: LEGO1 0x1001a090
+	// Act2Actor::`scalar deleting destructor'
+
+private:
+	undefined m_unk0x1c[0x34]; // 0x1c
+};
--- a/LEGO1/lego/legoomni/include/act3actor.h
+++ b/LEGO1/lego/legoomni/include/act3actor.h
@@ -1,13 +1,18 @@
 #ifndef ACT3ACTOR_H
 #define ACT3ACTOR_H

-#include "mxcore.h"
+#include "legoanimactor.h"

-// FIXME: Uncertain location. There are three vtables which eventually call this
-//        class' ClassName() function, but none of them call it directly.
-class Act3Actor : public MxCore {
+/*
+	VTABLE : LEGO1 0x100d7668 LegoPathActor
+	VTABLE : LEGO1 0x100d7738 LegoAnimActor
+*/
+// SIZE 0x178
+class Act3Actor : public LegoAnimActor {
 public:
-	// FUNCTION: LEGO1 0x100431b0
+	Act3Actor();
+
+	// FUNCTION: LEGO1 0x100433b0
 	inline const char* ClassName() const override
 	{
 		// STRING: LEGO1 0x100f03ac
--- a/LEGO1/lego/legoomni/include/act3shark.h
+++ b/LEGO1/lego/legoomni/include/act3shark.h
@@ -3,9 +3,15 @@

 #include "legoanimactor.h"

-// VTABLE: LEGO1 0x100d7920
+/*
+	VTABLE : LEGO1 0x100d7920 LegoPathActor
+	VTABLE : LEGO1 0x100d79f0 LegoAnimActor
+*/
+// SIZE 0x1a8
 class Act3Shark : public LegoAnimActor {
 public:
+	Act3Shark();
+
 	// FUNCTION: LEGO1 0x100430c0
 	inline const char* ClassName() const override // vtable+0x0c
 	{
@@ -24,6 +30,8 @@ public:
 	void VTable0x70(float p_float) override;           // vtable+0x70
 	void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74

+	virtual MxResult FUN_10042ce0(void*);
+
 	// SYNTHETIC: LEGO1 0x10043020
 	// Act3Shark::`scalar deleting destructor'
 };
--- a/LEGO1/lego/legoomni/include/buildingentity.h
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -4,7 +4,7 @@
 #include "legoentity.h"

 // VTABLE: LEGO1 0x100d5c88
-// SIZE <= 0x68, hard to tell because it's always constructed as a derivative
+// SIZE 0x68
 class BuildingEntity : public LegoEntity {
 public:
 	BuildingEntity();
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -4,9 +4,14 @@
 #include "legoanimactor.h"
 #include "mxtypes.h"

-// VTABLE: LEGO1 0x100d6790
+/*
+	VTABLE : LEGO1 0x100d6790 LegoPathActor
+	VTABLE : LEGO1 0x100d6860 LegoAnimActor
+*/
+// SIZE 0x174
 class BumpBouy : public LegoAnimActor {
 public:
+	BumpBouy();
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04

 	// FUNCTION: LEGO1 0x100274e0
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -8,7 +8,7 @@
 class LegoControlManagerEvent;

 // VTABLE: LEGO1 0x100d5f20
-// SIZE: 0xfc (from inlined ctor at 0x1000a8aa)
+// SIZE 0xfc
 class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -4,6 +4,7 @@
 #include "legoactor.h"

 // VTABLE: LEGO1 0x100d5178
+// SIZE 0x78
 class IsleActor : public LegoActor {
 public:
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04
--- a/LEGO1/lego/legoomni/include/legoactor.h
+++ b/LEGO1/lego/legoomni/include/legoactor.h
@@ -48,7 +48,7 @@ public:

 	static const char* GetActorName(MxU8 p_id);

-private:
+protected:
 	MxFloat m_unk0x68;       // 0x68
 	LegoCacheSound* m_sound; // 0x6c
 	MxFloat m_unk0x70;       // 0x70
--- a/LEGO1/lego/legoomni/include/legoanimactor.h
+++ b/LEGO1/lego/legoomni/include/legoanimactor.h
@@ -4,10 +4,39 @@
 #include "decomp.h"
 #include "legopathactor.h"

-class LegoAnimActor : public LegoPathActor {
+/*
+	VTABLE: LEGO1 0x100d5440 LegoPathActor
+	VTABLE: LEGO1 0x100d5510 LegoAnimActor
+*/
+// SIZE 0x174
+class LegoAnimActor : public virtual LegoPathActor {
 public:
-	LegoAnimActor() {}
-	LegoAnimActor(undefined4);
+	LegoAnimActor() { m_index = -1; }
+
+	// FUNCTION: LEGO1 0x1000fb90
+	inline const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f057c
+		return "LegoAnimActor";
+	}
+
+	// FUNCTION: LEGO1 0x1000fbb0
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, LegoAnimActor::ClassName()) || LegoPathActor::IsA(p_name);
+	}
+
+	virtual MxResult FUN_1001c1f0(float& p_out);
+	virtual MxResult FUN_1001c360(float, undefined4);
+	virtual MxResult FUN_1001c450(undefined4, undefined4, undefined4, undefined4);
+	virtual void FUN_1001c800();
+
+	// SYNTHETIC: LEGO1 0x1000fb50
+	// LegoAnimActor::`scalar deleting destructor'
+
+private:
+	vector<void*> m_vector; // 0x00
+	MxU16 m_index;          // 0x14
 };

 #endif // LEGOANIMACTOR_H
--- a/LEGO1/lego/legoomni/include/legocarraceactor.h
+++ b/LEGO1/lego/legoomni/include/legocarraceactor.h
@@ -3,9 +3,16 @@

 #include "legoraceactor.h"

-// VTABLE: LEGO1 0x100da0d8
-class LegoCarRaceActor : public LegoRaceActor {
+/*
+	VTABLE: LEGO1 0x100da0c0 LegoRaceActor
+	VTABLE: LEGO1 0x100da0c8 LegoAnimActor
+	VTABLE: LEGO1 0x100da0d8 LegoPathActor
+	VTABLE: LEGO1 0x100da1a8 LegoCarRaceActor
+*/
+// SIZE 0x1a0
+class LegoCarRaceActor : public virtual LegoRaceActor {
 public:
+	LegoCarRaceActor();
 	// FUNCTION: LEGO1 0x10081650
 	inline const char* ClassName() const override // vtable+0x0c
 	{
@@ -27,8 +34,31 @@ public:
 	void VTable0x98() override;              // vtable+0x98
 	void VTable0x9c() override;              // vtable+0x9c

+	virtual void FUN_10080590();
+	// FUNCTION: LEGO1 0x10012bb0
+	virtual void FUN_10012bb0(float p_unk0x14) { m_unk0x14 = p_unk0x14; }
+	// FUNCTION: LEGO1 0x10012bc0
+	virtual float FUN_10012bc0() { return m_unk0x14; }
+	// FUNCTION: LEGO1 0x10012bd0
+	virtual void FUN_10012bd0(float p_unk0x10) { m_unk0x10 = p_unk0x10; }
+	// FUNCTION: LEGO1 0x10012be0
+	virtual float FUN_10012be0() { return m_unk0x10; }
+	// FUNCTION: LEGO1 0x10012bf0
+	virtual void FUN_10012bf0(float p_unk0x18) { m_unk0x18 = p_unk0x18; }
+	// FUNCTION: LEGO1 0x10012c00
+	virtual float FUN_10012c00() { return m_unk0x18; }
+	virtual void FUN_10080740();
+
 	// SYNTHETIC: LEGO1 0x10081610
 	// LegoCarRaceActor::`scalar deleting destructor'
+
+protected:
+	float m_unk0x08;      // 0x08
+	MxU8 m_unk0x0c;       // 0x0c
+	float m_unk0x10;      // 0x10
+	float m_unk0x14;      // 0x14
+	float m_unk0x18;      // 0x18
+	undefined4 m_unk0x1c; // 0x1c
 };

 #endif // LEGOCARRACEACTOR_H
--- a/LEGO1/lego/legoomni/include/legoextraactor.h
+++ b/LEGO1/lego/legoomni/include/legoextraactor.h
@@ -3,9 +3,16 @@

 #include "legoanimactor.h"

-// VTABLE: LEGO1 0x100d6c10
-class LegoExtraActor : public LegoAnimActor {
+/*
+	VTABLE : LEGO1 0x100d6c00 LegoAnimActor
+	VTABLE : LEGO1 0x100d6c10 LegoPathActor
+	VTABLE : LEGO1 0x100d6cdc LegoExtraActor
+*/
+// SIZE 0x1dc
+class LegoExtraActor : public virtual LegoAnimActor {
 public:
+	LegoExtraActor();
+
 	// FUNCTION: LEGO1 0x1002b7a0
 	inline const char* ClassName() const override // vtable+0x0c
 	{
@@ -18,6 +25,19 @@ public:
 	{
 		return !strcmp(p_name, LegoExtraActor::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
+
+	virtual MxResult FUN_1002aae0();
+
+private:
+	undefined4 m_unk0x08; // 0x08
+	undefined m_unk0x0c;  // 0x0c
+	undefined m_unk0x0d;  // 0x0d
+	undefined m_unk0x0e;  // 0x0e
+	undefined4 m_unk0x10; // 0x10
+	undefined m_unk0x14;  // 0x14
+	MxMatrix m_unk0x18;   // 0x18
+	undefined4 m_unk0x60; // 0x60
+	undefined4 m_unk0x64; // 0x64
 };

 #endif // LEGOEXTRAACTOR_H
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -13,6 +13,7 @@ class LegoState;
 class MxVariable;
 class MxString;

+// SIZE 0x08
 struct ColorStringStruct {
 	const char* m_targetName;
 	const char* m_colorName;
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -2,10 +2,19 @@
 #define LEGOJETSKI_H

 #include "legojetskiraceactor.h"
+#include "legoracemap.h"

-// VTABLE: LEGO1 0x100d5a40
-class LegoJetski : public LegoJetskiRaceActor {
+/*
+	VTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
+	VTABLE: LEGO1 0x100d5a28 LegoRaceActor
+	VTABLE: LEGO1 0x100d5a30 LegoAnimActor
+	VTABLE: LEGO1 0x100d5a40 LegoPathActor
+	VTABLE: LEGO1 0x100d5b10 LegoRaceMap
+*/
+// SIZE 0x1dc
+class LegoJetski : public LegoJetskiRaceActor, public LegoRaceMap {
 public:
+	LegoJetski();
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04

 	// FUNCTION: LEGO1 0x10013e80
@@ -29,6 +38,8 @@ public:
 	void VTable0x98() override;                        // vtable+0x98
 	void VTable0x9c() override;                        // vtable+0x9c

+	virtual void FUN_100136f0(float p_worldSpeed);
+
 	// SYNTHETIC: LEGO1 0x10013e20
 	// LegoJetski::`scalar deleting destructor'
 };
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -3,9 +3,16 @@

 #include "legocarraceactor.h"

-// VTABLE: LEGO1 0x100da240
-class LegoJetskiRaceActor : public LegoCarRaceActor {
+/*
+	VTABLE: LEGO1 0x100da208 LegoCarRaceActor
+	VTABLE: LEGO1 0x100da228 LegoRaceActor
+	VTABLE: LEGO1 0x100da230 LegoAnimActor
+	VTABLE: LEGO1 0x100da240 LegoPathActor
+*/
+// SIZE 0x1a8
+class LegoJetskiRaceActor : public virtual LegoCarRaceActor {
 public:
+	LegoJetskiRaceActor();
 	// FUNCTION: LEGO1 0x10081d80
 	inline const char* ClassName() const override // vtable+0x0c
 	{
--- a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -4,7 +4,7 @@
 #include "legoanimpresenter.h"

 // VTABLE: LEGO1 0x100d4900
-// SIZE 0xc0 (discovered through inlined constructor at 0x10009ecd)
+// SIZE 0xc0
 class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000c9a0
--- a/LEGO1/lego/legoomni/include/legometerpresenter.h
+++ b/LEGO1/lego/legoomni/include/legometerpresenter.h
@@ -4,7 +4,7 @@
 #include "mxstillpresenter.h"

 // VTABLE: LEGO1 0x100d7ac8
-// SIZE 0x94 (from 0x1000a163)
+// SIZE 0x94
 class LegoMeterPresenter : public MxStillPresenter {
 public:
 	LegoMeterPresenter();
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -9,7 +9,7 @@ class LegoEntity;
 class MxDSChunk;

 // VTABLE: LEGO1 0x100d4e50
-// SIZE 0x6c (discovered through inline constructor at 0x10009ae6)
+// SIZE 0x6c
 class LegoModelPresenter : public MxVideoPresenter {
 public:
 	LegoModelPresenter() { Reset(); }
--- a/LEGO1/lego/legoomni/include/legoobjectfactory.h
+++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h
@@ -102,6 +102,7 @@
 	X(AnimState)

 // VTABLE: LEGO1 0x100d4768
+// SIZE 0x1c8
 class LegoObjectFactory : public MxObjectFactory {
 public:
 	LegoObjectFactory();
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -5,7 +5,7 @@
 #include "mxmediapresenter.h"

 // VTABLE: LEGO1 0x100d4df0
-// SIZE 0x54 (from inlined construction at 0x10009fac)
+// SIZE 0x54
 class LegoPartPresenter : public MxMediaPresenter {
 public:
 	LegoPartPresenter() { Reset(); }
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -6,7 +6,7 @@
 #include "realtime/matrix.h"

 // VTABLE: LEGO1 0x100d6e28
-// SIZE 0x154 (from inlined construction at 0x1000a346)
+// SIZE 0x154
 class LegoPathActor : public LegoActor {
 public:
 	LegoPathActor();
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -4,9 +4,15 @@
 #include "legoanimactor.h"
 #include "realtime/matrix.h"

-// VTABLE: LEGO1 0x100d5b88
-class LegoRaceActor : public LegoAnimActor {
+/*
+	VTABLE: LEGO1 0x100d5b78 LegoAnimActor
+	VTABLE: LEGO1 0x100d5b88 LegoPathActor
+	VTABLE: LEGO1 0x100d5c54 LegoRaceActor
+*/
+// SIZE 0x180
+class LegoRaceActor : public virtual LegoAnimActor {
 public:
+	LegoRaceActor();
 	// FUNCTION: LEGO1 0x10014af0
 	inline const char* ClassName() const override // vtable+0x0c
 	{
@@ -28,8 +34,14 @@ public:
 	MxS32 VTable0x90() override;                       // vtable+0x90
 	MxS32 VTable0x94() override;                       // vtable+0x94

+	// FUNCTION: LEGO1 0x10014aa0
+	virtual MxResult FUN_10014aa0() { return SUCCESS; }
+
 	// SYNTHETIC: LEGO1 0x10014ab0
 	// LegoRaceActor::`scalar deleting destructor'
+
+private:
+	undefined4 m_unk0x08; // 0x08
 };

 #endif // LEGORACEACTOR_H
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -3,11 +3,19 @@

 #include "legocarraceactor.h"
 #include "legopathactor.h"
+#include "legoracemap.h"

-// VTABLE: LEGO1 0x100d58b8
+/*
+	VTABLE: LEGO1 0x100d58a0 LegoRaceActor
+	VTABLE: LEGO1 0x100d58a8 LegoAnimActor
+	VTABLE: LEGO1 0x100d58b8 LegoPathActor
+	VTABLE: LEGO1 0x100d5894 LegoRaceMap
+	VTABLE: LEGO1 0x100d5898 LegoCarRaceActor
+*/
 // SIZE 0x200
-class LegoRaceCar : public LegoCarRaceActor {
+class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
 public:
+	LegoRaceCar();
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04

 	// FUNCTION: LEGO1 0x10014290
@@ -31,8 +39,19 @@ public:
 	void VTable0x98() override;                        // vtable+0x98
 	void VTable0x9c() override;                        // vtable+0x9c

+	virtual void FUN_10012ea0(float p_worldSpeed);
+	virtual void FUN_10012bf0(float);
+	virtual MxBool FUN_10013130(float);
+
 	// SYNTHETIC: LEGO1 0x10014230
 	// LegoRaceCar::`scalar deleting destructor'
+	byte m_unk0x54;           // 0x54
+	undefined4 m_unk0x58;     // 0x58
+	Mx3DPointFloat m_unk0x5c; // 0x5c
+	undefined4 m_unk0x70;     // 0x70
+	undefined4 m_unk0x74;     // 0x74
+	undefined4 m_unk0x78;     // 0x78
+	undefined4 m_unk0x7c;     // 0x7c
 };

 #endif // LEGOCARRACE_H
--- a/LEGO1/lego/legoomni/include/legoracemap.h
+++ b/LEGO1/lego/legoomni/include/legoracemap.h
@@ -0,0 +1,35 @@
+#ifndef LEGORACEMAP_H
+#define LEGORACEMAP_H
+
+#include "legoraceactor.h"
+
+/*
+	VTABLE: LEGO1 0x100d5510 LegoRaceActor
+	VTABLE: LEGO1 0x100d5510 LegoAnimActor
+	VTABLE: LEGO1 0x100d5440 LegoPathActor
+	VTABLE: LEGO1 0x100d5510 LegoRaceMap
+*/
+// SIZE 0x1b4
+class LegoRaceMap : public virtual LegoRaceActor {
+public:
+	LegoRaceMap();
+	virtual void FUN_1005d4b0();
+
+	// SYNTHETIC: LEGO1 0x1005d5c0
+	// LegoRaceMap::`scalar deleting destructor'
+
+private:
+	MxBool m_unk0x08;     // 0x08
+	void* m_unk0x0c;      // 0x0c
+	undefined4 m_unk0x10; // 0x10
+	float m_unk0x14;      // 0x14
+	float m_unk0x18;      // 0x18
+	float m_unk0x1c;      // 0x1c
+	float m_unk0x20;      // 0x20
+	float m_unk0x24;      // 0x24
+	float m_unk0x28;      // 0x28
+	float m_unk0x2c;      // 0x2c
+	undefined4 m_unk0x30; // 0x30
+};
+
+#endif // LEGORACEMAP_H
--- a/LEGO1/lego/legoomni/include/legotexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legotexturepresenter.h
@@ -5,7 +5,7 @@
 #include "mxmediapresenter.h"

 // VTABLE: LEGO1 0x100d4d90
-// SIZE 0x54 (from inlined construction at 0x10009bb5)
+// SIZE 0x54
 class LegoTexturePresenter : public MxMediaPresenter {
 public:
 	LegoTexturePresenter() : m_textures(NULL) {}
--- a/LEGO1/lego/legoomni/include/legounknown100d7c88.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
@@ -5,6 +5,7 @@
 #include "mxstring.h"

 // VTABLE: LEGO1 0x100d7c88
+// SIZE 0x18
 class LegoUnknown100d7c88 {
 public:
 	~LegoUnknown100d7c88();
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -12,7 +12,6 @@ class PoliceState;

 // VTABLE: LEGO1 0x100d8a80
 // SIZE 0x110
-// Radio at 0xf8
 class Police : public LegoWorld {
 public:
 	Police();
--- a/LEGO1/lego/legoomni/include/raceskel.h
+++ b/LEGO1/lego/legoomni/include/raceskel.h
@@ -0,0 +1,16 @@
+#ifndef RACESKEL_H
+#define RACESKEL_H
+
+#include "legoanimactor.h"
+
+/*
+	VTABLE : LEGO1 0x100d7668 LegoPathActor
+	VTABLE : LEGO1 0x100d7738 LegoAnimActor
+*/
+// SIZE 0x178
+class RaceSkel : public LegoAnimActor {
+public:
+	RaceSkel();
+};
+
+#endif // RACESKEL_H