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

Add size assertions for legoomni and fix sizes

Browse Source
This commit is contained in:
Nathan
2024-03-22 17:53:03 -04:00
parent 7ff8f85d65
commit 6c9f888ea3
90 changed files with 313 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,6 @@
#ifndef ACT2ACTOR_H
#define ACT2ACTOR_H
#include "legoanimactor.h"
/*
@@ -6,6 +9,7 @@
*/
// SIZE 0x1a8
class Act2Actor : public LegoAnimActor {
public:
Act2Actor();
// SYNTHETIC: LEGO1 0x1001a090
@@ -14,3 +18,5 @@ class Act2Actor : public LegoAnimActor {
private:
undefined m_unk0x1c[0x34]; // 0x1c
};
#endif // ACT2ACTOR_H

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

@@ -30,6 +30,14 @@ public:
// SYNTHETIC: LEGO1 0x1007a450
// Act2Brick::`scalar deleting destructor'
private:
undefined4 m_unk0x154; // 0x154
undefined m_unk0x158[0x0c]; // 0x158
undefined4 m_unk0x164; // 0x164
Mx3DPointFloat m_unk0x168; // 0x168
Mx3DPointFloat m_unk0x17c; // 0x17c
undefined4 m_unk0x190; // 0x190
};
#endif // ACT2BRICK_H

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

@@ -4,8 +4,8 @@
#include "legoanimactor.h"
/*
VTABLE : LEGO1 0x100d7668 LegoPathActor
VTABLE : LEGO1 0x100d7738 LegoAnimActor
VTABLE: LEGO1 0x100d7668 LegoPathActor
VTABLE: LEGO1 0x100d7738 LegoAnimActor
*/
// SIZE 0x178
class Act3Actor : public LegoAnimActor {
@@ -18,6 +18,9 @@ public:
// STRING: LEGO1 0x100f03ac
return "Act3Actor";
}
private:
undefined4 m_unk0x1c; // 0x1c
};
#endif // ACT3ACTOR_H

10
LEGO1/lego/legoomni/include/act3shark.h
View File

@@ -4,8 +4,8 @@
#include "legoanimactor.h"
/*
VTABLE : LEGO1 0x100d7920 LegoPathActor
VTABLE : LEGO1 0x100d79f0 LegoAnimActor
VTABLE: LEGO1 0x100d7920 LegoPathActor
VTABLE: LEGO1 0x100d79f0 LegoAnimActor
*/
// SIZE 0x1a8
class Act3Shark : public LegoAnimActor {
@@ -34,6 +34,12 @@ public:
// SYNTHETIC: LEGO1 0x10043020
// Act3Shark::`scalar deleting destructor'
list<void*> m_unk0x1c; // 0x1c
undefined4 m_unk0x28; // 0x28
undefined4 m_unk0x2c; // 0x2c
undefined m_unk0x30[0x0c]; // 0x30
Mx3DPointFloat m_unk0x3c; // 0x3c
};
#endif // ACT3SHARK_H

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

@@ -5,8 +5,8 @@
#include "mxtypes.h"
/*
VTABLE : LEGO1 0x100d6790 LegoPathActor
VTABLE : LEGO1 0x100d6860 LegoAnimActor
VTABLE: LEGO1 0x100d6790 LegoPathActor
VTABLE: LEGO1 0x100d6860 LegoAnimActor
*/
// SIZE 0x174
class BumpBouy : public LegoAnimActor {

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

@@ -26,6 +26,15 @@ public:
// SYNTHETIC: LEGO1 0x1000e580
// Doors::`scalar deleting destructor'
private:
undefined4 m_unk0x154; // 0x154
undefined4 m_unk0x158; // 0x158
undefined4 m_unk0x15c; // 0x15c
undefined4 m_unk0x160; // 0x160
MxMatrix m_unk0x164; // 0x164
MxMatrix m_unk0x1ac; // 0x1fc
undefined4 m_unk0x1f4; // 0x1f4
};
#endif // DOORS_H

