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

Match LegoNavController::ProcessJoystickInput

Browse Source
This commit is contained in:
Christian Semmler 2024-03-24 09:39:23 -04:00
parent 8e4d0f64d2
commit 147ac5261e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,6 +475,7 @@ MxResult LegoNavController::UpdateCameraLocation(MxU32 p_location)
MxResult LegoNavController::ProcessJoystickInput(MxBool& p_und) MxResult LegoNavController::ProcessJoystickInput(MxBool& p_und)
{ {
LegoOmni* instance = LegoOmni::GetInstance(); LegoOmni* instance = LegoOmni::GetInstance();
if (instance->GetInputManager()) { if (instance->GetInputManager()) {
MxS32 joystickX; MxS32 joystickX;
MxS32 joystickY; MxS32 joystickY;
@ -486,12 +487,13 @@ MxResult LegoNavController::ProcessJoystickInput(MxBool& p_und)
FAILURE) { FAILURE) {
MxU32 yVal = (joystickY * m_vMax) / 100; MxU32 yVal = (joystickY * m_vMax) / 100;
MxU32 xVal = (joystickX * m_hMax) / 100; MxU32 xVal = (joystickX * m_hMax) / 100;
if (joystickX <= 45 || joystickX >= 55 || joystickY <= 45 || joystickY >= 55) { if (joystickX <= 45 || joystickX >= 55 || joystickY <= 45 || joystickY >= 55) {
m_linearVel = CalculateNewTargetVel(m_vMax - xVal, m_vMax / 2, m_maxLinearVel); m_targetLinearVel = CalculateNewTargetVel(m_vMax - yVal, m_vMax / 2, m_maxLinearVel);
m_linearAccel = CalculateNewAccel(m_vMax - xVal, m_vMax / 2, m_maxLinearAccel, (int) m_minLinearAccel); m_linearAccel = CalculateNewAccel(m_vMax - yVal, m_vMax / 2, m_maxLinearAccel, (int) m_minLinearAccel);
m_targetRotationalVel = CalculateNewTargetVel(yVal, m_hMax / 2, m_maxRotationalVel); m_targetRotationalVel = CalculateNewTargetVel(xVal, m_hMax / 2, m_maxRotationalVel);
m_rotationalAccel = m_rotationalAccel =
CalculateNewAccel(yVal, m_hMax / 2, m_maxRotationalAccel, (int) m_minRotationalAccel); CalculateNewAccel(xVal, m_hMax / 2, m_maxRotationalAccel, (int) m_minRotationalAccel);
} }
else { else {
m_targetRotationalVel = 0.0; m_targetRotationalVel = 0.0;
@ -502,6 +504,7 @@ MxResult LegoNavController::ProcessJoystickInput(MxBool& p_und)
if (povPosition >= 0) { if (povPosition >= 0) {
LegoWorld* world = CurrentWorld(); LegoWorld* world = CurrentWorld();
if (world && world->GetCamera()) { if (world && world->GetCamera()) {
world->GetCamera()->FUN_10012320(povPosition * 0.017453333333333335); world->GetCamera()->FUN_10012320(povPosition * 0.017453333333333335);
p_und = TRUE; p_und = TRUE;
@ -511,6 +514,7 @@ MxResult LegoNavController::ProcessJoystickInput(MxBool& p_und)
return SUCCESS; return SUCCESS;
} }
} }
return FAILURE; return FAILURE;
} }