summaryrefslogtreecommitdiffstats
path: root/src/input_common
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-01-25 23:56:47 +0100
committerGitHub <noreply@github.com>2023-01-25 23:56:47 +0100
commitabda68f3a4e13f658fff0779927b0c7b0b24937f (patch)
tree10ec9c9305250fd7c3bb7b506a1d4499d6b204ae /src/input_common
parentMerge pull request #9679 from jbeich/libc++ (diff)
parentRevert 9617 and fix it on input_common (diff)
downloadyuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.tar
yuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.tar.gz
yuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.tar.bz2
yuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.tar.lz
yuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.tar.xz
yuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.tar.zst
yuzu-abda68f3a4e13f658fff0779927b0c7b0b24937f.zip
Diffstat (limited to 'src/input_common')
-rw-r--r--src/input_common/helpers/stick_from_buttons.cpp9
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 {
class Stick final : public Common::Input::InputDevice {
public:
+ // Some games such as EARTH DEFENSE FORCE: WORLD BROTHERS
+ // do not play nicely with the theoretical maximum range.
+ // Using a value one lower from the maximum emulates real stick behavior.
+ static constexpr float MAX_RANGE = 32766.0f / 32767.0f;
+
using Button = std::unique_ptr<Common::Input::InputDevice>;
Stick(Button up_, Button down_, Button left_, Button right_, Button modifier_, Button updater_,
@@ -196,7 +201,7 @@ public:
}
void UpdateStatus() {
- const float coef = modifier_status.value ? modifier_scale : 1.0f;
+ const float coef = modifier_status.value ? modifier_scale : MAX_RANGE;
bool r = right_status;
bool l = left_status;
@@ -290,7 +295,7 @@ public:
if (down_status) {
--y;
}
- const float coef = modifier_status.value ? modifier_scale : 1.0f;
+ const float coef = modifier_status.value ? modifier_scale : MAX_RANGE;
status.x.raw_value = static_cast<float>(x) * coef * (y == 0 ? 1.0f : SQRT_HALF);
status.y.raw_value = static_cast<float>(y) * coef * (x == 0 ? 1.0f : SQRT_HALF);
return status;