diff options
| author | bunnei <bunneidev@gmail.com> | 2017-08-29 11:29:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 11:29:10 -0400 |
| commit | d181a67df98686bccdab40cc32cf0b098432d7bd (patch) | |
| tree | 18f3e7e5b864511da54d847e645dd23a69033924 /src/citra | |
| parent | 8b1fdb93943c5fa84363823d84adbea626e55296 (diff) | |
| parent | 2814d0fba26028d8a5b44154cad4d7b7db792281 (diff) | |
Merge pull request #2899 from wwylele/touch-refactor
Refactor touch input into a TouchDevice
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/config.cpp | 2 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 3869b6b5d5..a48ef08c73 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -78,6 +78,8 @@ void Config::ReadValues() { Settings::values.motion_device = sdl2_config->Get( "Controls", "motion_device", "engine:motion_emu,update_period:100,sensitivity:0.01"); + Settings::values.touch_device = + sdl2_config->Get("Controls", "touch_device", "engine:emu_window"); // Core Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index ea02a788d7..4b13a2e1b0 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -62,6 +62,10 @@ c_stick= # - "sensitivity": the coefficient converting mouse movement to tilting angle (default to 0.01) motion_device= +# for touch input, the following devices are available: +# - "emu_window" (default) for emulating touch input from mouse input to the emulation window. No parameters required +touch_device= + [Core] # Whether to use the Just-In-Time (JIT) compiler for CPU emulation # 0: Interpreter (slow), 1 (default): JIT (fast) |