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

Implement/match LegoAnimActor (#730)

Browse Source 
* Implement/match LegoAnimActor

* Name changes (deviation from original source)

* Attempt to fix modern build

* Add missing override

* Match LegoAnimActor::SetWorldSpeed

* Remove junk

* Style changes and implement WEEdge

* Add override

* Match LegoAnimActor::FUN_1001c1f0, style

* Style

* Add missing annotations, STUB LegoPathBoundary

* Style

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-03-26 13:51:52 -04:00
committed by GitHub
parent 43ce89224a
commit 1e3ca11886
25 changed files with 534 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,42 +1,82 @@
#ifndef LEGOANIMACTOR_H
#define LEGOANIMACTOR_H
#include "anim/legoanim.h"
#include "decomp.h"
#include "legopathactor.h"
/*
VTABLE: LEGO1 0x100d5440 LegoPathActor
VTABLE: LEGO1 0x100d5510 LegoAnimActor
*/
// SIZE 0x20
struct LegoAnimActorStruct {
LegoAnimActorStruct(float p_unk0x00, LegoAnim* p_AnimTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs);
~LegoAnimActorStruct();
float GetDuration();
float m_unk0x00; // 0x00
LegoAnim* m_AnimTreePtr; // 0x04
LegoROI** m_roiMap; // 0x08
MxU32 m_numROIs; // 0x0c
vector<undefined*> m_unk0x10; // 0x10
};
// VTABLE: LEGO1 0x100d5440 LegoPathActor
// VTABLE: LEGO1 0x100d5510 LegoAnimActor
// SIZE 0x174
class LegoAnimActor : public virtual LegoPathActor {
public:
LegoAnimActor() { m_index = -1; }
LegoAnimActor() { m_curAnim = -1; }
~LegoAnimActor() override;
// FUNCTION: LEGO1 0x1000fb90
// FUNCTION: LEGO1 0x1000fba0
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f057c
return "LegoAnimActor";
}
// FUNCTION: LEGO1 0x1000fbb0
// FUNCTION: LEGO1 0x1000fbc0
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();
void ParseAction(char* p_extra) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void VTable0x70(float p_und) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
// SYNTHETIC: LEGO1 0x1000fb50
virtual MxResult FUN_1001c1f0(float& p_und);
virtual MxResult FUN_1001c360(float, Matrix4& p_transform);
virtual MxResult FUN_1001c450(LegoAnim* p_AnimTreePtr, float p_unk0x00, LegoROI** p_roiMap, MxU32 p_numROIs);
virtual void ClearMaps();
// SYNTHETIC: LEGO1 0x1000fb60
// LegoAnimActor::`scalar deleting destructor'
private:
vector<void*> m_unk0x08; // 0x08
MxU16 m_index; // 0x18
vector<LegoAnimActorStruct*> m_animMaps; // 0x08
MxS16 m_curAnim; // 0x18
};
// TEMPLATE: LEGO1 0x1000da60
// Vector<LegoAnimActorStruct *>::~Vector<LegoAnimActorStruct *>
// TEMPLATE: LEGO1 0x1001c010
// vector<unsigned char *,allocator<unsigned char *> >::~vector<unsigned char *,allocator<unsigned char *> >
// TEMPLATE: LEGO1 0x1001c050
// Vector<unsigned char *>::~Vector<unsigned char *>
// TEMPLATE: LEGO1 0x1001c7c0
// vector<LegoAnimActorStruct *,allocator<LegoAnimActorStruct *> >::size
// TEMPLATE: LEGO1 0x1001c7e0
// vector<LegoAnimActorStruct *,allocator<LegoAnimActorStruct *> >::_Destroy
// TEMPLATE: LEGO1 0x1001c9e0
// uninitialized_fill_n
// TEMPLATE: LEGO1 0x1001ca10
// uninitialized_copy
#endif // LEGOANIMACTOR_H