summaryrefslogtreecommitdiffstats
path: root/src/core/frontend/input.h
diff options
context:
space:
mode:
authorgerman <german@thesoftwareartisans.com>2020-09-03 02:59:34 +0200
committergerman <german@thesoftwareartisans.com>2020-09-05 04:48:13 +0200
commit0774b17846fc7bd12bfe329fbaed6524d96c81cb (patch)
tree66322913f15800647404a33051d99454546eaa11 /src/core/frontend/input.h
parentconfigure_input_player: Show/hide motion buttons based on the controller (diff)
downloadyuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.gz
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.bz2
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.lz
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.xz
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.tar.zst
yuzu-0774b17846fc7bd12bfe329fbaed6524d96c81cb.zip
Diffstat (limited to '')
-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>;
using AnalogDevice = InputDevice<std::tuple<float, float>>;
/**
- * A motion device is an input device that returns a tuple of accelerometer state vector and
- * gyroscope state vector.
- *
- * For both vectors:
- * x+ is the same direction as LEFT on D-pad.
- * y+ is normal to the touch screen, pointing outward.
- * z+ is the same direction as UP on D-pad.
- *
- * For accelerometer state vector
- * Units: g (gravitational acceleration)
- *
- * For gyroscope state vector:
- * Orientation is determined by right-hand rule.
- * Units: deg/sec
- */
-using MotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>>>;
-
-/**
- * A real motion device is an input device that returns a tuple of accelerometer state vector,
+ * A motion status is an object that returns a tuple of accelerometer state vector,
* gyroscope state vector, rotation state vector and orientation state matrix.
*
* For both vectors:
@@ -160,8 +142,13 @@ using MotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<fl
* y vector
* z vector
*/
-using RealMotionDevice = InputDevice<std::tuple<Common::Vec3<float>, Common::Vec3<float>,
- Common::Vec3<float>, std::array<Common::Vec3f, 3>>>;
+using MotionStatus = std::tuple<Common::Vec3<float>, Common::Vec3<float>, Common::Vec3<float>,
+ std::array<Common::Vec3f, 3>>;
+
+/**
+ * A motion device is an input device that returns a motion status object
+ */
+using MotionDevice = InputDevice<MotionStatus>;
/**
* A touch device is an input device that returns a tuple of two floats and a bool. The floats are