Implement MxObjectFactory::{MxObjectFactory,Create} + match sizes of Mx.*Presenter objects created by it (#59)

* Get Isle building on MinGW32 (#63)

* Add MxUnknown100dc6b0::~MxUnknown100dc6b0 stub

* Declare destructor of MxOmni and MxTransitionManager in class

* inline attribute must go first

* Stub LegoState::Vtable0x14 for Act3State

* MxStreamer::VTable0x14 is not an override

* Stub MxEntity::Destroy for LegoState::Destroy

* Stub MxUnknown100dc6e0 for MxSoundManager

* ::ClassName and ::IsA are const methods

* methods in the class body don't need a namespace

* MxSoundManager subclasses MxUnknown100dc6e0

* LegoInputManager subclasses MxPresenter

* NotificationId is an enum, and does not need __declspec(dllexport)

* Fix final #endif of legoomni.h and mxobjectfactory.h

* Add const alternative for LegoOmni::Create and MxVideoParam, only available for MinGW

* Alternative approach to MinGW compatibility

* MinGW on Linux is case sensitve

* Don't delete a member variable. C++ automatically destructs member variables

---------

Co-authored-by: MattKC <34096995+itsmattkc@users.noreply.github.com>

* MxatomId: implement inline operator==

* Add decomp.h header, containing macro's only used when matching the original binaries

* Add in-line constructor of MxPresenter

* MxMediaPresenter: add members to match size

* MxVideoPresenter: add members to match size

* MxCompositePresenter: add members to match size

* MxFlcPresenter: add members to match size

* MxSmkPresenter: add members to match size

* MxStillPresenter: add members to match size

* MxAudioPresenter: add members to match size

* MxWavePresenter: add members to match size

* MxMIDIPresenter: add members to match size

* MxEventPresenter: add members to match size

* MxLoopingFlcPresenter: add members to match size

* MxLoopingSmkPresenter: add members to match size

* MxLoopingMIDIPresenter: add check for size

* Implement MxObjectFactory::{MxObjectFactory,Create}

Matching of MxObjectFactory::Create is not good, because none of the other objects have been implemented.

* Implement a few MxPresenter methods

* Fix size of LegoInputManager

* Fix name of first padding member of legoinputmanager.h

* add DECOMP_SIZE_ASSERT macro

* Use DECOMP_SIZE_ASSERT macro + convert to hexadecimal

* fixed minor typos

---------

Co-authored-by: MattKC <34096995+itsmattkc@users.noreply.github.com>
Co-authored-by: itsmattkc <itsmattkc@gmail.com>
This commit is contained in:
Anonymous Maarten
2023-07-02 09:00:28 +02:00
committed by GitHub
parent 302b3f66f0
commit 646b39e876
34 changed files with 312 additions and 67 deletions

View File

@@ -1,5 +1,9 @@
#include "mxpresenter.h"
#include "decomp.h"
DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
// OFFSET: LEGO1 0x1000bee0 STUB
void MxPresenter::DoneTickle()
{
@@ -24,10 +28,9 @@ void MxPresenter::ParseExtra()
// TODO
}
// OFFSET: LEGO1 0x1000c070 STUB
// OFFSET: LEGO1 0x1000bf00
MxPresenter::~MxPresenter()
{
// TODO
}
// OFFSET: LEGO1 0x100b5200 STUB
@@ -46,52 +49,57 @@ long MxPresenter::StartAction(MxStreamController *, MxDSAction *)
return 0;
}
// OFFSET: LEGO1 0x100d4d74 STUB
// OFFSET: LEGO1 0x100b4e40 STUB
void MxPresenter::EndAction()
{
// TODO
}
// OFFSET: LEGO1 0x100d4d8c STUB
// OFFSET: LEGO1 0x100b52d0 STUB
void MxPresenter::Enable(unsigned char)
{
// TODO
}
// OFFSET: LEGO1 0x1000be30 STUB
// OFFSET: LEGO1 0x1000be30
void MxPresenter::VTable0x14()
{
// TODO
}
// OFFSET: LEGO1 0x1000be40 STUB
// OFFSET: LEGO1 0x1000be40
void MxPresenter::VTable0x18()
{
// TODO
ParseExtra();
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 2;
}
// OFFSET: LEGO1 0x1000be60 STUB
// OFFSET: LEGO1 0x1000be60
void MxPresenter::VTable0x1c()
{
// TODO
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 3;
}
// OFFSET: LEGO1 0x1000be80 STUB
// OFFSET: LEGO1 0x1000be80
void MxPresenter::VTable0x20()
{
// TODO
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 4;
}
// OFFSET: LEGO1 0x1000bea0 STUB
// OFFSET: LEGO1 0x1000bea0
void MxPresenter::VTable0x24()
{
// TODO
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 5;
}
// OFFSET: LEGO1 0x1000bec0 STUB
// OFFSET: LEGO1 0x1000bec0
void MxPresenter::VTable0x28()
{
// TODO
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 6;
}
// OFFSET: LEGO1 0x1000bf70
@@ -105,18 +113,17 @@ void MxPresenter::InitVirtual()
{
Init();
}
// OFFSET: LEGO1 0x1000bf90 STUB
// OFFSET: LEGO1 0x1000bf90
void MxPresenter::VTable0x44(undefined4 param)
{
// TODO
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = param;
}
// OFFSET: LEGO1 0x1000bfb0 STUB
undefined4 MxPresenter::VTable0x48(undefined4 param)
// OFFSET: LEGO1 0x1000bfb0
unsigned char MxPresenter::VTable0x48(unsigned char param)
{
// TODO
return undefined4();
return m_unk0xc & (1 << param);
}
// OFFSET: LEGO1 0x1000bfc0
@@ -125,10 +132,8 @@ undefined4 MxPresenter::VTable0x4c()
return 0;
}
// OFFSET: LEGO1 0x1000bfd0 STUB
undefined MxPresenter::VTable0x50()
// OFFSET: LEGO1 0x1000bfd0
undefined MxPresenter::VTable0x50(undefined4, undefined4)
{
// TODO
return 0;
}