godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Consolidate the fact that Input is meant to be final

Browse Source 
This reverts #38034 and removes the `iteration()` method.
This commit is contained in:
Pedro J. Estébanez
2022-08-22 14:37:25 +02:00
parent 0c5f254956
commit 99edd4b43d
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/input/input.cpp
View File

@@ -767,9 +767,6 @@ Point2i Input::warp_mouse_motion(const Ref<InputEventMouseMotion> &p_motion, con
return rel_warped; return rel_warped;
} }
void Input::iteration(float p_step) {
}
void Input::action_press(const StringName &p_action, float p_strength) { void Input::action_press(const StringName &p_action, float p_strength) {
Action action; Action action;

20
core/input/input.h
View File

@@ -114,6 +114,15 @@ private:
int mouse_from_touch_index = -1; 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 { struct VelocityTrack {
uint64_t last_tick = 0; uint64_t last_tick = 0;
Vector2 velocity; Vector2 velocity;
@@ -226,15 +235,6 @@ private:
EventDispatchFunc event_dispatch_function = nullptr; EventDispatchFunc event_dispatch_function = nullptr;
protected: 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(); static void _bind_methods();
public: public:
@@ -295,8 +295,6 @@ public:
void action_press(const StringName &p_action, float p_strength = 1.f); void action_press(const StringName &p_action, float p_strength = 1.f);
void action_release(const StringName &p_action); void action_release(const StringName &p_action);
void iteration(float p_step);
void set_emulate_touch_from_mouse(bool p_emulate); void set_emulate_touch_from_mouse(bool p_emulate);
bool is_emulating_touch_from_mouse() const; bool is_emulating_touch_from_mouse() const;
void ensure_touch_mouse_raised(); void ensure_touch_mouse_raised();