Skip to content

Fix Mouse Auto-Center causing gamepad camera to get stuck when disabled #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyperbx merged 1 commit into from
Oct 27, 2026
Merged

Fix Mouse Auto-Center causing gamepad camera to get stuck when disabled #317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 26 additions & 30 deletions MarathonRecomp/patches/camera_patches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ void SonicCamera_MouseLook(PPCRegister& r31, PPCRegister& r5, PPCRegister& in_de
{
case SonicCameraEx::MouseLookState_Disabled:
{
if (std::fabsf(x) >= 0.0f && std::fabsf(y) >= 0.0f)
if (std::fabsf(x) > 0.0f || std::fabsf(y) > 0.0f)
{
// Sync current camera orbit to mouse look.
pSonicCamera->m_Yaw = pSonicCamera->m_Orbit.Y;
Expand All @@ -231,13 +231,9 @@ void SonicCamera_MouseLook(PPCRegister& r31, PPCRegister& r5, PPCRegister& in_de
pSonicCamera->SetInterpolateStart(*pOutput);

pSonicCamera->m_MouseLookState = SonicCameraEx::MouseLookState_Enabled;

break;
}
else
{
return;
}

return;
}

case SonicCameraEx::MouseLookState_Resetting:
Expand All @@ -263,12 +259,34 @@ void SonicCamera_MouseLook(PPCRegister& r31, PPCRegister& r5, PPCRegister& in_de
const auto padState = pMutator->GetState();

// Right stick moved beyond threshold, reset back to original camera behaviour.
if (std::abs(padState.sThumbRX) >= 8000 && std::abs(padState.sThumbRY) >= 8000)
if (std::abs(padState.sThumbRX) >= 8000 || std::abs(padState.sThumbRY) >= 8000)
{
pSonicCamera->m_MouseLookState = SonicCameraEx::MouseLookState_Resetting;
return;
}
}

if (Config::MouseAutoCenter)
{
if (std::fabsf(x) > 0.0f || std::fabsf(y) > 0.0f)
{
pSonicCamera->m_InactiveTime = 0.0f;
}
else
{
pSonicCamera->m_InactiveTime += App::s_deltaTime;
}

if (pSonicCamera->m_InactiveTime >= Config::MouseAutoCenterTime)
{
pSonicCamera->m_MouseLookState = SonicCameraEx::MouseLookState_Resetting;
return;
}
}
else
{
pSonicCamera->m_InactiveTime = 0.0f;
}

if (pSonicCamera->IsPlayerOutOfControl())
{
Expand All @@ -286,28 +304,6 @@ void SonicCamera_MouseLook(PPCRegister& r31, PPCRegister& r5, PPCRegister& in_de
}
}

if (Config::MouseAutoCenter)
{
if (std::fabsf(x) > 0.0f || std::fabsf(y) > 0.0f)
{
pSonicCamera->m_InactiveTime = 0.0f;
}
else
{
pSonicCamera->m_InactiveTime += App::s_deltaTime;
}

if (pSonicCamera->m_InactiveTime >= Config::MouseAutoCenterTime)
{
pSonicCamera->m_MouseLookState = SonicCameraEx::MouseLookState_Resetting;
return;
}
}
else
{
pSonicCamera->m_InactiveTime = 0.0f;
}

static constexpr float maxPitch = 45.0f * DEG2RADf;

// Maps relative mouse X/Y to expected values for the orbit vector.
Expand Down
Loading