TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-24 04:26:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve MxControlPresenter::FUN_10044270 (#1422)

Browse Source
This commit is contained in:
MS 2025-04-03 16:25:40 -04:00 committed by GitHub
parent 466c345201
commit 8821593b63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 74 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@
#include "mxcompositepresenter.h" #include "mxcompositepresenter.h"
class LegoControlManagerNotificationParam; class LegoControlManagerNotificationParam;
class MxVideoPresenter;
// VTABLE: LEGO1 0x100d7b88 // VTABLE: LEGO1 0x100d7b88
// VTABLE: BETA10 0x101bf5d0 // VTABLE: BETA10 0x101bf5d0
@ -48,18 +47,18 @@ public:
virtual void VTable0x6c(MxS16 p_unk0x4e); // vtable+0x6c virtual void VTable0x6c(MxS16 p_unk0x4e); // vtable+0x6c
MxBool FUN_10044480(LegoControlManagerNotificationParam* p_param, MxPresenter* p_presenter); MxBool FUN_10044480(LegoControlManagerNotificationParam* p_param, MxPresenter* p_presenter);
MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter); MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter);
MxS16 GetUnknown0x4e() { return m_unk0x4e; } MxS16 GetUnknown0x4e() { return m_unk0x4e; }
private: private:
undefined2 m_unk0x4c; // 0x4c MxS16 m_unk0x4c; // 0x4c
MxS16 m_unk0x4e; // 0x4e MxS16 m_unk0x4e; // 0x4e
MxBool m_unk0x50; // 0x50 MxBool m_unk0x50; // 0x50
undefined2 m_unk0x52; // 0x52 MxS16 m_unk0x52; // 0x52
undefined2 m_unk0x54; // 0x54 MxS16 m_unk0x54; // 0x54
undefined2 m_unk0x56; // 0x56 MxS16 m_unk0x56; // 0x56
MxS16* m_unk0x58; // 0x58 MxS16* m_states; // 0x58
}; };
// SYNTHETIC: LEGO1 0x100440f0 // SYNTHETIC: LEGO1 0x100440f0

125
LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
View File

