From 0bd64b7975722382773a5928e80dfe64da30b335 Mon Sep 17 00:00:00 2001 From: Mickaël Malécot Date: Sat, 9 May 2020 12:39:41 +0200 Subject: Gamepad axis bug fixes and improvement (#1228) * Fix gamepad axis count * Fix Xbox axis drawing * Ignore low axis values * Revert "Fix gamepad axis count" This reverts commit f08ae4bf * Fix GamepadAxis API * Fix conflict with master * Revert Gamepad MAX definitions * Revert MAX_GAMEPAD_AXIS update --- src/raylib.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 62024a46..e6dbf578 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -663,20 +663,17 @@ typedef enum { } GamepadButton; typedef enum { - // This is here just for error checking - GAMEPAD_AXIS_UNKNOWN = 0, - // Left stick - GAMEPAD_AXIS_LEFT_X, - GAMEPAD_AXIS_LEFT_Y, + GAMEPAD_AXIS_LEFT_X = 0, + GAMEPAD_AXIS_LEFT_Y = 1, // Right stick - GAMEPAD_AXIS_RIGHT_X, - GAMEPAD_AXIS_RIGHT_Y, + GAMEPAD_AXIS_RIGHT_X = 2, + GAMEPAD_AXIS_RIGHT_Y = 3, // Pressure levels for the back triggers - GAMEPAD_AXIS_LEFT_TRIGGER, // [1..-1] (pressure-level) - GAMEPAD_AXIS_RIGHT_TRIGGER // [1..-1] (pressure-level) + GAMEPAD_AXIS_LEFT_TRIGGER = 4, // [1..-1] (pressure-level) + GAMEPAD_AXIS_RIGHT_TRIGGER = 5 // [1..-1] (pressure-level) } GamepadAxis; // Shader location point type -- cgit v1.2.3