This is dumb...

This commit is contained in:
Reece Mackie 2019-04-28 16:08:07 +01:00
parent e69688437a
commit 86eba24970

View file

@ -627,21 +627,21 @@ typedef enum
// This is normally ABXY/Circle, Triangle, Square, Cross. No support for 6 button controllers though.. // This is normally ABXY/Circle, Triangle, Square, Cross. No support for 6 button controllers though..
GAMEPAD_BUTTON_LEFT_FACE_UP, GAMEPAD_BUTTON_LEFT_FACE_UP,
GAMEPAD_BUTTON_LEFT_FACE_RIGHT, GAMEPAD_BUTTON_LEFT_FACE_RIGHT,
GAMEPAD_BUTTON_LEFT_FACE_DOWN, GAMEPAD_BUTTON_LEFT_FACE_DOWN,
GAMEPAD_BUTTON_LEFT_FACE_LEFT, GAMEPAD_BUTTON_LEFT_FACE_LEFT,
// This is normally a DPAD // This is normally a DPAD
GAMEPAD_BUTTON_RIGHT_FACE_UP, GAMEPAD_BUTTON_RIGHT_FACE_UP,
GAMEPAD_BUTTON_RIGHT_FACE_RIGHT, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT,
GAMEPAD_BUTTON_RIGHT_FACE_DOWN, GAMEPAD_BUTTON_RIGHT_FACE_DOWN,
GAMEPAD_BUTTON_RIGHT_FACE_LEFT, GAMEPAD_BUTTON_RIGHT_FACE_LEFT,
// Triggers // Triggers
GAMEPAD_BUTTON_LEFT_TRIGGER_1, GAMEPAD_BUTTON_LEFT_TRIGGER_1,
GAMEPAD_BUTTON_LEFT_TRIGGER_2, GAMEPAD_BUTTON_LEFT_TRIGGER_2,
GAMEPAD_BUTTON_RIGHT_TRIGGER_1, GAMEPAD_BUTTON_RIGHT_TRIGGER_1,
GAMEPAD_BUTTON_RIGHT_TRIGGER_2, GAMEPAD_BUTTON_RIGHT_TRIGGER_2,
// These are buttons in the center of the gamepad // These are buttons in the center of the gamepad
GAMEPAD_BUTTON_MIDDLE_LEFT, //PS3 Select GAMEPAD_BUTTON_MIDDLE_LEFT, //PS3 Select
@ -650,25 +650,25 @@ typedef enum
// These are the joystick press in buttons // These are the joystick press in buttons
GAMEPAD_BUTTON_LEFT_THUMB, GAMEPAD_BUTTON_LEFT_THUMB,
GAMEPAD_BUTTON_RIGHT_THUMB GAMEPAD_BUTTON_RIGHT_THUMB
} GamepadButton; } GamepadButton;
typedef enum typedef enum
{ {
// This is here just for error checking // This is here just for error checking
GAMEPAD_AXIS_UNKNOWN = 0, GAMEPAD_AXIS_UNKNOWN = 0,
// Left stick // Left stick
GAMEPAD_AXIS_LEFT_X, GAMEPAD_AXIS_LEFT_X,
GAMEPAD_AXIS_LEFT_Y, GAMEPAD_AXIS_LEFT_Y,
// Right stick // Right stick
GAMEPAD_AXIS_RIGHT_X, GAMEPAD_AXIS_RIGHT_X,
GAMEPAD_AXIS_RIGHT_Y, GAMEPAD_AXIS_RIGHT_Y,
// Pressure levels for the back triggers // Pressure levels for the back triggers
GAMEPAD_AXIS_LEFT_TRIGGER, // [1..-1] (pressure-level) GAMEPAD_AXIS_LEFT_TRIGGER, // [1..-1] (pressure-level)
GAMEPAD_AXIS_RIGHT_TRIGGER // [1..-1] (pressure-level) GAMEPAD_AXIS_RIGHT_TRIGGER // [1..-1] (pressure-level)
} GamepadAxis; } GamepadAxis;
// Shader location point type // Shader location point type