Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 95d50c8917 into ab2247f8f3

Browse Source
This commit is contained in:
suprstefan 2017-08-06 21:30:28 +00:00 committed by GitHub
commit 86fab635a6
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/win32_joystick.c
View File

@ -585,6 +585,25 @@ void _glfwDetectJoystickDisconnectionWin32(void)
}
}
// Applies radial deadzone to a circular input
static void applySignedRadialDeadzone(SHORT x, SHORT y, SHORT deadzone, float* dest)
{
float invShort = 1.f / 32767.f;
float nd = (float)deadzone * invShort; // normalized deadzone
float nx = (float)x * invShort; // normalized X
float ny = (float)y * invShort; // normalize Y
float magnitudeSquared = nx * nx + ny * ny;
if(magnitudeSquared >= nd * nd)
{
float magnitude = sqrtf(magnitudeSquared);
// clamp output magnitude to make sure it never goes above 1
float newMagnitude = (min(magnitude, 1.f) - nd) / (1.f - nd);
dest[0] = (nx / magnitude) * newMagnitude;
dest[1] = (ny / magnitude) * newMagnitude;
}
}
//////////////////////////////////////////////////////////////////////////
////// GLFW platform API //////
@ -702,23 +721,15 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
if (mode == _GLFW_POLL_PRESENCE)
return GLFW_TRUE;
if ((float) xis.Gamepad.sThumbLX * xis.Gamepad.sThumbLX +
(float) xis.Gamepad.sThumbLY * xis.Gamepad.sThumbLY >
(float) XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE *
XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE)
{
axes[0] = (xis.Gamepad.sThumbLX + 0.5f) / 32767.f;
axes[1] = (xis.Gamepad.sThumbLY + 0.5f) / 32767.f;
}
applySignedRadialDeadzone(xis.Gamepad.sThumbLX,
xis.Gamepad.sThumbLY,
XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE,
&axes[0]);
if ((float) xis.Gamepad.sThumbRX * xis.Gamepad.sThumbRX +
(float) xis.Gamepad.sThumbRY * xis.Gamepad.sThumbRY >
(float) XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE *
XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE)
{
axes[2] = (xis.Gamepad.sThumbRX + 0.5f) / 32767.f;
axes[3] = (xis.Gamepad.sThumbRY + 0.5f) / 32767.f;
}
applySignedRadialDeadzone(xis.Gamepad.sThumbRX,
xis.Gamepad.sThumbRY,
XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE,
&axes[2]);
if (xis.Gamepad.bLeftTrigger > XINPUT_GAMEPAD_TRIGGER_THRESHOLD)
axes[4] = xis.Gamepad.bLeftTrigger / 127.5f - 1.f;