diff options
| author | 2021-01-20 22:39:01 -0800 | |
|---|---|---|
| committer | 2021-01-20 22:39:01 -0800 | |
| commit | a1335d3d5142f47602e54a51d09ed16d22164271 (patch) | |
| tree | 91e3d396895e1d915cbaef7a7151d119b43a646e /src/core/frontend/input.h | |
| parent | Merge pull request #5361 from ReinUsesLisp/vk-shader-comment (diff) | |
| parent | Always initialize keyboard input (diff) | |
| download | yuzu-a1335d3d5142f47602e54a51d09ed16d22164271.tar.gz yuzu-a1335d3d5142f47602e54a51d09ed16d22164271.tar.xz yuzu-a1335d3d5142f47602e54a51d09ed16d22164271.zip | |
Merge pull request #5270 from german77/multiTouch
HID: Add multitouch support
Diffstat (limited to 'src/core/frontend/input.h')
| -rw-r--r-- | src/core/frontend/input.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h index de51a754e..f014dfea3 100644 --- a/src/core/frontend/input.h +++ b/src/core/frontend/input.h | |||
| @@ -163,10 +163,11 @@ using MotionStatus = std::tuple<Common::Vec3<float>, Common::Vec3<float>, Common | |||
| 163 | using MotionDevice = InputDevice<MotionStatus>; | 163 | using MotionDevice = InputDevice<MotionStatus>; |
| 164 | 164 | ||
| 165 | /** | 165 | /** |
| 166 | * A touch status is an object that returns a tuple of two floats and a bool. The floats are | 166 | * A touch status is an object that returns an array of 16 tuple elements of two floats and a bool. |
| 167 | * x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is pressed. | 167 | * The floats are x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is |
| 168 | * pressed. | ||
| 168 | */ | 169 | */ |
| 169 | using TouchStatus = std::tuple<float, float, bool>; | 170 | using TouchStatus = std::array<std::tuple<float, float, bool>, 16>; |
| 170 | 171 | ||
| 171 | /** | 172 | /** |
| 172 | * A touch device is an input device that returns a touch status object | 173 | * A touch device is an input device that returns a touch status object |