aboutsummaryrefslogtreecommitdiff
path: root/src/raylib.h
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2016-03-16 17:52:09 +0100
committerRay <raysan5@gmail.com>2016-03-16 17:52:09 +0100
commitdb4585b3e23cd3c5aa87da21aedc36fd8be21739 (patch)
tree4edd87be5b35d7874b03799d4b84ffe0ae1e6cd3 /src/raylib.h
parentd6bc7b887721de660917125eddd53372be1bf3f8 (diff)
downloadraylib-db4585b3e23cd3c5aa87da21aedc36fd8be21739.tar.gz
raylib-db4585b3e23cd3c5aa87da21aedc36fd8be21739.zip
Improved gamepad support
Now it works ok also in RaspberryPi
Diffstat (limited to 'src/raylib.h')
-rw-r--r--src/raylib.h32
1 files changed, 30 insertions, 2 deletions
diff --git a/src/raylib.h b/src/raylib.h
index ddfccea7..d891467e 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -190,7 +190,35 @@
#define GAMEPAD_BUTTON_SELECT 9
#define GAMEPAD_BUTTON_START 10
-// TODO: Review Xbox360 USB Controller Buttons
+// Xbox360 USB Controller Buttons
+#define GAMEPAD_XBOX_BUTTON_A 0
+#define GAMEPAD_XBOX_BUTTON_B 1
+#define GAMEPAD_XBOX_BUTTON_X 2
+#define GAMEPAD_XBOX_BUTTON_Y 3
+#define GAMEPAD_XBOX_BUTTON_LB 4
+#define GAMEPAD_XBOX_BUTTON_RB 5
+#define GAMEPAD_XBOX_BUTTON_SELECT 6
+#define GAMEPAD_XBOX_BUTTON_START 7
+
+#if defined(PLATFORM_RPI)
+ #define GAMEPAD_XBOX_AXIS_DPAD_X 32
+ #define GAMEPAD_XBOX_AXIS_DPAD_Y 64
+ #define GAMEPAD_XBOX_AXIS_RIGHT_X 3
+ #define GAMEPAD_XBOX_AXIS_RIGHT_Y 4
+ #define GAMEPAD_XBOX_AXIS_LT 2
+ #define GAMEPAD_XBOX_AXIS_RT 5
+#else
+ #define GAMEPAD_XBOX_BUTTON_UP 10
+ #define GAMEPAD_XBOX_BUTTON_DOWN 12
+ #define GAMEPAD_XBOX_BUTTON_LEFT 13
+ #define GAMEPAD_XBOX_BUTTON_RIGHT 11
+ #define GAMEPAD_XBOX_AXIS_RIGHT_X 4
+ #define GAMEPAD_XBOX_AXIS_RIGHT_Y 3
+ #define GAMEPAD_XBOX_AXIS_LT_RT 2
+#endif
+
+#define GAMEPAD_XBOX_AXIS_LEFT_X 0
+#define GAMEPAD_XBOX_AXIS_LEFT_Y 1
// Android Physic Buttons
#define ANDROID_BACK 4
@@ -592,7 +620,7 @@ void DisableCursor(void); // Disables cursor
bool IsCursorHidden(void); // Returns true if cursor is not visible
bool IsGamepadAvailable(int gamepad); // Detect if a gamepad is available
-Vector2 GetGamepadMovement(int gamepad); // Return axis movement vector for a gamepad
+float GetGamepadAxisMovement(int gamepad, int axis); // Return axis movement value for a gamepad axis
bool IsGamepadButtonPressed(int gamepad, int button); // Detect if a gamepad button has been pressed once
bool IsGamepadButtonDown(int gamepad, int button); // Detect if a gamepad button is being pressed
bool IsGamepadButtonReleased(int gamepad, int button); // Detect if a gamepad button has been released once