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

Beta matching MxDSObject/MxDSAction (#878)

Browse Source 
* Beta matching MxDSObject/MxDSAction

* MxDSAction copy constructor

* A bit more refactor

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
MS
2024-05-03 08:01:27 -04:00
committed by GitHub
parent 72cbd1fc60
commit 446caa4ca1
15 changed files with 295 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
LEGO1/omni/include/mxdsaction.h
View File

@@ -8,6 +8,7 @@
class MxOmni;
// VTABLE: LEGO1 0x100dc098
// VTABLE: BETA10 0x101c1b68
// SIZE 0x94
class MxDSAction : public MxDSObject {
public:
@@ -27,10 +28,12 @@ public:
MxDSAction();
~MxDSAction() override;
MxDSAction(MxDSAction& p_dsAction);
void CopyFrom(MxDSAction& p_dsAction);
MxDSAction& operator=(MxDSAction& p_dsAction);
// FUNCTION: LEGO1 0x100ad980
// FUNCTION: BETA10 0x1012bcf0
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x101013f4
@@ -38,6 +41,7 @@ public:
}
// FUNCTION: LEGO1 0x100ad990
// FUNCTION: BETA10 0x1012bd10
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name);
@@ -57,22 +61,39 @@ public:
void AppendExtra(MxU16 p_extraLength, const char* p_extraData);
// FUNCTION: BETA10 0x1003a560
inline void GetExtra(MxU16& p_extraLength, char*& p_extraData)
{
p_extraLength = m_extraLength;
p_extraData = m_extraData;
}
// FUNCTION: BETA10 0x1003cf70
inline MxU32 GetFlags() { return m_flags; }
// FUNCTION: BETA10 0x1004daa0
inline void SetFlags(MxU32 p_flags) { m_flags = p_flags; }
inline char* GetExtraData() { return m_extraData; }
inline MxU16 GetExtraLength() const { return m_extraLength; }
// FUNCTION: BETA10 0x1005a560
inline MxLong GetStartTime() const { return m_startTime; }
// FUNCTION: BETA10 0x1012be80
inline MxS32 GetLoopCount() { return m_loopCount; }
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
// FUNCTION: BETA10 0x1003db50
inline Mx3DPointFloat& GetLocation() { return m_location; }
// FUNCTION: BETA10 0x1003db80
inline Mx3DPointFloat& GetDirection() { return m_direction; }
// FUNCTION: BETA10 0x1003dbb0
inline Mx3DPointFloat& GetUp() { return m_up; }
inline void SetLocation(const Vector3& p_location) { m_location = p_location; }
inline void SetDirection(const Vector3& p_direction) { m_direction = p_direction; }
inline void SetUp(const Vector3& p_up) { m_up = p_up; }
@@ -85,6 +106,7 @@ public:
inline MxBool IsBit3() const { return m_flags & c_bit3; }
// SYNTHETIC: LEGO1 0x100ada60
// SYNTHETIC: BETA10 0x1012be40
// MxDSAction::`scalar deleting destructor'
protected:

37
LEGO1/omni/include/mxdsobject.h
View File

@@ -8,6 +8,7 @@
class MxPresenter;
// VTABLE: LEGO1 0x100dc868
// VTABLE: BETA10 0x101c23f0
// SIZE 0x2c
class MxDSObject : public MxCore {
public:
@@ -30,15 +31,18 @@ public:
~MxDSObject() override;
void CopyFrom(MxDSObject& p_dsObject);
MxDSObject(MxDSObject& p_dsObject);
MxDSObject& operator=(MxDSObject& p_dsObject);
void SetObjectName(const char* p_objectName);
void SetSourceName(const char* p_sourceName);
// FUNCTION: LEGO1 0x100bf730
// FUNCTION: BETA10 0x1012bdd0
inline const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
// FUNCTION: LEGO1 0x100bf740
// FUNCTION: BETA10 0x1012bd70
inline MxBool IsA(const char* p_name) const override
{
return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
@@ -50,27 +54,34 @@ public:
// FUNCTION: ISLE 0x401c40
// FUNCTION: LEGO1 0x10005530
inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20;
// FUNCTION: BETA10 0x100152e0
inline virtual void SetAtomId(MxAtomId p_atomId) { m_atomId = p_atomId; } // vtable+20;
inline Type GetType() const { return (Type) this->m_type; }
inline const char* GetSourceName() const { return this->m_sourceName; }
inline const char* GetObjectName() const { return this->m_objectName; }
inline MxU32 GetObjectId() { return this->m_objectId; }
inline const MxAtomId& GetAtomId() { return this->m_atomId; }
inline MxS16 GetUnknown24() { return this->m_unk0x24; }
inline MxPresenter* GetUnknown28() { return this->m_unk0x28; }
inline Type GetType() const { return (Type) m_type; }
inline const char* GetSourceName() const { return m_sourceName; }
inline const char* GetObjectName() const { return m_objectName; }
inline MxU32 GetObjectId() { return m_objectId; }
inline const MxAtomId& GetAtomId() { return m_atomId; }
inline MxS16 GetUnknown24() { return m_unk0x24; }
inline MxPresenter* GetUnknown28() { return m_unk0x28; }
inline void SetType(Type p_type) { this->m_type = p_type; }
inline void SetObjectId(MxU32 p_objectId) { this->m_objectId = p_objectId; }
inline void SetUnknown24(MxS16 p_unk0x24) { this->m_unk0x24 = p_unk0x24; }
inline void SetUnknown28(MxPresenter* p_unk0x28) { this->m_unk0x28 = p_unk0x28; }
inline void SetType(Type p_type) { m_type = p_type; }
// FUNCTION: BETA10 0x100152b0
inline void SetObjectId(MxU32 p_objectId) { m_objectId = p_objectId; }
// FUNCTION: BETA10 0x10039570
inline void SetUnknown24(MxS16 p_unk0x24) { m_unk0x24 = p_unk0x24; }
inline void SetUnknown28(MxPresenter* p_unk0x28) { m_unk0x28 = p_unk0x28; }
inline void ClearAtom() { m_atomId.Clear(); }
// SYNTHETIC: LEGO1 0x100bf7c0
// SYNTHETIC: BETA10 0x10148770
// MxDSObject::`scalar deleting destructor'
private:
protected:
MxU32 m_sizeOnDisk; // 0x08
MxU16 m_type; // 0x0c
char* m_sourceName; // 0x10