isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 11:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match LegoNavController::ProcessKeyboardInput

Browse Source
This commit is contained in:
Christian Semmler 2024-03-24 10:05:13 -04:00
parent 9361a31675
commit 26955778db
2 changed files with 61 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/legoinputmanager.h
View File

@ -68,6 +68,14 @@ class LegoNotifyListCursor : public MxPtrListCursor<MxCore> {
// SIZE 0x338 // SIZE 0x338
class LegoInputManager : public MxPresenter { class LegoInputManager : public MxPresenter {
public: public:
enum Keys {
c_bit1 = 0x01,
c_bit2 = 0x02,
c_bit3 = 0x04,
c_bit4 = 0x08,
c_bit5 = 0x16
};
LegoInputManager(); LegoInputManager();
~LegoInputManager() override; ~LegoInputManager() override;

105
LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
View File

@ -521,70 +521,71 @@ MxResult LegoNavController::ProcessJoystickInput(MxBool& p_und)
// FUNCTION: LEGO1 0x100558b0 // FUNCTION: LEGO1 0x100558b0
MxResult LegoNavController::ProcessKeyboardInput() MxResult LegoNavController::ProcessKeyboardInput()
{ {
LegoOmni* instance = LegoOmni::GetInstance();
MxBool bool1 = FALSE; MxBool bool1 = FALSE;
MxBool bool2 = FALSE; MxBool bool2 = FALSE;
LegoInputManager* inputManager = LegoOmni::GetInstance()->GetInputManager();
MxU32 keys; MxU32 keys;
if (!instance->GetInputManager() || instance->GetInputManager()->FUN_1005c160(keys) == FAILURE) {
if (inputManager == NULL || inputManager->FUN_1005c160(keys) == FAILURE) {
return FAILURE; return FAILURE;
} }
if (m_unk0x6c) { if (keys == 0) {
m_targetRotationalVel = 0.0; if (m_unk0x6c) {
m_targetLinearVel = 0.0;
m_rotationalAccel = m_maxRotationalDeccel;
m_linearAccel = m_maxLinearDeccel;
m_unk0x6c = FALSE;
}
else if (keys) {
m_unk0x6c = TRUE;
MxS32 hMax;
if ((keys & 3) == 1) {
hMax = 0;
}
else if ((keys & 3) == 2) {
hMax = m_hMax;
}
else {
bool1 = TRUE;
m_rotationalAccel = m_maxRotationalDeccel;
m_targetRotationalVel = 0.0; m_targetRotationalVel = 0.0;
}
MxS32 vMax;
if ((keys & 12) == 4) {
vMax = 0;
}
else if ((keys & 12) == 8) {
vMax = m_vMax;
}
else {
bool2 = TRUE;
m_targetLinearVel = 0.0; m_targetLinearVel = 0.0;
m_linearAccel = m_maxRotationalDeccel; m_rotationalAccel = m_maxRotationalDeccel;
m_linearAccel = m_maxLinearDeccel;
m_unk0x6c = FALSE;
} }
MxFloat val = keys & 0x10 ? 1.0f : 4.0f; return FAILURE;
MxFloat val2 = keys & 0x10 ? 1.0f : 2.0f;
if (!bool1) {
m_targetRotationalVel = CalculateNewTargetVel(hMax, m_hMax / 2, m_maxRotationalVel);
m_rotationalAccel =
CalculateNewAccel(hMax, m_hMax / 2, m_maxRotationalAccel / val, (int) (m_minRotationalAccel / val2));
}
if (!bool2) {
m_targetLinearVel = CalculateNewTargetVel(m_vMax - vMax, m_vMax / 2, m_maxLinearVel);
m_linearAccel =
CalculateNewAccel(m_vMax - vMax, hMax / 2, m_maxLinearAccel / val, (int) (m_minLinearAccel / val2));
}
return SUCCESS;
} }
return FAILURE; m_unk0x6c = TRUE;
MxS32 hMax;
if ((keys & 3) == 1) {
hMax = 0;
}
else if ((keys & 3) == 2) {
hMax = m_hMax;
}
else {
m_targetRotationalVel = 0.0;
m_rotationalAccel = m_maxRotationalDeccel;
bool1 = TRUE;
}
MxS32 vMax;
if ((keys & 12) == 4) {
vMax = 0;
}
else if ((keys & 12) == 8) {
vMax = m_vMax;
}
else {
m_targetLinearVel = 0.0;
m_linearAccel = m_maxLinearDeccel;
bool2 = TRUE;
}
MxFloat val = keys & 0x10 ? 1.0f : 4.0f;
MxFloat val2 = keys & 0x10 ? 1.0f : 2.0f;
if (!bool1) {
m_targetRotationalVel = CalculateNewTargetVel(hMax, m_hMax / 2, m_maxRotationalVel);
m_rotationalAccel =
CalculateNewAccel(hMax, m_hMax / 2, m_maxRotationalAccel / val, (int) (m_minRotationalAccel / val2));
}
if (!bool2) {
m_targetLinearVel = CalculateNewTargetVel(m_vMax - vMax, m_vMax / 2, m_maxLinearVel);
m_linearAccel =
CalculateNewAccel(m_vMax - vMax, m_vMax / 2, m_maxLinearAccel / val, (int) (m_minLinearAccel / val2));
}
return SUCCESS;
} }
// STUB: LEGO1 0x10055a60 // STUB: LEGO1 0x10055a60