diff options
| author | 2020-11-29 22:59:50 -0800 | |
|---|---|---|
| committer | 2020-11-29 22:59:50 -0800 | |
| commit | 7bc3e80399d62aabe4acbba094d0fff23a187186 (patch) | |
| tree | ac12ca41f34fdda51992fedfeb55b169dedcfcaf /src/core | |
| parent | Merge pull request #5005 from ReinUsesLisp/div-ceil (diff) | |
| parent | Implement full mouse support (diff) | |
| download | yuzu-7bc3e80399d62aabe4acbba094d0fff23a187186.tar.gz yuzu-7bc3e80399d62aabe4acbba094d0fff23a187186.tar.xz yuzu-7bc3e80399d62aabe4acbba094d0fff23a187186.zip | |
Merge pull request #4939 from german77/MouseInput
InputCommon: Implement full mouse support
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/frontend/input.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h index 11c2e96ca..de51a754e 100644 --- a/src/core/frontend/input.h +++ b/src/core/frontend/input.h | |||
| @@ -163,10 +163,15 @@ 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 device is an input device that returns a tuple of two floats and a bool. The floats are | 166 | * A touch status is an object that returns a tuple of two floats and a bool. The floats are |
| 167 | * x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is pressed. | 167 | * x and y coordinates in the range 0.0 - 1.0, and the bool indicates whether it is pressed. |
| 168 | */ | 168 | */ |
| 169 | using TouchDevice = InputDevice<std::tuple<float, float, bool>>; | 169 | using TouchStatus = std::tuple<float, float, bool>; |
| 170 | |||
| 171 | /** | ||
| 172 | * A touch device is an input device that returns a touch status object | ||
| 173 | */ | ||
| 174 | using TouchDevice = InputDevice<TouchStatus>; | ||
| 170 | 175 | ||
| 171 | /** | 176 | /** |
| 172 | * A mouse device is an input device that returns a tuple of two floats and four ints. | 177 | * A mouse device is an input device that returns a tuple of two floats and four ints. |