MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added enum count entries to KeyboardKey, MouseButton, and GamepadButton

Browse Source 
This allows iterating over all possible inputs from the keyboard, mouse, or gamepad more easily without lots of copy pasting. The `MOUSE_BUTTON_NUM_BUTTONS`, `GAMEPAD_BUTTON_NUM_BUTTONS`, and `GAMEPAD_AXIS_NUM_AXIS` entries are robust to the potential future addition of more entries in these enums because they are placed at the end of the enum declaration.  For the `KeyboardKey` enum I used the value of 512. This enum is out of order and so simply placing the `KEY_NUM_KEYS` enum at the end wouldn't be robust to change. Instead I used the value of the `#define MAX_KEYBOARD_KEYS = 512` found in rcore.c used for the length of the internal arrays that store the Keyboard state.
This commit is contained in:
Andidy 2021-11-10 21:36:23 -06:00
parent 91135c8799
commit 357aa54f37
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/raylib.h
View File

@ -631,7 +631,8 @@ typedef enum {
KEY_BACK = 4, // Key: Android back button
KEY_MENU = 82, // Key: Android menu button
KEY_VOLUME_UP = 24, // Key: Android volume up button
KEY_VOLUME_DOWN = 25 // Key: Android volume down button
KEY_VOLUME_DOWN = 25, // Key: Android volume down button
KEY_NUM_KEYS = 512 // Key: Number of keys
} KeyboardKey;
// Add backwards compatibility support for deprecated names
@ -648,6 +649,7 @@ typedef enum {
MOUSE_BUTTON_EXTRA = 4, // Mouse button extra (advanced mouse device)
MOUSE_BUTTON_FORWARD = 5, // Mouse button fordward (advanced mouse device)
MOUSE_BUTTON_BACK = 6, // Mouse button back (advanced mouse device)
MOUSE_BUTTON_NUM_BUTTONS // Number of Mouse Buttons
} MouseButton;
// Mouse cursor
@ -684,7 +686,8 @@ typedef enum {
GAMEPAD_BUTTON_MIDDLE, // Gamepad center buttons, middle one (i.e. PS3: PS, Xbox: XBOX)
GAMEPAD_BUTTON_MIDDLE_RIGHT, // Gamepad center buttons, right one (i.e. PS3: Start)
GAMEPAD_BUTTON_LEFT_THUMB, // Gamepad joystick pressed button left
GAMEPAD_BUTTON_RIGHT_THUMB // Gamepad joystick pressed button right
GAMEPAD_BUTTON_RIGHT_THUMB, // Gamepad joystick pressed button right
GAMEPAD_BUTTON_NUM_BUTTONS // Number of Gamepad Buttons
} GamepadButton;
// Gamepad axis
@ -694,7 +697,8 @@ typedef enum {
GAMEPAD_AXIS_RIGHT_X = 2, // Gamepad right stick X axis
GAMEPAD_AXIS_RIGHT_Y = 3, // Gamepad right stick Y axis
GAMEPAD_AXIS_LEFT_TRIGGER = 4, // Gamepad back trigger left, pressure level: [1..-1]
GAMEPAD_AXIS_RIGHT_TRIGGER = 5 // Gamepad back trigger right, pressure level: [1..-1]
GAMEPAD_AXIS_RIGHT_TRIGGER = 5, // Gamepad back trigger right, pressure level: [1..-1]
GAMEPAD_AXIS_NUM_AXIS // Number of Gamepad axis
} GamepadAxis;
// Material map index