Skip to content

input: Fix inconsistent axis detection for button-type triggers #2213

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

Open
inada-s wants to merge 1 commit into
base: master
Choose a base branch
from
Open

input: Fix inconsistent axis detection for button-type triggers #2213

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions core/input/gamepad_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ bool GamepadDevice::detectAxis(u32 code, int value)
//
bool GamepadDevice::gamepad_axis_input(u32 code, int value)
{
lastRawAxisValues[code] = value;
if (detectAxis(code, value))
return true;

Expand Down Expand Up @@ -670,6 +671,8 @@ void GamepadDevice::detectInput(bool combo, input_detected_cb input_changed)
_detection_start_time = getTimeMs() + 200;
detectionInputs.clear();
detectingAxes.clear();
for (const auto& [code, value] : lastRawAxisValues)
detectingAxes.emplace(code, value);
}

#ifdef TEST_AUTOMATION
Expand Down
1 change: 1 addition & 0 deletions core/input/gamepad_device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ class GamepadDevice
bool _is_registered = false;
u32 digitalToAnalogState[4];
std::unordered_map<DreamcastKey, int> lastAxisValue[4];
std::unordered_map<u32, int> lastRawAxisValues;
bool perGameMapping = false;
bool instanceMapping = false;

Expand Down
Loading