@ -4,10 +4,12 @@
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "mxdsmultiaction.h" #include "mxdsmultiaction.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxstillpresenter.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxutilities.h" #include "mxutilities.h"
#include "mxvideopresenter.h"
#include <assert.h>
DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c) DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c)
@ -18,15 +20,15 @@ MxControlPresenter::MxControlPresenter()
m_unk0x4e = -1; m_unk0x4e = -1;
m_unk0x50 = FALSE; m_unk0x50 = FALSE;
m_unk0x52 = 0; m_unk0x52 = 0;
m_unk0x58 = 0; m_states = NULL;
m_unk0x54 = 0; m_unk0x54 = 0;
} }
// FUNCTION: LEGO1 0x10044110 // FUNCTION: LEGO1 0x10044110
MxControlPresenter::~MxControlPresenter() MxControlPresenter::~MxControlPresenter()
{ {
if (m_unk0x58) { if (m_states) {
delete m_unk0x58; delete m_states;
} }
} }
@ -72,46 +74,41 @@ void MxControlPresenter::EndAction()
// FUNCTION: LEGO1 0x10044270 // FUNCTION: LEGO1 0x10044270
// FUNCTION: BETA10 0x100eae68 // FUNCTION: BETA10 0x100eae68
MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter) MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter)
{ {
assert(p_presenter);
MxStillPresenter* presenter = (MxStillPresenter*) p_presenter;
if (m_unk0x4c == 3) { if (m_unk0x4c == 3) {
MxVideoPresenter* frontPresenter = (MxVideoPresenter*) m_list.front(); MxStillPresenter* map = (MxStillPresenter*) m_list.front();
assert(map && map->IsA("MxStillPresenter"));
if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < p_presenter->GetDisplayZ()) { if (presenter == map || map->GetDisplayZ() < presenter->GetDisplayZ()) {
if (p_presenter->VTable0x7c()) { if (presenter->VTable0x7c()) {
MxS32 height = frontPresenter->GetHeight(); MxRect32 rect(0, 0, map->GetWidth() - 1, map->GetHeight() - 1);
MxS32 width = frontPresenter->GetWidth(); rect += map->GetLocation();
if (frontPresenter->GetLocation().GetX() <= p_x && if (rect.GetLeft() <= p_x && p_x < rect.GetRight() && rect.GetTop() <= p_y && p_y < rect.GetBottom()) {
p_x < width - 1 + frontPresenter->GetLocation().GetX() && // DECOMP: Beta uses GetBitmapStart() here, but that causes more diffs for retail.
frontPresenter->GetLocation().GetY() <= p_y && MxU8* start = map->GetAlphaMask()
p_y < height - 1 + frontPresenter->GetLocation().GetY()) { ? NULL
MxU8* start; : map->GetBitmap()->GetStart(p_x - rect.GetLeft(), p_y - rect.GetTop());
if (frontPresenter->GetAlphaMask() == NULL) {
start = frontPresenter->GetBitmap()->GetStart(
p_x - frontPresenter->GetLocation().GetX(),
p_y - frontPresenter->GetLocation().GetY()
);
}
else {
start = NULL;
}
m_unk0x56 = 0; m_unk0x56 = 0;
if (m_unk0x58 == NULL) { if (m_states) {
if (*start != 0) { for (MxS16 i = 1; i <= *m_states; i++) {
m_unk0x56 = 1; // TODO: Can we match without the cast here?
} if (m_states[i] == (MxS16) *start) {
}
else {
for (MxS16 i = 1; i <= *m_unk0x58; i++) {
if (m_unk0x58[i] == *start) {
m_unk0x56 = i; m_unk0x56 = i;
break; break;
} }
} }
} }
else {
if (*start != 0) {
m_unk0x56 = 1;
}
}
if (m_unk0x56) { if (m_unk0x56) {
return TRUE; return TRUE;
@ -121,29 +118,18 @@ MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter*
} }
} }
else { else {
if (ContainsPresenter(m_list, p_presenter)) { if (ContainsPresenter(m_list, presenter)) {
if (m_unk0x4c == 2) { if (m_unk0x4c == 2) {
MxS32 width = p_presenter->GetWidth(); MxS32 width = presenter->GetWidth();
MxS32 height = p_presenter->GetHeight(); MxS32 height = presenter->GetHeight();
if (m_unk0x52 == 2 && m_unk0x54 == 2) { if (m_unk0x52 == 2 && m_unk0x54 == 2) {
MxS16 val; if (p_x < presenter->GetX() + width / 2) {
if (p_x < p_presenter->GetLocation().GetX() + width / 2) { m_unk0x56 = (p_y >= presenter->GetY() + height / 2) ? 3 : 1;
val = 3;
if (p_y < p_presenter->GetLocation().GetY() + height / 2) {
val = 1;
}
m_unk0x56 = val;
return TRUE;
} }
else {
val = 4; m_unk0x56 = (p_y >= presenter->GetY() + height / 2) ? 4 : 2;
if (p_y < p_presenter->GetLocation().GetY() + height / 2) {
val = 2;
} }
m_unk0x56 = val;
return TRUE;
} }
} }
else { else {
@ -173,7 +159,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerNotificationParam* p_p
} }
break; break;
case c_notificationButtonDown: case c_notificationButtonDown:
if (FUN_10044270(p_param->GetX(), p_param->GetY(), (MxVideoPresenter*) p_presenter)) { if (FUN_10044270(p_param->GetX(), p_param->GetY(), p_presenter)) {
p_param->SetClickedObjectId(m_action->GetObjectId()); p_param->SetClickedObjectId(m_action->GetObjectId());
p_param->SetClickedAtom(m_action->GetAtomId().GetInternal()); p_param->SetClickedAtom(m_action->GetAtomId().GetInternal());
VTable0x6c(m_unk0x56); VTable0x6c(m_unk0x56);
@ -221,6 +207,7 @@ void MxControlPresenter::ReadyTickle()
} }
// FUNCTION: LEGO1 0x10044640 // FUNCTION: LEGO1 0x10044640
// FUNCTION: BETA10 0x100eb5e3
void MxControlPresenter::ParseExtra() void MxControlPresenter::ParseExtra()
{ {
MxU16 extraLength; MxU16 extraLength;
@ -234,27 +221,35 @@ void MxControlPresenter::ParseExtra()
char output[256]; char output[256];
if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) { if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) {
char* str = strtok(output, g_parseExtraTokens); char* token = strtok(output, g_parseExtraTokens);
if (!strcmpi(str, g_strTOGGLE)) { if (!strcmpi(token, g_strTOGGLE)) {
m_unk0x4c = 1; m_unk0x4c = 1;
} }
else if (!strcmpi(str, g_strGRID)) { else if (!strcmpi(token, g_strGRID)) {
m_unk0x4c = 2; m_unk0x4c = 2;
m_unk0x52 = atoi(strtok(NULL, g_parseExtraTokens)); token = strtok(NULL, g_parseExtraTokens);
m_unk0x54 = atoi(strtok(NULL, g_parseExtraTokens)); assert(token);
m_unk0x52 = atoi(token);
token = strtok(NULL, g_parseExtraTokens);
assert(token);
m_unk0x54 = atoi(token);
} }
else if (!strcmpi(str, g_strMAP)) { else if (!strcmpi(token, g_strMAP)) {
m_unk0x4c = 3; m_unk0x4c = 3;
str = strtok(NULL, g_parseExtraTokens); token = strtok(NULL, g_parseExtraTokens);
if (str) { if (token) {
MxS16 count = atoi(str); MxS16 numStates = atoi(token);
m_unk0x58 = new MxS16[count + 1]; m_states = new MxS16[numStates + 1];
*m_unk0x58 = count; assert(numStates);
*m_states = numStates;
for (MxS16 i = 1; i <= count; i++) { for (MxS16 i = 1; i <= numStates; i++) {
m_unk0x58[i] = atoi(strtok(NULL, g_parseExtraTokens)); token = strtok(NULL, g_parseExtraTokens);
assert(token);
m_states[i] = atoi(token);
} }
} }
} }

3
LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
View File

@ -144,12 +144,13 @@ void LegoControlManager::FUN_100293c0(MxU32 p_objectId, const char* p_atom, MxS1
} }
// FUNCTION: LEGO1 0x100294e0 // FUNCTION: LEGO1 0x100294e0
// FUNCTION: BETA10 0x1007c92f
MxControlPresenter* LegoControlManager::FUN_100294e0(MxS32 p_x, MxS32 p_y) MxControlPresenter* LegoControlManager::FUN_100294e0(MxS32 p_x, MxS32 p_y)
{ {
if (m_presenterList) { if (m_presenterList) {
MxPresenterListCursor cursor(m_presenterList); MxPresenterListCursor cursor(m_presenterList);
MxPresenter* control; MxPresenter* control;
MxVideoPresenter* presenter = (MxVideoPresenter*) VideoManager()->GetPresenterAt(p_x, p_y); MxPresenter* presenter = VideoManager()->GetPresenterAt(p_x, p_y);
if (presenter) { if (presenter) {
while (cursor.Next(control)) { while (cursor.Next(control)) {

5
LEGO1/omni/src/common/mxutilities.cpp
View File

@ -81,6 +81,7 @@ void MakeSourceName(char* p_output, const char* p_input)
} }
// FUNCTION: LEGO1 0x100b7050 // FUNCTION: LEGO1 0x100b7050
// FUNCTION: BETA10 0x10136c19
MxBool KeyValueStringParse(char* p_output, const char* p_command, const char* p_string) MxBool KeyValueStringParse(char* p_output, const char* p_command, const char* p_string)
{ {
MxBool didMatch = FALSE; MxBool didMatch = FALSE;
@ -92,7 +93,8 @@ MxBool KeyValueStringParse(char* p_output, const char* p_command, const char* p_
assert(string); assert(string);
strcpy(string, p_string); strcpy(string, p_string);
for (char* token = strtok(string, ", \t\r\n:"); token; token = strtok(NULL, ", \t\r\n:")) { const char* delim = ", \t\r\n:";
for (char* token = strtok(string, delim); token; token = strtok(NULL, delim)) {
len -= (strlen(token) + 1); len -= (strlen(token) + 1);
if (strcmpi(token, p_command) == 0) { if (strcmpi(token, p_command) == 0) {
@ -116,6 +118,7 @@ MxBool KeyValueStringParse(char* p_output, const char* p_command, const char* p_
} }
// FUNCTION: LEGO1 0x100b7170 // FUNCTION: LEGO1 0x100b7170
// FUNCTION: BETA10 0x10136e12
MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter) MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter)
{ {
for (MxCompositePresenterList::iterator it = p_presenterList.begin(); it != p_presenterList.end(); it++) { for (MxCompositePresenterList::iterator it = p_presenterList.begin(); it != p_presenterList.end(); it++) {