You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-22 15:06:45 +00:00
Refactored input, goes all via windows now.
Also renamed Input to InputFilter because all it does is filter events.
This commit is contained in:
committed by
Juan Linietsky
parent
9e08742de8
commit
8e6960a69e
@@ -33,7 +33,7 @@
|
||||
#define JOYPAD_LINUX_H
|
||||
|
||||
#ifdef JOYDEV_ENABLED
|
||||
#include "core/input/input.h"
|
||||
#include "core/input/input_filter.h"
|
||||
#include "core/os/mutex.h"
|
||||
#include "core/os/thread.h"
|
||||
|
||||
@@ -41,7 +41,7 @@ struct input_absinfo;
|
||||
|
||||
class JoypadLinux {
|
||||
public:
|
||||
JoypadLinux(Input *in);
|
||||
JoypadLinux(InputFilter *in);
|
||||
~JoypadLinux();
|
||||
void process_joypads();
|
||||
|
||||
@@ -53,7 +53,7 @@ private:
|
||||
};
|
||||
|
||||
struct Joypad {
|
||||
Input::JoyAxis curr_axis[MAX_ABS];
|
||||
InputFilter::JoyAxis curr_axis[MAX_ABS];
|
||||
int key_map[MAX_KEY];
|
||||
int abs_map[MAX_ABS];
|
||||
int dpad;
|
||||
@@ -74,7 +74,7 @@ private:
|
||||
bool exit_udev;
|
||||
Mutex joy_mutex;
|
||||
Thread *joy_thread;
|
||||
Input *input;
|
||||
InputFilter *input;
|
||||
Joypad joypads[JOYPADS_MAX];
|
||||
Vector<String> attached_devices;
|
||||
|
||||
@@ -95,7 +95,7 @@ private:
|
||||
void joypad_vibration_start(int p_id, float p_weak_magnitude, float p_strong_magnitude, float p_duration, uint64_t p_timestamp);
|
||||
void joypad_vibration_stop(int p_id, uint64_t p_timestamp);
|
||||
|
||||
Input::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const;
|
||||
InputFilter::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user