diff options
author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2022-08-22 14:37:25 +0200 |
---|---|---|
committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2022-08-22 14:37:25 +0200 |
commit | 99edd4b43d41d5457dce2c3211ee249ee6ea0b7c (patch) | |
tree | 5bd5c2b49c4051d1a0a2216c6901e8e5a3eed7ae /core/input | |
parent | 0c5f254956f0115e363ce08045dd178dc30b54f8 (diff) |
Consolidate the fact that `Input` is meant to be final
This reverts #38034 and removes the `iteration()` method.
Diffstat (limited to 'core/input')
-rw-r--r-- | core/input/input.cpp | 3 | ||||
-rw-r--r-- | core/input/input.h | 20 |
2 files changed, 9 insertions, 14 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp index e08647f5ea..ff7ac59e1f 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -767,9 +767,6 @@ Point2i Input::warp_mouse_motion(const Ref<InputEventMouseMotion> &p_motion, con return rel_warped; } -void Input::iteration(float p_step) { -} - void Input::action_press(const StringName &p_action, float p_strength) { Action action; diff --git a/core/input/input.h b/core/input/input.h index 3ad8c91ddf..a07174b887 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -114,6 +114,15 @@ private: int mouse_from_touch_index = -1; + struct VibrationInfo { + float weak_magnitude; + float strong_magnitude; + float duration; // Duration in seconds + uint64_t timestamp; + }; + + HashMap<int, VibrationInfo> joy_vibration; + struct VelocityTrack { uint64_t last_tick = 0; Vector2 velocity; @@ -226,15 +235,6 @@ private: EventDispatchFunc event_dispatch_function = nullptr; protected: - struct VibrationInfo { - float weak_magnitude; - float strong_magnitude; - float duration; // Duration in seconds - uint64_t timestamp; - }; - - HashMap<int, VibrationInfo> joy_vibration; - static void _bind_methods(); public: @@ -295,8 +295,6 @@ public: void action_press(const StringName &p_action, float p_strength = 1.f); void action_release(const StringName &p_action); - void iteration(float p_step); - void set_emulate_touch_from_mouse(bool p_emulate); bool is_emulating_touch_from_mouse() const; void ensure_touch_mouse_raised(); |