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

Implement parts of LegoCarBuild and dependents (#1092)

Browse Source 
* Implement parts of `LegoCarBuild` and dependents

* Fix BETA10 offset

* Fix constants

* Code style: Rename parameters

* Linter fixes v2

* Linter errors v3

* Add BETA10 variable names for presenters

* Address review comments

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2024-09-03 22:50:30 +02:00
committed by GitHub
parent 73938ac2ab
commit 2b14d3d6a5
19 changed files with 744 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,11 @@
#include "legostate.h"
#include "legoworld.h"
class LegoCarBuildAnimPresenter;
class MxControlPresenter;
class MxStillPresenter;
class MxSoundPresenter;
// VTABLE: LEGO1 0x100d66e0
// SIZE 0x50
class LegoVehicleBuildState : public LegoState {
@@ -55,15 +60,13 @@ typedef LegoVehicleBuildState LegoDuneCarBuildState;
typedef LegoVehicleBuildState LegoJetskiBuildState;
// VTABLE: LEGO1 0x100d6658
// VTABLE: BETA10 0x101bb880
// SIZE 0x34c
class LegoCarBuild : public LegoWorld {
public:
LegoCarBuild();
~LegoCarBuild() override;
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x10022940
const char* ClassName() const override // vtable+0x0c
{
@@ -71,79 +74,116 @@ public:
return "LegoCarBuild";
}
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x10022950
MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual void VTable0x6c(); // vtable+0x6c
virtual void VTable0x70(); // vtable+0x70
virtual void VTable0x74(); // vtable+0x74
virtual void VTable0x78(); // vtable+0x78
virtual void VTable0x7c(); // vtable+0x7c
virtual void VTable0x80(); // vtable+0x80
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual void VTable0x6c(); // vtable+0x6c
virtual void VTable0x70(); // vtable+0x70
virtual void VTable0x74(MxFloat p_param1[3], MxFloat p_param2[3]); // vtable+0x74
virtual void VTable0x78(MxFloat p_param1[3], MxFloat p_param2[3]); // vtable+0x78
virtual void VTable0x7c(MxFloat p_param1[3], MxFloat p_param2[3]); // vtable+0x7c
virtual void VTable0x80(
MxFloat p_param1[2],
MxFloat p_param2[2],
MxFloat p_param3,
MxFloat p_param4[2]
); // vtable+0x80
void InitPresenters();
void FUN_10022f30();
void FUN_10024ef0();
void FUN_10024f50();
void SetPresentersEnabled(MxBool p_enabled);
void TogglePresentersEnabled();
undefined4 FUN_10025720(undefined4 p_param1);
MxS32 FUN_10025d70();
void FUN_10025db0(const char* p_param1, undefined4 p_param2);
MxS32 FUN_10025ee0(undefined4 p_param1);
// 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
undefined4 m_unk0xf8; // 0xf8
MxS16 m_unk0xfc; // 0xfc
undefined m_unk0xfe[2]; // 0xfe
undefined4 m_unk0x100; // 0x100
undefined4 m_unk0x104; // 0x104
undefined m_unk0x108; // 0x108
undefined m_unk0x109; // 0x109
MxU16 m_unk0x10a; // 0x10a
DWORD m_unk0x10c; // 0x10c
LegoROI* 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
LegoCarBuildAnimPresenter* m_unk0x258; // 0x258
UnknownMx4DPointFloat m_unk0x25c; // 0x25c
// These four are likely locations in pixel space
MxS32 m_unk0x290; // 0x290
MxS32 m_unk0x294; // 0x294
MxS32 m_unk0x298; // 0x298
MxS32 m_unk0x29c; // 0x29c
MxFloat m_unk0x2a0; // 0x2a0
Mx4DPointFloat m_unk0x2a4; // 0x2a4
Mx4DPointFloat m_unk0x2bc; // 0x2bc
MxBool m_unk0x2d4; // 0x2d4
// variable names verified by BETA10 0x1006b27a
MxStillPresenter* m_ColorBook_Bitmap; // 0x2dc
MxControlPresenter* m_Yellow_Ctl; // 0x2e0
MxControlPresenter* m_Red_Ctl; // 0x2e4
MxControlPresenter* m_Blue_Ctl; // 0x2e8
MxControlPresenter* m_Green_Ctl; // 0x2ec
MxControlPresenter* m_Gray_Ctl; // 0x2f0
MxControlPresenter* m_Black_Ctl; // 0x2f4
MxSoundPresenter* m_Shelf_Sound; // 0x2f8
MxSoundPresenter* m_PlaceBrick_Sound; // 0x2fc
MxSoundPresenter* m_GetBrick_Sound; // 0x300
MxSoundPresenter* m_Paint_Sound; // 0x304
MxSoundPresenter* m_Decal_Sound; // 0x308
MxStillPresenter* m_Decal_Bitmap; // 0x30c
MxControlPresenter* m_Decals_Ctl; // 0x310
MxControlPresenter* m_Decals_Ctl1; // 0x314
MxControlPresenter* m_Decals_Ctl2; // 0x318
MxControlPresenter* m_Decals_Ctl3; // 0x31c
MxControlPresenter* m_Decals_Ctl4; // 0x320
MxControlPresenter* m_Decals_Ctl5; // 0x324
MxControlPresenter* m_Decals_Ctl6; // 0x328
MxControlPresenter* m_Decals_Ctl7; // 0x32c
// variable name verified by BETA10 0x1006b219
LegoVehicleBuildState* m_buildState; // 0x32c
undefined4 m_unk0x330; // 0x330
undefined4 m_unk0x334; // 0x334
undefined4 m_unk0x338; // 0x338
MxControlPresenter* m_unk0x33c; // 0x33c
undefined4 m_unk0x340; // 0x340
undefined4 m_unk0x344; // 0x344
MxU8 m_presentersEnabled; // 0x348
static MxS16 g_unk0x100f11cc;
static MxFloat g_unk0x100d65a4;
static MxFloat g_unk0x100d65a8;
};
#endif // LEGOCARBUILD_H