Merge branch 'patch-9' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-patch-9

2021-11-05 12:40:42 +01:00
parent a37103af4a 7198539b33
commit fbdaa43126
1 changed files with 7 additions and 2 deletions
--- a/Source/Engine/Input/Input.cpp
+++ b/Source/Engine/Input/Input.cpp
@@ -508,11 +508,16 @@ float Input::GetGamepadAxis(InputGamepadIndex gamepad, GamepadAxis axis)
 {
    if (gamepad == InputGamepadIndex::All)
    {
+        float val = 0;
        for (auto g : Gamepads)
        {
-            if (g->GetAxis(axis))
-                return true;
+            val += g->GetAxis(axis);
+            if(val >= 1)
+                return 1;
+            if (val <= -1)
+                return -1;
        }
+        return val;
    }
    else
    {