Skip to content

godot
godot
Unverified Commit 10273e9d by Rémi Verschelde Committed by GitHub
Options

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

makes VibrationInfo protected
parents 0bf6a86d 41a7d070
Showing with 9 additions and 9 deletions
core/input/input.h
...@@ -127,15 +127,6 @@ private: ...@@ -127,15 +127,6 @@ private:
int mouse_from_touch_index; 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 { struct SpeedTrack {
uint64_t last_tick; uint64_t last_tick;
...@@ -232,6 +223,15 @@ private: ...@@ -232,6 +223,15 @@ private:
EventDispatchFunc event_dispatch_function; EventDispatchFunc event_dispatch_function;
protected: 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(); static void _bind_methods();
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment