diff options
author | german77 <juangerman-13@hotmail.com> | 2021-04-22 20:15:59 +0200 |
---|---|---|
committer | german77 <juangerman-13@hotmail.com> | 2021-04-24 05:12:41 +0200 |
commit | c19ad21ae855c9143a871e378e8d8c59abcaebfa (patch) | |
tree | 90499012c2bcac1620ca69e4ef6b10edb5ffe009 /src/core/frontend | |
parent | Merge pull request #6224 from Morph1984/hid_InitializeSevenSixAxisSensor (diff) | |
download | yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.tar yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.tar.gz yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.tar.bz2 yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.tar.lz yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.tar.xz yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.tar.zst yuzu-c19ad21ae855c9143a871e378e8d8c59abcaebfa.zip |
Diffstat (limited to 'src/core/frontend')
-rw-r--r-- | src/core/frontend/input.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/frontend/input.h b/src/core/frontend/input.h index 88ebc6497..0c5d2b3b0 100644 --- a/src/core/frontend/input.h +++ b/src/core/frontend/input.h @@ -11,6 +11,7 @@ #include <utility> #include "common/logging/log.h" #include "common/param_package.h" +#include "common/quaternion.h" #include "common/vector_math.h" namespace Input { @@ -143,9 +144,10 @@ using VibrationDevice = InputDevice<u8>; /** * A motion status is an object that returns a tuple of accelerometer state vector, - * gyroscope state vector, rotation state vector and orientation state matrix. + * gyroscope state vector, rotation state vector, orientation state matrix and quaterion state + * vector. * - * For both vectors: + * For both 3D vectors: * x+ is the same direction as RIGHT on D-pad. * y+ is normal to the touch screen, pointing outward. * z+ is the same direction as UP on D-pad. @@ -164,9 +166,13 @@ using VibrationDevice = InputDevice<u8>; * x vector * y vector * z vector + * + * For quaternion state vector + * xyz vector + * w float */ using MotionStatus = std::tuple<Common::Vec3<float>, Common::Vec3<float>, Common::Vec3<float>, - std::array<Common::Vec3f, 3>>; + std::array<Common::Vec3f, 3>, Common::Quaternion<f32>>; /** * A motion device is an input device that returns a motion status object |