Merge pull request #38034 from punto-/punto-/vibration_info_protected

makes VibrationInfo protected
godotengine · Apr 29, 2020 · 10273e9 · 10273e9
2 parents 0bf6a86 + 41a7d07
commit 10273e9
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/core/input/input.h b/core/input/input.h
@@ -127,15 +127,6 @@ class Input : public Object {
 
 	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 @@ class Input : public Object {
 	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: