Leahnaya/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-09-28 03:56:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

input+kpad: Avoid overwriting values before use

Browse Source
This commit is contained in:
Exzap
2026-08-27 20:34:53 +02:00
parent f07c987d11
commit 7945f102dc
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/input/api/Controller.cpp
View File

@@ -30,9 +30,10 @@ const ControllerState& ControllerBase::update_state()
// ignore default buttons
result.buttons.UnsetButtons(m_default_state.buttons);
// apply deadzone and range and ignore default axis values
apply_axis_setting(result.axis, m_default_state.axis, m_settings.axis);
apply_axis_setting(result.rotation, m_default_state.rotation, m_settings.rotation);
apply_axis_setting(result.trigger, m_default_state.trigger, m_settings.trigger);
auto settings = get_settings();
apply_axis_setting(result.axis, m_default_state.axis, settings.axis);
apply_axis_setting(result.rotation, m_default_state.rotation, settings.rotation);
apply_axis_setting(result.trigger, m_default_state.trigger, settings.trigger);
apply_axis_button(result.buttons, result.axis, kAxisXP);
apply_axis_button(result.buttons, result.rotation, kRotationXP);

11
src/input/emulated/VPADController.cpp
View File

@@ -112,14 +112,15 @@ void VPADController::VPADRead(VPADStatus_t& status, const BtnRepeat& repeat)
// button repeat
const auto now = std::chrono::high_resolution_clock::now();
if (status.hold != m_last_holdvalue)
uint32 currentHold = status.hold;
if (currentHold != m_last_holdvalue)
{
m_last_hold_change = m_last_pulse = now;
}
if (repeat.pulse > 0)
{
if (m_last_hold_change + std::chrono::milliseconds(repeat.delay) >= now)
if (currentHold != 0 && m_last_hold_change + std::chrono::milliseconds(repeat.delay) <= now)
{
if ((m_last_pulse + std::chrono::milliseconds(repeat.pulse)) < now)
{
@@ -130,9 +131,9 @@ void VPADController::VPADRead(VPADStatus_t& status, const BtnRepeat& repeat)
}
// general
status.release = m_last_holdvalue & ~status.hold;
status.trig = ~m_last_holdvalue & status.hold;
m_last_holdvalue = status.hold;
status.release = m_last_holdvalue & ~currentHold;
status.trig = ~m_last_holdvalue & currentHold;
m_last_holdvalue = currentHold;
// touch
update_touch(status);