summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-29 09:57:17 +0200
committerGitHub <noreply@github.com>2020-04-29 09:57:17 +0200
commit10273e9de69a5ffe7eb18356b12b113d494a43cb (patch)
tree55fbc3f3e1f77aef747711321b22573d1c5aa0bc /core
parent0bf6a86db4c9932dee751378d441b6ef05507087 (diff)
parent41a7d070957d7cbe24f1f0daa36e7d5f5318c1e5 (diff)
Merge pull request #38034 from punto-/punto-/vibration_info_protected
makes VibrationInfo protected
Diffstat (limited to 'core')
-rw-r--r--core/input/input.h18
1 files changed, 9 insertions, 9 deletions
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: