diff options
Diffstat (limited to 'src/input_common/motion_input.h')
| -rw-r--r-- | src/input_common/motion_input.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/input_common/motion_input.h b/src/input_common/motion_input.h index 54b4439d9..6342d0318 100644 --- a/src/input_common/motion_input.h +++ b/src/input_common/motion_input.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | #include "common/quaternion.h" | 8 | #include "common/quaternion.h" |
| 9 | #include "common/vector_math.h" | 9 | #include "common/vector_math.h" |
| 10 | #include "core/frontend/input.h" | ||
| 10 | 11 | ||
| 11 | namespace InputCommon { | 12 | namespace InputCommon { |
| 12 | 13 | ||
| @@ -37,12 +38,15 @@ public: | |||
| 37 | Common::Vec3f GetGyroscope() const; | 38 | Common::Vec3f GetGyroscope() const; |
| 38 | Common::Vec3f GetRotations() const; | 39 | Common::Vec3f GetRotations() const; |
| 39 | Common::Quaternion<f32> GetQuaternion() const; | 40 | Common::Quaternion<f32> GetQuaternion() const; |
| 41 | Input::MotionStatus GetMotion() const; | ||
| 42 | Input::MotionStatus GetRandomMotion(int accel_magnitude, int gyro_magnitude) const; | ||
| 40 | 43 | ||
| 41 | bool IsMoving(f32 sensitivity) const; | 44 | bool IsMoving(f32 sensitivity) const; |
| 42 | bool IsCalibrated(f32 sensitivity) const; | 45 | bool IsCalibrated(f32 sensitivity) const; |
| 43 | 46 | ||
| 44 | private: | 47 | private: |
| 45 | void ResetOrientation(); | 48 | void ResetOrientation(); |
| 49 | void SetOrientationFromAccelerometer(); | ||
| 46 | 50 | ||
| 47 | // PID constants | 51 | // PID constants |
| 48 | const f32 kp; | 52 | const f32 kp; |
| @@ -63,6 +67,7 @@ private: | |||
| 63 | f32 gyro_threshold = 0.0f; | 67 | f32 gyro_threshold = 0.0f; |
| 64 | u32 reset_counter = 0; | 68 | u32 reset_counter = 0; |
| 65 | bool reset_enabled = true; | 69 | bool reset_enabled = true; |
| 70 | bool only_accelerometer = true; | ||
| 66 | }; | 71 | }; |
| 67 | 72 | ||
| 68 | } // namespace InputCommon | 73 | } // namespace InputCommon |