H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yuzu/configure_input_player: Fix input handling for ZL and ZR from controllers with analog triggers

Browse Source
This commit is contained in:
FreddyFunk 2019-10-10 23:12:06 +02:00
parent b41692b69b
commit a31c6b2c4e
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/yuzu/configuration/configure_input_player.cpp
View File

@ -247,7 +247,22 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
connect(button, &QPushButton::clicked, [=] { connect(button, &QPushButton::clicked, [=] {
HandleClick( HandleClick(
button_map[button_id], button_map[button_id],
[=](const Common::ParamPackage& params) { buttons_param[button_id] = params; }, [=](Common::ParamPackage params) {
// Workaround for ZL & ZR for analog triggers like on XBOX controllors.
// Analog triggers (from controllers like the XBOX controller) would not work
// due to a different range of their signals (from 0 to 255 on analog triggers
// instead of -32768 to 32768 on analog joysticks). The SDL driver misinterprets
// analog triggers as analog joysticks.
// TODO: reinterpret the signal range for analog triggers to map the values
// correctly. This is required for the correct emulation of the analog triggers
// of the GameCube controller.
if (button_id == Settings::NativeButton::ZL ||
button_id == Settings::NativeButton::ZR) {
params.Set("direction", "+");
params.Set("threshold", "0.5");
}
buttons_param[button_id] = params;
},
InputCommon::Polling::DeviceType::Button); InputCommon::Polling::DeviceType::Button);
}); });
connect(button, &QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) { connect(button, &QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) {
@ -274,12 +289,13 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
analog_button->setContextMenuPolicy(Qt::CustomContextMenu); analog_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(analog_button, &QPushButton::clicked, [=]() { connect(analog_button, &QPushButton::clicked, [=]() {
HandleClick(analog_map_buttons[analog_id][sub_button_id], HandleClick(
[=](const Common::ParamPackage& params) { analog_map_buttons[analog_id][sub_button_id],
SetAnalogButton(params, analogs_param[analog_id], [=](const Common::ParamPackage& params) {
analog_sub_buttons[sub_button_id]); SetAnalogButton(params, analogs_param[analog_id],
}, analog_sub_buttons[sub_button_id]);
InputCommon::Polling::DeviceType::Button); },
InputCommon::Polling::DeviceType::Button);
}); });
connect(analog_button, &QPushButton::customContextMenuRequested, connect(analog_button, &QPushButton::customContextMenuRequested,
[=](const QPoint& menu_location) { [=](const QPoint& menu_location) {