summaryrefslogtreecommitdiff
path: root/core/input
diff options
context:
space:
mode:
Diffstat (limited to 'core/input')
-rw-r--r--core/input/input.cpp2
-rw-r--r--core/input/input.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp
index 5301f5f4ee..357e4c06c1 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -175,7 +175,7 @@ void Input::SpeedTrack::update(const Vector2 &p_delta_p) {
accum = accum - slice;
accum_t -= min_ref_frame;
- speed = (slice / min_ref_frame).linear_interpolate(speed, min_ref_frame / max_ref_frame);
+ speed = (slice / min_ref_frame).lerp(speed, min_ref_frame / max_ref_frame);
}
}
diff --git a/core/input/input.h b/core/input/input.h
index 477de1e879..2e136dbf02 100644
--- a/core/input/input.h
+++ b/core/input/input.h
@@ -127,15 +127,6 @@ private:
int mouse_from_touch_index;
- struct VibrationInfo {
- float weak_magnitude;
- float strong_magnitude;
- float duration; // Duration in seconds
- uint64_t timestamp;
- };
-
- Map<int, VibrationInfo> joy_vibration;
-
struct SpeedTrack {
uint64_t last_tick;
@@ -232,6 +223,15 @@ private:
EventDispatchFunc event_dispatch_function;
protected:
+ struct VibrationInfo {
+ float weak_magnitude;
+ float strong_magnitude;
+ float duration; // Duration in seconds
+ uint64_t timestamp;
+ };
+
+ Map<int, VibrationInfo> joy_vibration;
+
static void _bind_methods();
public: