seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #111681 from Nintorch/joypad-led

Browse Source 
Add support for setting a joypad's LED light color
This commit is contained in:
Thaddeus Crews
2025-11-13 20:52:07 -06:00
parent 0b5ad6c73c a55242747a
commit 52e7b970af
5 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/input/input.cpp
View File

@ -151,6 +151,8 @@ void Input::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_accelerometer", "value"), &Input::set_accelerometer);
ClassDB::bind_method(D_METHOD("set_magnetometer", "value"), &Input::set_magnetometer);
ClassDB::bind_method(D_METHOD("set_gyroscope", "value"), &Input::set_gyroscope);
ClassDB::bind_method(D_METHOD("set_joy_light", "device", "color"), &Input::set_joy_light);
ClassDB::bind_method(D_METHOD("has_joy_light", "device"), &Input::has_joy_light);
ClassDB::bind_method(D_METHOD("get_last_mouse_velocity"), &Input::get_last_mouse_velocity);
ClassDB::bind_method(D_METHOD("get_last_mouse_screen_velocity"), &Input::get_last_mouse_screen_velocity);
ClassDB::bind_method(D_METHOD("get_mouse_button_mask"), &Input::get_mouse_button_mask);
@ -1001,6 +1003,19 @@ void Input::set_joy_features(int p_device, JoypadFeatures *p_features) {
_update_joypad_features(p_device);
}
bool Input::set_joy_light(int p_device, const Color &p_color) {
Joypad *joypad = joy_names.getptr(p_device);
if (!joypad || joypad->features == nullptr) {
return false;
}
return joypad->features->set_joy_light(p_color);
}
bool Input::has_joy_light(int p_device) const {
const Joypad *joypad = joy_names.getptr(p_device);
return joypad && joypad->has_light;
}
void Input::start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration) {
_THREAD_SAFE_METHOD_
if (p_weak_magnitude < 0.f || p_weak_magnitude > 1.f || p_strong_magnitude < 0.f || p_strong_magnitude > 1.f) {
@ -1498,8 +1513,9 @@ void Input::_update_joypad_features(int p_device) {
if (!joypad || joypad->features == nullptr) {
return;
}
// Do something based on the features. For example, we can save the information about
// the joypad having motion sensors, LED light, etc.
if (joypad->features->has_joy_light()) {
joypad->has_light = true;
}
}
Input::JoyEvent Input::_get_mapped_button_event(const JoyDeviceMapping &mapping, JoyButton p_button) {

9
core/input/input.h
View File

@ -83,9 +83,8 @@ public:
public:
virtual ~JoypadFeatures() {}
// None at the moment, but later we can add new features like:
// virtual bool has_joy_accelerometer() const { return false; }
// virtual bool set_joy_accelerometer_enabled(bool p_enable) { return false; }
virtual bool has_joy_light() const { return false; }
virtual bool set_joy_light(const Color &p_color) { return false; }
};
static constexpr int32_t JOYPADS_MAX = 16;
@ -184,6 +183,7 @@ private:
int mapping = -1;
int hat_current = 0;
Dictionary info;
bool has_light = false;
Input::JoypadFeatures *features = nullptr;
};
@ -360,6 +360,9 @@ public:
void set_joy_features(int p_device, JoypadFeatures *p_features);
bool set_joy_light(int p_device, const Color &p_color);
bool has_joy_light(int p_device) const;
void start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration = 0);
void stop_joy_vibration(int p_device);
void vibrate_handheld(int p_duration_ms = 500, float p_amplitude = -1.0);