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

Implement/match LegoAnimationManager::FUN_10064380 (#928)

Browse Source 
* Implement/match LegoAnimationManager::FUN_10064380

* Fix naming

* Revert
This commit is contained in:
Christian Semmler
2024-05-17 14:21:48 -04:00
committed by GitHub
parent ed782980ec
commit 710f07e632
4 changed files with 317 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
LEGO1/lego/legoomni/include/legoanimationmanager.h
View File

@@ -36,7 +36,7 @@ public:
MxS32 m_unk0x10; // 0x10
MxBool m_active; // 0x14
MxU8 m_unk0x15; // 0x15
MxU8 m_unk0x16; // 0x16
MxS8 m_unk0x16; // 0x16
};
// SIZE 0x08
@@ -53,7 +53,7 @@ public:
MxLong m_unk0x08; // 0x08
MxBool m_unk0x0c; // 0x0c
MxBool m_unk0x0d; // 0x0d
float m_unk0x10; // 0x10
float m_speed; // 0x10
MxBool m_unk0x14; // 0x14
};
@@ -150,6 +150,19 @@ private:
void FUN_10063d10();
MxBool FUN_10063fb0(LegoLocation::Boundary* p_boundary, LegoWorld* p_world);
MxBool FUN_10064120(LegoLocation::Boundary* p_boundary, MxBool, MxBool);
MxResult FUN_10064380(
const char* p_name,
const char* p_boundaryName,
MxS32 p_src,
float p_srcScale,
MxS32 p_dest,
float p_destScale,
MxU32 p_undIdx1,
MxS32 p_unk0x0c,
MxU32 p_undIdx2,
MxS32 p_unk0x10,
float p_speed
);
void FUN_100648f0(LegoTranInfo*, MxLong);
void FUN_10064b50(MxLong p_time);

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

@@ -49,7 +49,8 @@ public:
MxResult WaitForAnimation() override; // vtable+0x9c
void VTable0xa4(MxU8& p_und1, MxS32& p_und2) override; // vtable+0xa4
void VTable0xc4() override; // vtable+0xc4
virtual MxResult VTable0xc8(); // vtable+0xc8
virtual MxResult FUN_1002aae0();
void Restart();
inline void FUN_1002ad8a();