VERY experimental Nintendo Switch 2 emulator
C++
input_common: Add support for analog toggle
Narr the Regd4fb46d8f997
diff --git a/src/common/input.h b/src/common/input.hindex 213aa2384d..825b0d650d 100644--- a/src/common/input.h+++ b/src/common/input.h@@ -102,6 +102,8 @@ struct AnalogProperties {float offset{};// Invert direction of the sensor databool inverted{};+ // Press once to activate, press again to release+ bool toggle{};};// Single analog sensor data@@ -115,8 +117,11 @@ struct AnalogStatus {struct ButtonStatus {Common::UUID uuid{};bool value{};+ // Invert value of the buttonbool inverted{};+ // Press once to activate, press again to releasebool toggle{};+ // Internal lock for the toggle statusbool locked{};};diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cppindex 68d143a013..52fb69e9c8 100644--- a/src/core/hid/input_converter.cpp+++ b/src/core/hid/input_converter.cpp@@ -52,6 +52,9 @@ Common::Input::ButtonStatus TransformToButton(const Common::Input::CallbackStatuCommon::Input::ButtonStatus status{};switch (callback.type) {case Common::Input::InputType::Analog:+ status.value = TransformToTrigger(callback).pressed.value;+ status.toggle = callback.analog_status.properties.toggle;+ break;case Common::Input::InputType::Trigger:status.value = TransformToTrigger(callback).pressed.value;break;diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cppindex 133422d5cd..ffb9b945e5 100644--- a/src/input_common/input_poller.cpp+++ b/src/input_common/input_poller.cpp@@ -824,6 +824,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateAnalogDevice(.threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f),.offset = std::clamp(params.Get("offset", 0.0f), -1.0f, 1.0f),.inverted = params.Get("invert", "+") == "-",+ .toggle = static_cast<bool>(params.Get("toggle", false)),};input_engine->PreSetController(identifier);input_engine->PreSetAxis(identifier, axis);diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cppindex 109689c88d..972c311f60 100644--- a/src/yuzu/configuration/configure_input_player.cpp+++ b/src/yuzu/configuration/configure_input_player.cpp@@ -382,6 +382,12 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_ibutton_map[button_id]->setText(ButtonToText(param));emulated_controller->SetButtonParam(button_id, param);});+ context_menu.addAction(tr("Toggle axis"), [&] {+ const bool toggle_value = !param.Get("toggle", false);+ param.Set("toggle", toggle_value);+ button_map[button_id]->setText(ButtonToText(param));+ emulated_controller->SetButtonParam(button_id, param);+ });context_menu.addAction(tr("Set threshold"), [&] {const int button_threshold =static_cast<int>(param.Get("threshold", 0.5f) * 100.0f);