diff options
| author |  german77 | 2022-05-22 20:34:32 -0500 |
|---|---|---|
| committer | Narr the Reg | 2022-05-23 11:01:14 -0500 |
| commit | c82806f9cb88f390ae3fb048ba7ff2bb138fa3ec (patch) | |
| tree | 60f52dfd3e59f1424d03ab71a8cb28b9b845d486 /src/core/hid/emulated_console.cpp | |
| parent | Merge pull request #8342 from lat9nq/clang-latest-stdc++ (diff) | |
| download | yuzu-c82806f9cb88f390ae3fb048ba7ff2bb138fa3ec.tar.gz yuzu-c82806f9cb88f390ae3fb048ba7ff2bb138fa3ec.tar.xz yuzu-c82806f9cb88f390ae3fb048ba7ff2bb138fa3ec.zip | |
input_common: touch: Rewrite touch driver to support multiple touch points
Diffstat (limited to 'src/core/hid/emulated_console.cpp')
| -rw-r--r-- | src/core/hid/emulated_console.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/core/hid/emulated_console.cpp b/src/core/hid/emulated_console.cpp index fd220ccb5..aac45907d 100644 --- a/src/core/hid/emulated_console.cpp +++ b/src/core/hid/emulated_console.cpp | |||
| @@ -27,12 +27,19 @@ void EmulatedConsole::SetTouchParams() { | |||
| 27 | // We can't use mouse as touch if native mouse is enabled | 27 | // We can't use mouse as touch if native mouse is enabled |
| 28 | touch_params[index++] = Common::ParamPackage{"engine:mouse,axis_x:10,axis_y:11,button:0"}; | 28 | touch_params[index++] = Common::ParamPackage{"engine:mouse,axis_x:10,axis_y:11,button:0"}; |
| 29 | } | 29 | } |
| 30 | touch_params[index++] = Common::ParamPackage{"engine:touch,axis_x:0,axis_y:1,button:0"}; | 30 | |
| 31 | touch_params[index++] = Common::ParamPackage{"engine:touch,axis_x:2,axis_y:3,button:1"}; | 31 | touch_params[index++] = |
| 32 | Common::ParamPackage{"engine:touch,axis_x:0,axis_y:1,button:0,touch_id:0"}; | ||
| 33 | touch_params[index++] = | ||
| 34 | Common::ParamPackage{"engine:touch,axis_x:2,axis_y:3,button:1,touch_id:1"}; | ||
| 35 | touch_params[index++] = | ||
| 36 | Common::ParamPackage{"engine:touch,axis_x:4,axis_y:5,button:2,touch_id:2"}; | ||
| 37 | touch_params[index++] = | ||
| 38 | Common::ParamPackage{"engine:touch,axis_x:6,axis_y:7,button:3,touch_id:3"}; | ||
| 32 | touch_params[index++] = | 39 | touch_params[index++] = |
| 33 | Common::ParamPackage{"engine:cemuhookudp,axis_x:17,axis_y:18,button:65536"}; | 40 | Common::ParamPackage{"engine:cemuhookudp,axis_x:17,axis_y:18,button:65536,touch_id:0"}; |
| 34 | touch_params[index++] = | 41 | touch_params[index++] = |
| 35 | Common::ParamPackage{"engine:cemuhookudp,axis_x:19,axis_y:20,button:131072"}; | 42 | Common::ParamPackage{"engine:cemuhookudp,axis_x:19,axis_y:20,button:131072,touch_id:1"}; |
| 36 | 43 | ||
| 37 | const auto button_index = | 44 | const auto button_index = |
| 38 | static_cast<u64>(Settings::values.touch_from_button_map_index.GetValue()); | 45 | static_cast<u64>(Settings::values.touch_from_button_map_index.GetValue()); |