Analog values for gamepad triggers, using axes 6 & 7

2 files changed, 17 insertions, 3 deletions

diff --git a/core/os/input_event.h b/core/os/input_event.h
index 12980e2a15..b601adc875 100644
--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@@ -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,
 };
 
 
diff --git a/main/input_default.cpp b/main/input_default.cpp
index 4141102bf6..68f7434d96 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -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");