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

makes VibrationInfo protected
This commit is contained in:
Rémi Verschelde 2020-04-29 09:57:17 +02:00 committed by GitHub
commit 10273e9de6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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: