From a61dff67daaee2469eeb1f90d5f6089a54ad5e8a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 18 Jan 2020 13:56:11 -0600 Subject: InputCommon: List IMUAccelerometer's Up/Down inputs first for consistency. --- .../Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp') 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::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 -- cgit v1.2.3