23
LEGO1/lego/legoomni/include/legoact2.h
View File

@@ -1,6 +1,7 @@
#ifndef LEGOACT2_H
#define LEGOACT2_H
#include "act2brick.h"
#include "legocarraceactor.h"
#include "legopathactor.h"
#include "legoworld.h"
@@ -20,6 +21,28 @@ class LegoAct2 : public LegoWorld {
// SYNTHETIC: LEGO1 0x1004fe20
// LegoAct2::`scalar deleting destructor'
Act2Brick m_bricks[10]; // 0xf8
undefined m_unk0x10c0; // 0x10c0
undefined m_unk0x10c1; // 0x10c1
undefined m_unk0x10c2; // 0x10c2
undefined4 m_unk0x10c4; // 0x10c4
undefined4 m_unk0x10c8; // 0x10c8
undefined4 m_unk0x10cc; // 0x10cc
undefined4 m_unk0x10d0; // 0x10d0
char* m_unk0x10d4; // 0x10d4
undefined4 m_unk0x10d8; // 0x10d8
MxMatrix m_unk0x10dc; // 0x10dc
undefined4 m_unk0x1124; // 0x1124
undefined4 m_unk0x1128; // 0x1128
undefined4 m_unk0x112c; // 0x112c
undefined4 m_unk0x1130; // 0x1130
undefined4 m_unk0x1134; // 0x1134
undefined4 m_unk0x1138; // 0x1138
undefined m_unk0x113c; // 0x113c
undefined4 m_unk0x1140; // 0x1140
undefined4 m_unk0x1144; // 0x1144
undefined m_unk0x1148[0x08]; // 0x1148
undefined4 m_unk0x1150; // 0x1150
};
#endif // LEGOACT2_H

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

@@ -35,8 +35,8 @@ public:
// LegoAnimActor::`scalar deleting destructor'
private:
vector<void*> m_vector; // 0x00
MxU16 m_index; // 0x14
vector<void*> m_unk0x08; // 0x08
MxU16 m_index; // 0x18
};
#endif // LEGOANIMACTOR_H

3
LEGO1/lego/legoomni/include/legoanimpresenter.h
View File

@@ -10,7 +10,7 @@ class LegoWorld;
class LegoAnimClass;
// VTABLE: LEGO1 0x100d90c8
// SIZE 0xc0
// SIZE 0xbc
class LegoAnimPresenter : public MxVideoPresenter {
public:
enum {
@@ -93,7 +93,6 @@ protected:
undefined4 m_unk0xa0; // 0xa0
undefined4 m_unk0xa4; // 0xa4
Mx3DPointFloat m_unk0xa8; // 0xa8
undefined4 m_unk0xbc; // 0xbc
};
// SYNTHETIC: LEGO1 0x10068650

53
LEGO1/lego/legoomni/include/legocarbuild.h
View File

@@ -34,6 +34,59 @@ public:
// SYNTHETIC: LEGO1 0x10022a60
// LegoCarBuild::`scalar deleting destructor'
private:
undefined4 m_unk0xf8; // 0xf8
undefined m_unk0xfc[0x8]; // 0xfc
undefined4 m_unk0x104; // 0x104
undefined m_unk0x108; // 0x108
undefined m_unk0x109; // 0x109
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
Mx3DPointFloat m_unk0x114; // 0x114
undefined4 m_unk0x128; // 0x128
MxMatrix m_unk0x12c; // 0x12c
undefined m_unk0x174; // 0x174
MxMatrix m_unk0x178; // 0x178
MxMatrix m_unk0x1c0; // 0x1c0
MxMatrix m_unk0x208; // 0x208
undefined m_unk0x250[0x08]; // 0x250
undefined4 m_unk0x258; // 0x258
Mx4DPointFloat m_unk0x25c; // 0x25c
Mx4DPointFloat m_unk0x274; // 0x274
undefined m_unk0x28c[0x18]; // 0x28c
Mx4DPointFloat m_unk0x2a4; // 0x2a4
Mx4DPointFloat m_unk0x2bc; // 0x2bc
undefined m_unk0x2d4; // 0x2d4
undefined4 m_unk0x2dc; // 0x2dc
undefined4 m_unk0x2e0; // 0x2e0
undefined4 m_unk0x2e4; // 0x2e4
undefined4 m_unk0x2e8; // 0x2e8
undefined4 m_unk0x2ec; // 0x2ec
undefined4 m_unk0x2f0; // 0x2f0
undefined4 m_unk0x2f4; // 0x2f4
undefined4 m_unk0x2f8; // 0x2f8
undefined4 m_unk0x2fc; // 0x2fc
undefined4 m_unk0x300; // 0x300
undefined4 m_unk0x304; // 0x304
undefined4 m_unk0x308; // 0x308
undefined4 m_unk0x30c; // 0x30c
undefined4 m_unk0x310; // 0x310
undefined4 m_unk0x314; // 0x314
undefined4 m_unk0x318; // 0x318
undefined4 m_unk0x31c; // 0x31c
undefined4 m_unk0x320; // 0x320
undefined4 m_unk0x324; // 0x324
undefined4 m_unk0x328; // 0x328
undefined4 m_unk0x2d8; // 0x2d8
undefined4 m_unk0x32c; // 0x32c
undefined4 m_unk0x330; // 0x330
undefined4 m_unk0x334; // 0x334
undefined4 m_unk0x338; // 0x338
undefined4 m_unk0x33c; // 0x33c
undefined4 m_unk0x340; // 0x340
undefined4 m_unk0x344; // 0x344
undefined4 m_unk0x348; // 0x348
};
#endif // LEGOCARBUILD_H

