UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved gamepad support

Browse source 
Now it works ok also in RaspberryPi
This commit is contained in:
Ray 2016-03-16 17:52:09 +01:00
parent d6bc7b8877
commit db4585b3e2
2 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/core.c
View file

@ -127,6 +127,7 @@
#define MOUSE_SENSITIVITY 0.8f #define MOUSE_SENSITIVITY 0.8f
#define MAX_GAMEPAD_BUTTONS 11 #define MAX_GAMEPAD_BUTTONS 11
#define MAX_GAMEPAD_AXIS 5
#endif #endif
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -168,8 +169,7 @@ static bool gamepadReady = false; // Flag to know if gamepad is re
pthread_t gamepadThreadId; // Gamepad reading thread id pthread_t gamepadThreadId; // Gamepad reading thread id
int gamepadButtons[MAX_GAMEPAD_BUTTONS]; int gamepadButtons[MAX_GAMEPAD_BUTTONS];
int gamepadAxisX = 0; float gamepadAxisValues[MAX_GAMEPAD_AXIS];
int gamepadAxisY = 0;
#endif #endif
#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI)
@ -1177,30 +1177,22 @@ bool IsGamepadAvailable(int gamepad)
} }
// Return axis movement vector for a gamepad // Return axis movement vector for a gamepad
Vector2 GetGamepadMovement(int gamepad) float GetGamepadAxisMovement(int gamepad, int axis)
{ {
Vector2 vec = { 0, 0 }; float value = 0;
#if defined(PLATFORM_RPI)
if (axis < MAX_GAMEPAD_AXIS) value = gamepadAxisValues[axis];
#else
const float *axes; const float *axes;
int axisCount = 0; int axisCount = 0;
#if defined(PLATFORM_RPI)
// TODO: Get gamepad axis information
// Use gamepadAxisX, gamepadAxisY
#else
axes = glfwGetJoystickAxes(gamepad, &axisCount); axes = glfwGetJoystickAxes(gamepad, &axisCount);
#endif
if (axisCount >= 2) if (axis < axisCount) value = axes[axis];
{ #endif
vec.x = axes[0]; // Left joystick X
vec.y = axes[1]; // Left joystick Y
//vec.x = axes[2]; // Right joystick X return value;
//vec.x = axes[3]; // Right joystick Y
}
return vec;
} }
// Detect if a gamepad button has been pressed once // Detect if a gamepad button has been pressed once
@ -2484,10 +2476,6 @@ static void *GamepadThread(void *arg)
unsigned char number; // event axis/button number unsigned char number; // event axis/button number
}; };
// These values are sensible on Logitech Dual Action Rumble and Xbox360 controller
const int joystickAxisX = 0;
const int joystickAxisY = 1;
// Read gamepad event // Read gamepad event
struct js_event gamepadEvent; struct js_event gamepadEvent;
@ -2512,17 +2500,11 @@ static void *GamepadThread(void *arg)
{ {
TraceLog(DEBUG, "Gamepad axis: %i, value: %i", gamepadEvent.number, gamepadEvent.value); TraceLog(DEBUG, "Gamepad axis: %i, value: %i", gamepadEvent.number, gamepadEvent.value);
if (gamepadEvent.number == joystickAxisX) gamepadAxisX = (int)gamepadEvent.value; if (gamepadEvent.number < MAX_GAMEPAD_AXIS)
if (gamepadEvent.number == joystickAxisY) gamepadAxisY = (int)gamepadEvent.value;
/*
switch (gamepadEvent.number)
{ {
case 0: // 1st Axis X // NOTE: Scaling of gamepadEvent.value to get values between -1..1
case 1: // 1st Axis Y gamepadAxisValues[gamepadEvent.number] = (float)gamepadEvent.value/32768;
case 2: // 2st Axis X
case 3: // 2st Axis Y
} }
*/
} }
} }
} }

32
src/raylib.h
View file

@ -190,7 +190,35 @@
#define GAMEPAD_BUTTON_SELECT 9 #define GAMEPAD_BUTTON_SELECT 9
#define GAMEPAD_BUTTON_START 10 #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 // Android Physic Buttons
#define ANDROID_BACK 4 #define ANDROID_BACK 4
@ -592,7 +620,7 @@ void DisableCursor(void); // Disables cursor
bool IsCursorHidden(void); // Returns true if cursor is not visible bool IsCursorHidden(void); // Returns true if cursor is not visible
bool IsGamepadAvailable(int gamepad); // Detect if a gamepad is available 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 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 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 bool IsGamepadButtonReleased(int gamepad, int button); // Detect if a gamepad button has been released once