summaryrefslogtreecommitdiff
path: root/src/input_common/motion_input.h
diff options
context:
space:
mode:
authorGravatar bunnei2020-10-15 20:59:34 -0700
committerGravatar GitHub2020-10-15 20:59:34 -0700
commit64f967fd4958abb5a02191a81e91fc8b33bcf4c5 (patch)
tree97a73da4871f006b39eafca3a881ae2ea42f206a /src/input_common/motion_input.h
parentMerge pull request #4784 from bunnei/cancelbuffer (diff)
parentinput_common/CMakeLists: Make some warnings errors (diff)
downloadyuzu-64f967fd4958abb5a02191a81e91fc8b33bcf4c5.tar.gz
yuzu-64f967fd4958abb5a02191a81e91fc8b33bcf4c5.tar.xz
yuzu-64f967fd4958abb5a02191a81e91fc8b33bcf4c5.zip
Merge pull request #4790 from lioncash/input-common
input_common/CMakeLists: Make some warnings errors
Diffstat (limited to 'src/input_common/motion_input.h')
-rw-r--r--src/input_common/motion_input.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input_common/motion_input.h b/src/input_common/motion_input.h
index 6342d0318..abb957f04 100644
--- a/src/input_common/motion_input.h
+++ b/src/input_common/motion_input.h
@@ -22,7 +22,7 @@ public:
22 MotionInput& operator=(MotionInput&&) = default; 22 MotionInput& operator=(MotionInput&&) = default;
23 23
24 void SetAcceleration(const Common::Vec3f& acceleration); 24 void SetAcceleration(const Common::Vec3f& acceleration);
25 void SetGyroscope(const Common::Vec3f& acceleration); 25 void SetGyroscope(const Common::Vec3f& gyroscope);
26 void SetQuaternion(const Common::Quaternion<f32>& quaternion); 26 void SetQuaternion(const Common::Quaternion<f32>& quaternion);
27 void SetGyroDrift(const Common::Vec3f& drift); 27 void SetGyroDrift(const Common::Vec3f& drift);
28 void SetGyroThreshold(f32 threshold); 28 void SetGyroThreshold(f32 threshold);
@@ -49,16 +49,16 @@ private:
49 void SetOrientationFromAccelerometer(); 49 void SetOrientationFromAccelerometer();
50 50
51 // PID constants 51 // PID constants
52 const f32 kp; 52 f32 kp;
53 const f32 ki; 53 f32 ki;
54 const f32 kd; 54 f32 kd;
55 55
56 // PID errors 56 // PID errors
57 Common::Vec3f real_error; 57 Common::Vec3f real_error;
58 Common::Vec3f integral_error; 58 Common::Vec3f integral_error;
59 Common::Vec3f derivative_error; 59 Common::Vec3f derivative_error;
60 60
61 Common::Quaternion<f32> quat; 61 Common::Quaternion<f32> quat{{0.0f, 0.0f, -1.0f}, 0.0f};
62 Common::Vec3f rotations; 62 Common::Vec3f rotations;
63 Common::Vec3f accel; 63 Common::Vec3f accel;
64 Common::Vec3f gyro; 64 Common::Vec3f gyro;