diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-04-12 11:47:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-12 11:47:38 -0400 |
| commit | bcddd78a891d5897dccc2c19cfe9435c77c05561 (patch) | |
| tree | cc5934cd1f3f5529c2a34b15c6868448aed9758e /Source | |
| parent | 5285b1168a629e44c2fcc42664bf003dcf55019e (diff) | |
| parent | 87beb7d67b32589fb6f5d0e9268d2def3f81e2ad (diff) | |
Merge pull request #13500 from jordan-woyak/accel-gyro-any-mapping
InputCommon: Activate IMU Accelerometer and Gyroscope mappings when any direction has a bound input.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp index d6cb4b95ff..b7cc3da5c2 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp @@ -4,7 +4,6 @@ #include "InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h" #include <algorithm> -#include <memory> #include "Common/Common.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" @@ -25,7 +24,7 @@ IMUAccelerometer::IMUAccelerometer(std::string name_, std::string ui_name_) bool IMUAccelerometer::AreInputsBound() const { - return std::ranges::all_of( + return std::ranges::any_of( controls, [](const auto& control) { return control->control_ref->BoundCount() > 0; }); } diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp index 787665b366..316ed45f84 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp @@ -4,7 +4,6 @@ #include "InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h" #include <algorithm> -#include <memory> #include "Common/Common.h" #include "Common/MathUtil.h" @@ -123,7 +122,7 @@ auto IMUGyroscope::GetRawState() const -> StateData bool IMUGyroscope::AreInputsBound() const { - return std::ranges::all_of( + return std::ranges::any_of( controls, [](const auto& control) { return control->control_ref->BoundCount() > 0; }); } |