Browse Source

Consolidate the fact that `Input` is meant to be final

This reverts #38034 and removes the `iteration()` method.
Pedro J. Estébanez 3 years ago
parent
commit
99edd4b43d
2 changed files with 9 additions and 14 deletions
  1. 0 3
      core/input/input.cpp
  2. 9 11
      core/input/input.h

+ 0 - 3
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;
 

+ 9 - 11
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();