tstarr/yuzu
1
0
Fork 0
mirror of https://github.com/starr-dusT/yuzu-mainline synced 2024-03-05 21:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

input_common: Make button threshold customizable

Browse Source
This commit is contained in:
german77 2021-07-15 23:43:51 -05:00
parent 3cd3230295
commit 240019feca
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_common/sdl/sdl_impl.cpp
View File

@ -660,7 +660,8 @@ public:
if (params.Has("axis")) { if (params.Has("axis")) {
const int axis = params.Get("axis", 0); const int axis = params.Get("axis", 0);
const float threshold = params.Get("threshold", 0.5f); // Convert range from (0.0, 1.0) to (-1.0, 1.0)
const float threshold = (params.Get("threshold", 0.5f) - 0.5f) * 2.0f;
const std::string direction_name = params.Get("direction", ""); const std::string direction_name = params.Get("direction", "");
bool trigger_if_greater; bool trigger_if_greater;
if (direction_name == "+") { if (direction_name == "+") {
@ -933,12 +934,11 @@ Common::ParamPackage BuildAnalogParamPackageForButton(int port, std::string guid
params.Set("port", port); params.Set("port", port);
params.Set("guid", std::move(guid)); params.Set("guid", std::move(guid));
params.Set("axis", axis); params.Set("axis", axis);
params.Set("threshold", "0.5");
if (value > 0) { if (value > 0) {
params.Set("direction", "+"); params.Set("direction", "+");
params.Set("threshold", "0.5");
} else { } else {
params.Set("direction", "-"); params.Set("direction", "-");
params.Set("threshold", "-0.5");
} }
return params; return params;
} }

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

@ -313,6 +313,16 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
buttons_param[button_id].Set("toggle", toggle_value); buttons_param[button_id].Set("toggle", toggle_value);
button_map[button_id]->setText(ButtonToText(buttons_param[button_id])); button_map[button_id]->setText(ButtonToText(buttons_param[button_id]));
}); });
if (buttons_param[button_id].Has("threshold")) {
context_menu.addAction(tr("Set threshold"), [&] {
const int button_threshold = static_cast<int>(
buttons_param[button_id].Get("threshold", 0.5f) * 100.0f);
const int new_threshold = QInputDialog::getInt(
this, tr("Set threshold"), tr("Choose a value between 0% and 100%"),
button_threshold, 0, 100);
buttons_param[button_id].Set("threshold", new_threshold / 100.0f);
});
}
context_menu.exec(button_map[button_id]->mapToGlobal(menu_location)); context_menu.exec(button_map[button_id]->mapToGlobal(menu_location));
ui->controllerFrame->SetPlayerInput(player_index, buttons_param, analogs_param); ui->controllerFrame->SetPlayerInput(player_index, buttons_param, analogs_param);
}); });