summaryrefslogtreecommitdiff
path: root/src/core/frontend/input.h
diff options
context:
space:
mode:
authorGravatar german2020-09-02 19:59:34 -0500
committerGravatar german2020-09-04 21:48:13 -0500
commit0774b17846fc7bd12bfe329fbaed6524d96c81cb (patch)
tree66322913f15800647404a33051d99454546eaa11 /src/core/frontend/input.h
parentconfigure_input_player: Show/hide motion buttons based on the controller (diff)
downloadyuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.gz
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.xz
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.zip
Remove RealMotionDevice
Diffstat (limited to 'src/core/frontend/input.h')
-rw-r--r--src/core/frontend/input.h29
1 files changed, 8 insertions, 21 deletions
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h
index 6770475cf..9da0d2829 100644
--- a/src/core/frontend/input.h
+++ b/src/core/frontend/input.h
@@ -119,25 +119,7 @@ using ButtonDevice = InputDevice<bool>;
119using AnalogDevice = InputDevice<std::tuple<float, float>>; 119using AnalogDevice = InputDevice<std::tuple<float, float>>;
120 120
121/** 121/**
122 * A motion device is an input device that returns a tuple of accelerometer state vector and 122 * A motion status is an object that returns a tuple of accelerometer state vector,
123 * gyroscope state vector.
124 *
125 * For both vectors:
126 * x+ is the same direction as LEFT on D-pad.
127 * y+ is normal to the touch screen, pointing outward.
128 * z+ is the same direction as UP on D-pad.
129 *
130 * For accelerometer state vector
131 * Units: g (gravitational acceleration)
132 *
133 * For gyroscope state vector:
134 * Orientation is determined by right-hand rule.
135 * Units: deg/sec
136 */
137using MotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>>>;
138
139/**
140 * A real motion device is an input device that returns a tuple of accelerometer state vector,
141 * gyroscope state vector, rotation state vector and orientation state matrix. 123 * gyroscope state vector, rotation state vector and orientation state matrix.
142 * 124 *
143 * For both vectors: 125 * For both vectors:
@@ -160,8 +142,13 @@ using MotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<fl
160 * y vector 142 * y vector
161 * z vector 143 * z vector
162 */ 144 */
163using RealMotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>, 145using MotionStatus = std::tuple<Common::Vec3<float>, Common::Vec3<float>, Common::Vec3<float>,
164 Common::Vec3<float>, std::array<Common::Vec3f, 3>>>; 146 std::array<Common::Vec3f, 3>>;
147
148/**
149 * A motion device is an input device that returns a motion status object
150 */
151using MotionDevice = InputDevice<MotionStatus>;
165 152
166/** 153/**
167 * A touch device is an input device that returns a tuple of two floats and a bool. The floats are 154 * A touch device is an input device that returns a tuple of two floats and a bool. The floats are