18
LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
View File

@@ -31,6 +31,24 @@ public:
// SYNTHETIC: LEGO1 0x10078660
// LegoCarBuildAnimPresenter::`scalar deleting destructor'
private:
undefined2 m_unk0xbc; // 0xbc
undefined2 m_unk0xbe; // 0xbe
undefined2 m_unk0xc0; // 0xc0
undefined4 m_unk0xc4; // 0xc4
LegoAnim m_unk0xc8; // 0xc8
MxMatrix m_unk0xe0; // 0xe0
undefined4 m_unk0x128; // 0x128
undefined4 m_unk0x12c; // 0x12c
undefined4 m_unk0x130; // 0x130
undefined4 m_unk0x134; // 0x134
undefined4 m_unk0x138; // 0x138
undefined4 m_unk0x13c; // 0x13c
undefined4 m_unk0x140; // 0x140
MxS32 m_unk0x144; // 0x144
MxS32 m_unk0x148; // 0x148
undefined4 m_unk0x14c; // 0x14c
};
#endif // LEGOCARBUILDANIMPRESENTER_H

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

@@ -47,7 +47,7 @@ public:
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();
virtual void VTable0x1c(); // vtable+0x1c
// SYNTHETIC: LEGO1 0x10081610
// LegoCarRaceActor::`scalar deleting destructor'

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

@@ -4,9 +4,9 @@
#include "legoanimactor.h"
/*
VTABLE : LEGO1 0x100d6c00 LegoAnimActor
VTABLE : LEGO1 0x100d6c10 LegoPathActor
VTABLE : LEGO1 0x100d6cdc LegoExtraActor
VTABLE: LEGO1 0x100d6c00 LegoAnimActor
VTABLE: LEGO1 0x100d6c10 LegoPathActor
VTABLE: LEGO1 0x100d6cdc LegoExtraActor
*/
// SIZE 0x1dc
class LegoExtraActor : public virtual LegoAnimActor {

1
LEGO1/lego/legoomni/include/legojetskiraceactor.h
View File

@@ -30,6 +30,7 @@ public:
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
void VTable0x1c() override; // vtable+0x1c
// SYNTHETIC: LEGO1 0x10081d40
// LegoJetskiRaceActor::`scalar deleting destructor'

3
LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
View File

@@ -22,6 +22,9 @@ public:
void StreamingTickle() override; // vtable+0x20
void PutFrame() override; // vtable+0x6c
private:
undefined4 m_unk0xbc; // 0xbc
};
// SYNTHETIC: LEGO1 0x1006d000

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

