summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorGravatar Morph2020-10-17 09:38:12 -0400
committerGravatar Morph2020-11-15 23:33:20 -0500
commit38110dd485e329fa39e2e4c02b91a89dfebcbc88 (patch)
tree096a87673779267eaf711e4ae77ba7a995845327 /src/yuzu_cmd
parentsettings: Remove global vibration strength modifier (diff)
downloadyuzu-38110dd485e329fa39e2e4c02b91a89dfebcbc88.tar.gz
yuzu-38110dd485e329fa39e2e4c02b91a89dfebcbc88.tar.xz
yuzu-38110dd485e329fa39e2e4c02b91a89dfebcbc88.zip
configure_input: Add per-player vibration
Allows for enabling and modifying vibration and vibration strength per player. Also adds a toggle for enabling/disabling accurate vibrations. Co-authored-by: Its-Rei <kupfel@gmail.com>
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/config.cpp2
-rw-r--r--src/yuzu_cmd/default_ini.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index feee02fcd..e1adbbf2b 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -290,6 +290,8 @@ void Config::ReadValues() {
290 290
291 Settings::values.vibration_enabled.SetValue( 291 Settings::values.vibration_enabled.SetValue(
292 sdl2_config->GetBoolean("ControlsGeneral", "vibration_enabled", true)); 292 sdl2_config->GetBoolean("ControlsGeneral", "vibration_enabled", true));
293 Settings::values.enable_accurate_vibrations.SetValue(
294 sdl2_config->GetBoolean("ControlsGeneral", "enable_accurate_vibrations", false));
293 Settings::values.motion_enabled.SetValue( 295 Settings::values.motion_enabled.SetValue(
294 sdl2_config->GetBoolean("ControlsGeneral", "motion_enabled", true)); 296 sdl2_config->GetBoolean("ControlsGeneral", "motion_enabled", true));
295 Settings::values.touchscreen.enabled = 297 Settings::values.touchscreen.enabled =
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index b6f6a3bb0..bcbbcd4ca 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -69,6 +69,10 @@ rstick=
69# 0: Disabled, 1 (default): Enabled 69# 0: Disabled, 1 (default): Enabled
70vibration_enabled= 70vibration_enabled=
71 71
72# Whether to enable or disable accurate vibrations
73# 0 (default): Disabled, 1: Enabled
74enable_accurate_vibrations=
75
72# for motion input, the following devices are available: 76# for motion input, the following devices are available:
73# - "motion_emu" (default) for emulating motion input from mouse input. Required parameters: 77# - "motion_emu" (default) for emulating motion input from mouse input. Required parameters:
74# - "update_period": update period in milliseconds (default to 100) 78# - "update_period": update period in milliseconds (default to 100)