summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-11-16 22:41:14 +0100
committerGitHub <noreply@github.com>2020-11-16 22:41:14 +0100
commitfbe0386c653615a373e45af1ebe027c83b924d33 (patch)
tree878908c697d6fe2349ef077ce0c8ffbd7826d701
parentd3f20ea0aed2d7e286669c45670be0738ef41595 (diff)
parentf9bb8de3fc6a45212a0c76893926865ff911d84c (diff)
Merge pull request #43233 from madmiraal/fix-42876
Remove unneeded filter on joy_axis()
-rw-r--r--core/input/input.cpp8
-rw-r--r--core/input/input.h1
2 files changed, 0 insertions, 9 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp
index a408cd674b..aa64ac09a7 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -937,14 +937,6 @@ void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) {
return;
}
- if (p_value.value > joy.last_axis[p_axis]) {
- if (p_value.value < joy.last_axis[p_axis] + joy.filter) {
- return;
- }
- } else if (p_value.value > joy.last_axis[p_axis] - joy.filter) {
- return;
- }
-
//when changing direction quickly, insert fake event to release pending inputmap actions
float last = joy.last_axis[p_axis];
if (p_value.min == 0 && (last < 0.25 || last > 0.75) && (last - 0.5) * (p_value.value - 0.5) < 0) {
diff --git a/core/input/input.h b/core/input/input.h
index cbb884216a..46e9d24bf2 100644
--- a/core/input/input.h
+++ b/core/input/input.h
@@ -147,7 +147,6 @@ private:
bool connected = false;
bool last_buttons[JOY_BUTTON_MAX] = { false };
float last_axis[JOY_AXIS_MAX] = { 0.0f };
- float filter = 0.01f;
int last_hat = HAT_MASK_CENTER;
int mapping = -1;
int hat_current = 0;