summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-05-07 06:40:20 +0200
committerGitHub <noreply@github.com>2023-05-07 06:40:20 +0200
commit82188b2f7943e5304ae3ae058bdd34c60d8be3a6 (patch)
tree9d885f3d15f2c9a4e0fa60e816349d61f094a32e /src
parentMerge pull request #10171 from german77/powera (diff)
parentinput_common: Add experimental motion to button (diff)
downloadyuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.tar
yuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.tar.gz
yuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.tar.bz2
yuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.tar.lz
yuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.tar.xz
yuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.tar.zst
yuzu-82188b2f7943e5304ae3ae058bdd34c60d8be3a6.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hid/input_converter.cpp7
-rw-r--r--src/input_common/input_mapping.cpp3
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp
index a38e3bb3f..53b00b1f9 100644
--- a/src/core/hid/input_converter.cpp
+++ b/src/core/hid/input_converter.cpp
@@ -62,6 +62,9 @@ Common::Input::ButtonStatus TransformToButton(const Common::Input::CallbackStatu
case Common::Input::InputType::Button:
status = callback.button_status;
break;
+ case Common::Input::InputType::Motion:
+ status.value = std::abs(callback.motion_status.gyro.x.raw_value) > 1.0f;
+ break;
default:
LOG_ERROR(Input, "Conversion from type {} to button not implemented", callback.type);
break;
@@ -227,6 +230,10 @@ Common::Input::TriggerStatus TransformToTrigger(const Common::Input::CallbackSta
status = callback.trigger_status;
calculate_button_value = false;
break;
+ case Common::Input::InputType::Motion:
+ status.analog.properties.range = 1.0f;
+ raw_value = callback.motion_status.accel.x.raw_value;
+ break;
default:
LOG_ERROR(Input, "Conversion from type {} to trigger not implemented", callback.type);
break;
diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp
index 9361b00c5..8c2ee4eb3 100644
--- a/src/input_common/input_mapping.cpp
+++ b/src/input_common/input_mapping.cpp
@@ -82,6 +82,9 @@ void MappingFactory::RegisterButton(const MappingData& data) {
new_input.Set("axis", data.index);
new_input.Set("threshold", 0.5f);
break;
+ case EngineInputType::Motion:
+ new_input.Set("motion", data.index);
+ break;
default:
return;
}