diff options
Diffstat (limited to 'src/core/hid/emulated_controller.h')
| -rw-r--r-- | src/core/hid/emulated_controller.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 50f21ccd9..d66768549 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | namespace Core::HID { | 20 | namespace Core::HID { |
| 21 | 21 | ||
| 22 | struct ControllerMotionInfo { | 22 | struct ControllerMotionInfo { |
| 23 | Input::MotionStatus raw_status; | 23 | Input::MotionStatus raw_status{}; |
| 24 | MotionInput emulated{}; | 24 | MotionInput emulated{}; |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| @@ -51,28 +51,28 @@ using BatteryValues = std::array<Input::BatteryStatus, 3>; | |||
| 51 | using VibrationValues = std::array<Input::VibrationStatus, 2>; | 51 | using VibrationValues = std::array<Input::VibrationStatus, 2>; |
| 52 | 52 | ||
| 53 | struct AnalogSticks { | 53 | struct AnalogSticks { |
| 54 | AnalogStickState left; | 54 | AnalogStickState left{}; |
| 55 | AnalogStickState right; | 55 | AnalogStickState right{}; |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | struct ControllerColors { | 58 | struct ControllerColors { |
| 59 | NpadControllerColor fullkey; | 59 | NpadControllerColor fullkey{}; |
| 60 | NpadControllerColor left; | 60 | NpadControllerColor left{}; |
| 61 | NpadControllerColor right; | 61 | NpadControllerColor right{}; |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | struct BatteryLevelState { | 64 | struct BatteryLevelState { |
| 65 | NpadPowerInfo dual; | 65 | NpadPowerInfo dual{}; |
| 66 | NpadPowerInfo left; | 66 | NpadPowerInfo left{}; |
| 67 | NpadPowerInfo right; | 67 | NpadPowerInfo right{}; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | struct ControllerMotion { | 70 | struct ControllerMotion { |
| 71 | bool is_at_rest; | ||
| 72 | Common::Vec3f accel{}; | 71 | Common::Vec3f accel{}; |
| 73 | Common::Vec3f gyro{}; | 72 | Common::Vec3f gyro{}; |
| 74 | Common::Vec3f rotation{}; | 73 | Common::Vec3f rotation{}; |
| 75 | std::array<Common::Vec3f, 3> orientation{}; | 74 | std::array<Common::Vec3f, 3> orientation{}; |
| 75 | bool is_at_rest{}; | ||
| 76 | }; | 76 | }; |
| 77 | 77 | ||
| 78 | using MotionState = std::array<ControllerMotion, 2>; | 78 | using MotionState = std::array<ControllerMotion, 2>; |
| @@ -113,7 +113,7 @@ enum class ControllerTriggerType { | |||
| 113 | 113 | ||
| 114 | struct ControllerUpdateCallback { | 114 | struct ControllerUpdateCallback { |
| 115 | std::function<void(ControllerTriggerType)> on_change; | 115 | std::function<void(ControllerTriggerType)> on_change; |
| 116 | bool is_service; | 116 | bool is_npad_service; |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | class EmulatedController { | 119 | class EmulatedController { |