Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant OS X joystick polling

Browse Source 
Closes #729.
This commit is contained in:
IntellectualKitty 2016-03-23 16:11:34 -06:00 committed by Camilla Berglund
parent 13e2ad2840
commit ae4ece840d
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/cocoa_joystick.m
View File

@ -192,9 +192,35 @@ static void removeJoystick(_GLFWjoydeviceNS* joystick)
memset(joystick, 0, sizeof(_GLFWjoydeviceNS)); memset(joystick, 0, sizeof(_GLFWjoydeviceNS));
} }
// Polls for joystick events and updates GLFW state // Polls for joystick axis events and updates GLFW state
// //
static GLFWbool pollJoystickEvents(_GLFWjoydeviceNS* joystick) static GLFWbool pollJoystickAxisEvents(_GLFWjoydeviceNS* joystick)
{
CFIndex i;
if (!joystick->present)
return GLFW_FALSE;
for (i = 0; i < CFArrayGetCount(joystick->axisElements); i++)
{
_GLFWjoyelementNS* axis = (_GLFWjoyelementNS*)
CFArrayGetValueAtIndex(joystick->axisElements, i);
long value = getElementValue(joystick, axis);
long readScale = axis->maxReport - axis->minReport;
if (readScale == 0)
joystick->axes[i] = value;
else
joystick->axes[i] = (2.f * (value - axis->minReport) / readScale) - 1.f;
}
return GLFW_TRUE;
}
// Polls for joystick button events and updates GLFW state
//
static GLFWbool pollJoystickButtonEvents(_GLFWjoydeviceNS* joystick)
{ {
CFIndex i; CFIndex i;
int buttonIndex = 0; int buttonIndex = 0;
@ -213,20 +239,6 @@ static GLFWbool pollJoystickEvents(_GLFWjoydeviceNS* joystick)
joystick->buttons[buttonIndex++] = GLFW_RELEASE; joystick->buttons[buttonIndex++] = GLFW_RELEASE;
} }
for (i = 0; i < CFArrayGetCount(joystick->axisElements); i++)
{
_GLFWjoyelementNS* axis = (_GLFWjoyelementNS*)
CFArrayGetValueAtIndex(joystick->axisElements, i);
long value = getElementValue(joystick, axis);
long readScale = axis->maxReport - axis->minReport;
if (readScale == 0)
joystick->axes[i] = value;
else
joystick->axes[i] = (2.f * (value - axis->minReport) / readScale) - 1.f;
}
for (i = 0; i < CFArrayGetCount(joystick->hatElements); i++) for (i = 0; i < CFArrayGetCount(joystick->hatElements); i++)
{ {
_GLFWjoyelementNS* hat = (_GLFWjoyelementNS*) _GLFWjoyelementNS* hat = (_GLFWjoyelementNS*)
@ -469,13 +481,13 @@ void _glfwTerminateJoysticksNS(void)
int _glfwPlatformJoystickPresent(int joy) int _glfwPlatformJoystickPresent(int joy)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy;
return pollJoystickEvents(joystick); return joystick->present ? GLFW_TRUE : GLFW_FALSE;
} }
const float* _glfwPlatformGetJoystickAxes(int joy, int* count) const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy;
if (!pollJoystickEvents(joystick)) if (!pollJoystickAxisEvents(joystick))
return NULL; return NULL;
*count = (int) CFArrayGetCount(joystick->axisElements); *count = (int) CFArrayGetCount(joystick->axisElements);
@ -485,7 +497,7 @@ const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count) const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy;
if (!pollJoystickEvents(joystick)) if (!pollJoystickButtonEvents(joystick))
return NULL; return NULL;
*count = (int) CFArrayGetCount(joystick->buttonElements) + *count = (int) CFArrayGetCount(joystick->buttonElements) +
@ -496,9 +508,9 @@ const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
const char* _glfwPlatformGetJoystickName(int joy) const char* _glfwPlatformGetJoystickName(int joy)
{ {
_GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy; _GLFWjoydeviceNS* joystick = _glfw.ns_js.devices + joy;
if (!pollJoystickEvents(joystick)) if (joystick->present)
return joystick->name;
else
return NULL; return NULL;
return joystick->name;
} }