isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-26 17:36:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement/match LegoAnimPresenter::EndAction (#838)

Browse source
This commit is contained in:
Christian Semmler 2024-04-22 09:42:52 -04:00 committed by GitHub
parent b4f29ea6b0
commit c01fd9b260
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legoanimpresenter.h
View file

@ -28,6 +28,7 @@ typedef map<const char*, LegoAnimStruct, LegoAnimStructComparator> LegoAnimPrese
class LegoAnimPresenter : public MxVideoPresenter { class LegoAnimPresenter : public MxVideoPresenter {
public: public:
enum { enum {
c_bit1 = 0x01,
c_bit2 = 0x02 c_bit2 = 0x02
}; };
@ -92,6 +93,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
void FUN_10069b10(); void FUN_10069b10();
void FUN_1006a3c0(LegoAnimPresenterMap& p_map, LegoTreeNode* p_node, LegoROI* p_roi); void FUN_1006a3c0(LegoAnimPresenterMap& p_map, LegoTreeNode* p_node, LegoROI* p_roi);
void FUN_1006a4f0(LegoAnimPresenterMap& p_map, LegoAnimNodeData* p_data, const LegoChar* p_und, LegoROI* p_roi); void FUN_1006a4f0(LegoAnimPresenterMap& p_map, LegoAnimNodeData* p_data, const LegoChar* p_und, LegoROI* p_roi);
void FUN_1006ab70();
LegoBool FUN_1006aba0(); LegoBool FUN_1006aba0();
MxBool FUN_1006abb0(LegoTreeNode* p_node, LegoROI* p_roi); MxBool FUN_1006abb0(LegoTreeNode* p_node, LegoROI* p_roi);
void FUN_1006ac90(); void FUN_1006ac90();
@ -104,7 +106,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
LegoROIList* m_unk0x70; // 0x70 LegoROIList* m_unk0x70; // 0x70
LegoROIList* m_unk0x74; // 0x74 LegoROIList* m_unk0x74; // 0x74
MxMatrix* m_unk0x78; // 0x78 MxMatrix* m_unk0x78; // 0x78
undefined4 m_unk0x7c; // 0x7c MxU32 m_flags; // 0x7c
LegoWorld* m_currentWorld; // 0x80 LegoWorld* m_currentWorld; // 0x80
MxAtomId m_animAtom; // 0x84 MxAtomId m_animAtom; // 0x84
undefined4 m_unk0x88; // 0x88 undefined4 m_unk0x88; // 0x88

54
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View file

@ -8,8 +8,10 @@
#include "mxcompositepresenter.h" #include "mxcompositepresenter.h"
#include "mxdsanim.h" #include "mxdsanim.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxnotificationmanager.h"
#include "mxstreamchunk.h" #include "mxstreamchunk.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxtype18notificationparam.h"
#include "mxvideomanager.h" #include "mxvideomanager.h"
#include "realtime/realtime.h" #include "realtime/realtime.h"
@ -36,7 +38,7 @@ void LegoAnimPresenter::Init()
m_unk0x74 = NULL; m_unk0x74 = NULL;
m_unk0x70 = NULL; m_unk0x70 = NULL;
m_unk0x78 = NULL; m_unk0x78 = NULL;
m_unk0x7c = 0; m_flags = 0;
m_unk0xa8.Clear(); m_unk0xa8.Clear();
m_unk0xa4 = 0; m_unk0xa4 = 0;
m_currentWorld = NULL; m_currentWorld = NULL;
@ -447,6 +449,12 @@ void LegoAnimPresenter::FUN_1006a4f0(
} }
} }
// STUB: LEGO1 0x1006ab70
void LegoAnimPresenter::FUN_1006ab70()
{
// TODO
}
// FUNCTION: LEGO1 0x1006aba0 // FUNCTION: LEGO1 0x1006aba0
LegoBool LegoAnimPresenter::FUN_1006aba0() LegoBool LegoAnimPresenter::FUN_1006aba0()
{ {
@ -610,7 +618,7 @@ void LegoAnimPresenter::StartingTickle()
FUN_100692b0(); FUN_100692b0();
FUN_100695c0(); FUN_100695c0();
if (m_unk0x7c & c_bit2 && !FUN_1006aba0()) { if (m_flags & c_bit2 && !FUN_1006aba0()) {
goto done; goto done;
} }
@ -759,18 +767,44 @@ MxResult LegoAnimPresenter::StartAction(MxStreamController* p_controller, MxDSAc
return result; return result;
} }
// STUB: LEGO1 0x1006c640 // FUNCTION: LEGO1 0x1006c640
// FUNCTION: BETA10 0x10051b7a
void LegoAnimPresenter::EndAction() void LegoAnimPresenter::EndAction()
{ {
if (m_action) { undefined4 unused; // required for match
// TODO
if (m_currentWorld) { if (m_action == NULL) {
m_currentWorld->Remove(this); return;
}
FUN_1006c8a0(FALSE);
MxVideoPresenter::EndAction();
} }
LegoWorld* world = CurrentWorld();
if (world != NULL) {
MxType18NotificationParam param(c_notificationType18, NULL, 0);
NotificationManager()->Send(world, param);
}
if (m_anim != NULL) {
FUN_1006b9a0(m_anim, m_anim->GetDuration(), m_unk0x78);
}
if (m_roiMapSize != 0 && m_roiMap != NULL && m_roiMap[1] != NULL && m_flags & c_bit1) {
for (MxS16 i = 1; i <= m_roiMapSize; i++) {
if (m_roiMap[i] != NULL) {
m_roiMap[i]->SetVisibility(FALSE);
}
}
}
FUN_1006c8a0(FALSE);
FUN_1006ab70();
VTable0x90();
if (m_currentWorld != NULL) {
m_currentWorld->Remove(this);
}
MxVideoPresenter::EndAction();
} }
// FUNCTION: LEGO1 0x1006c7d0 // FUNCTION: LEGO1 0x1006c7d0