summaryrefslogtreecommitdiff
path: root/src/core/frontend
diff options
context:
space:
mode:
authorGravatar bunnei2018-11-19 08:30:10 -0800
committerGravatar GitHub2018-11-19 08:30:10 -0800
commit048da7240d793245b156eb29ac52e9b5a514a64d (patch)
tree30662cee6d3b3ce2a93c40530939902b6f3900db /src/core/frontend
parentMerge pull request #1717 from FreddyFunk/swizzle-gob (diff)
parentconfigure_input: Use Joycons Docked instead of Connected as label (diff)
downloadyuzu-048da7240d793245b156eb29ac52e9b5a514a64d.tar.gz
yuzu-048da7240d793245b156eb29ac52e9b5a514a64d.tar.xz
yuzu-048da7240d793245b156eb29ac52e9b5a514a64d.zip
Merge pull request #1634 from DarkLordZach/better-hid-2
hid: Add support for multiplayer and multilayout controllers
Diffstat (limited to 'src/core/frontend')
-rw-r--r--src/core/frontend/input.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h
index 39bdf4e21..16fdcd376 100644
--- a/src/core/frontend/input.h
+++ b/src/core/frontend/input.h
@@ -132,4 +132,11 @@ using MotionDevice = InputDevice<std::tuple<Math::Vec3<float>, Math::Vec3<float>
132 */ 132 */
133using TouchDevice = InputDevice<std::tuple<float, float, bool>>; 133using TouchDevice = InputDevice<std::tuple<float, float, bool>>;
134 134
135/**
136 * A mouse device is an input device that returns a tuple of two floats and four ints.
137 * The first two floats are X and Y device coordinates of the mouse (from 0-1).
138 * The s32s are the mouse wheel.
139 */
140using MouseDevice = InputDevice<std::tuple<float, float, s32, s32>>;
141
135} // namespace Input 142} // namespace Input