Relintai
/
godot
mirror of https://github.com/Relintai/godot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Analog values for gamepad triggers, using axes 6 & 7

This commit is contained in:
hondres 2016-01-02 03:34:32 +01:00
parent 2cc2524329
commit 117ae93cf1
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/input_event.h
View File

@ -143,6 +143,9 @@ enum {
JOY_ANALOG_2_X = JOY_AXIS_4,
JOY_ANALOG_2_Y = JOY_AXIS_5,
JOY_ANALOG_L2 = JOY_AXIS_6,
JOY_ANALOG_R2 = JOY_AXIS_7,
};

17
main/input_default.cpp
View File

@ -545,7 +545,12 @@ uint32_t InputDefault::joy_button(uint32_t p_last_id, int p_device, int p_button
JoyEvent map = el->get();
if (map.type == TYPE_BUTTON) {
//fake additional axis event for triggers
if (map.index == JOY_L2 || map.index == JOY_R2) {
float value = p_pressed ? 1.0f : 0.0f;
int axis = map.index == JOY_L2 ? JOY_ANALOG_L2 : JOY_ANALOG_R2;
p_last_id = _axis_event(p_last_id, p_device, axis, value);
}
return _button_event(p_last_id, p_device, map.index, p_pressed);
};
@ -580,8 +585,9 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co
joy.last_axis[p_axis] = p_value.value;
float val = p_value.min == 0 ? -1.0f + 2.0f * p_value.value : p_value.value;
if (joy.mapping == -1) {
float val = p_value.min == 0 ? -1.0f + 2.0f * p_value.value : p_value.value;
return _axis_event(p_last_id, p_device, p_axis, val);
};
@ -595,6 +601,12 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co
JoyEvent map = el->get();
if (map.type == TYPE_BUTTON) {
//send axis event for triggers
if (map.index == JOY_L2 || map.index == JOY_R2) {
float value = p_value.min == 0 ? p_value.value : 0.5f + p_value.value / 2.0f;
int axis = map.index == JOY_L2 ? JOY_ANALOG_L2 : JOY_ANALOG_R2;
p_last_id = _axis_event(p_last_id, p_device, axis, value);
}
float deadzone = p_value.min == 0 ? 0.5f : 0.0f;
bool pressed = p_value.value > deadzone ? true : false;
if (pressed == joy_buttons_pressed.has(_combine_device(map.index,p_device))) {
@ -606,7 +618,6 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co
if (map.type == TYPE_AXIS) {
float val = p_value.min == 0 ? -1.0f + 2.0f * p_value.value : p_value.value;
return _axis_event(p_last_id, p_device, map.index, val );
};
//printf("invalid mapping\n");