diff options
| author | 2023-01-25 13:16:52 -0600 | |
|---|---|---|
| committer | 2023-01-25 13:52:50 -0600 | |
| commit | cc821bfae1b02ec3e86b85097f71a2e38c12f8a5 (patch) | |
| tree | 3da326ee41f9e5831f92a9bbbe6aa80f246aa39a /src/input_common/helpers/stick_from_buttons.cpp | |
| parent | Merge pull request #9662 from abouvier/cmake-llvm (diff) | |
| download | yuzu-cc821bfae1b02ec3e86b85097f71a2e38c12f8a5.tar.gz yuzu-cc821bfae1b02ec3e86b85097f71a2e38c12f8a5.tar.xz yuzu-cc821bfae1b02ec3e86b85097f71a2e38c12f8a5.zip | |
Revert 9617 and fix it on input_common
Diffstat (limited to 'src/input_common/helpers/stick_from_buttons.cpp')
| -rw-r--r-- | src/input_common/helpers/stick_from_buttons.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp index f3a0b3419..096c23b07 100644 --- a/src/input_common/helpers/stick_from_buttons.cpp +++ b/src/input_common/helpers/stick_from_buttons.cpp | |||
| @@ -11,6 +11,11 @@ namespace InputCommon { | |||
| 11 | 11 | ||
| 12 | class Stick final : public Common::Input::InputDevice { | 12 | class Stick final : public Common::Input::InputDevice { |
| 13 | public: | 13 | public: |
| 14 | // Some games such as EARTH DEFENSE FORCE: WORLD BROTHERS | ||
| 15 | // do not play nicely with the theoretical maximum range. | ||
| 16 | // Using a value one lower from the maximum emulates real stick behavior. | ||
| 17 | static constexpr float MAX_RANGE = 32766.0f / 32767.0f; | ||
| 18 | |||
| 14 | using Button = std::unique_ptr<Common::Input::InputDevice>; | 19 | using Button = std::unique_ptr<Common::Input::InputDevice>; |
| 15 | 20 | ||
| 16 | Stick(Button up_, Button down_, Button left_, Button right_, Button modifier_, Button updater_, | 21 | Stick(Button up_, Button down_, Button left_, Button right_, Button modifier_, Button updater_, |
| @@ -196,7 +201,7 @@ public: | |||
| 196 | } | 201 | } |
| 197 | 202 | ||
| 198 | void UpdateStatus() { | 203 | void UpdateStatus() { |
| 199 | const float coef = modifier_status.value ? modifier_scale : 1.0f; | 204 | const float coef = modifier_status.value ? modifier_scale : MAX_RANGE; |
| 200 | 205 | ||
| 201 | bool r = right_status; | 206 | bool r = right_status; |
| 202 | bool l = left_status; | 207 | bool l = left_status; |
| @@ -290,7 +295,7 @@ public: | |||
| 290 | if (down_status) { | 295 | if (down_status) { |
| 291 | --y; | 296 | --y; |
| 292 | } | 297 | } |
| 293 | const float coef = modifier_status.value ? modifier_scale : 1.0f; | 298 | const float coef = modifier_status.value ? modifier_scale : MAX_RANGE; |
| 294 | status.x.raw_value = static_cast<float>(x) * coef * (y == 0 ? 1.0f : SQRT_HALF); | 299 | status.x.raw_value = static_cast<float>(x) * coef * (y == 0 ? 1.0f : SQRT_HALF); |
| 295 | status.y.raw_value = static_cast<float>(y) * coef * (x == 0 ? 1.0f : SQRT_HALF); | 300 | status.y.raw_value = static_cast<float>(y) * coef * (x == 0 ? 1.0f : SQRT_HALF); |
| 296 | return status; | 301 | return status; |