@@ -59,8 +59,8 @@
X(DuneBuggy) \
X(Pizza) \
X(PizzaMissionState) \
/*X(Act2Actor)*/ \
/*X(Act2Brick)*/ \
X(Act2Actor) \
X(Act2Brick) \
/*X(Act2GenActor)*/ \
X(Act2PoliceStation) \
X(Act3) \
@@ -98,7 +98,7 @@
X(MxCompositeMediaPresenter) \
X(JukeBox) \
X(JukeBoxState) \
/*X(RaceSkel)*/ \
X(RaceSkel) \
X(AnimState)
// VTABLE: LEGO1 0x100d4768

13
LEGO1/lego/legoomni/include/legopathcontroller.h
View File

@@ -38,6 +38,19 @@ public:
undefined4 FUN_10046770(IslePathActor* p_actor);
MxResult FUN_10046b30(LegoPathBoundary** p_path, MxS32& p_value);
void Enable(MxBool p_enable);
private:
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
undefined4 m_unk0x14; // 0x14
undefined2 m_unk0x18; // 0x18
undefined2 m_unk0x1a; // 0x1a
undefined2 m_unk0x1c; // 0x1c
undefined2 m_unk0x1e; // 0x1e
// These 2 are some sort of template class
undefined m_unk0x20[0x10]; // 0x20
undefined m_unk0x30[0x10]; // 0x30
};
#endif // LEGOPATHCONTROLLER_H

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

@@ -45,7 +45,9 @@ public:
// SYNTHETIC: LEGO1 0x10014230
// LegoRaceCar::`scalar deleting destructor'
byte m_unk0x54; // 0x54
private:
undefined m_unk0x54; // 0x54
undefined4 m_unk0x58; // 0x58
Mx3DPointFloat m_unk0x5c; // 0x5c
undefined4 m_unk0x70; // 0x70

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

@@ -7,6 +7,8 @@
// SIZE 0x84
class Pizzeria : public IsleActor {
public:
Pizzeria() : m_unk0x7c(0) {}
// FUNCTION: LEGO1 0x1000e780
inline const char* ClassName() const override // vtable+0x0c
{
@@ -24,6 +26,11 @@ public:
// SYNTHETIC: LEGO1 0x1000e8d0
// Pizzeria::`scalar deleting destructor'
private:
undefined4 m_unk0x78; // 0x78
undefined4 m_unk0x7c; // 0x7c
undefined4 m_unk0x80; // 0x80
};
#endif // PIZZERIA_H

15
LEGO1/lego/legoomni/include/pizzeriastate.h
View File

@@ -3,8 +3,17 @@
#include "legostate.h"
// SIZE 0x14
struct PizzeriaStateStruct {
undefined4 m_unk0x00; // 0x00
undefined4 m_unk0x04; // 0x04
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
};
// VTABLE: LEGO1 0x100d5ee8
// SIZE 0xb4
// SIZE 0x58
class PizzeriaState : public LegoState {
public:
PizzeriaState();
@@ -26,6 +35,10 @@ public:
// SYNTHETIC: LEGO1 0x10017ce0
// PizzeriaState::`scalar deleting destructor'
private:
Playlist m_unk0x08[5]; // 0x08
PizzeriaStateStruct m_unk0x44; // 0x44
};
#endif // PIZZERIASTATE_H

3
LEGO1/lego/legoomni/include/raceskel.h
View File

@@ -11,6 +11,9 @@
class RaceSkel : public LegoAnimActor {
public:
RaceSkel();
private:
undefined4 m_unk0x1c; // 0x1c
};
#endif // RACESKEL_H