summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2020-01-19 16:05:53 -0500
committerGitHub <noreply@github.com>2020-01-19 16:05:53 -0500
commitf61d77a5e2b56351da255de994ac6eb97a3a739c (patch)
tree2750f286e6b4859d231b8d0dd234be7a179e9849 /Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
parentc74b1140a58d20a3f9f0ba3a0f7077d2e6231f12 (diff)
parenta61dff67daaee2469eeb1f90d5f6089a54ad5e8a (diff)
Merge pull request #8568 from jordan-woyak/imu-accel-ordering
InputCommon: List IMUAccelerometer's Up/Down inputs first for consistency.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
index 3a1ed14b7d..922f7a0d43 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
@@ -27,15 +27,14 @@ IMUGyroscope::IMUGyroscope(std::string name, std::string ui_name)
std::optional<IMUGyroscope::StateData> IMUGyroscope::GetState() const
{
+ if (controls[0]->control_ref->BoundCount() == 0)
+ return std::nullopt;
+
StateData state;
state.x = (controls[1]->control_ref->State() - controls[0]->control_ref->State());
state.y = (controls[2]->control_ref->State() - controls[3]->control_ref->State());
state.z = (controls[4]->control_ref->State() - controls[5]->control_ref->State());
-
- if (controls[0]->control_ref->BoundCount() != 0)
- return state;
- else
- return std::nullopt;
+ return state;
}
} // namespace ControllerEmu