Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support 'squaring the circle' for analog sticks (#429, #1237, PR #1242) 

Using @audetto's transformation.
This commit is contained in:
TomCh 2023-06-20 04:29:34 +09:00 committed by GitHub
parent eead359a85
commit cac30b31ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/Joystick.cpp
View File

@ -703,10 +703,18 @@ void JoyResetPosition(ULONG nExecutedCycles)
{
CpuCalcCycles(nExecutedCycles);
if(joyinfo[joytype[0]] == DEVICE_JOYSTICK)
bool isJoystick[2] = { false, false };
if (joyinfo[joytype[0]] == DEVICE_JOYSTICK)
{
CheckJoystick0();
if((joyinfo[joytype[1]] == DEVICE_JOYSTICK) || (joyinfo[joytype[1]] == DEVICE_JOYSTICK_THUMBSTICK2))
isJoystick[0] = true;
}
if (joyinfo[joytype[1]] == DEVICE_JOYSTICK || joyinfo[joytype[1]] == DEVICE_JOYSTICK_THUMBSTICK2)
{
CheckJoystick1();
isJoystick[1] = true;
}
// If any of the timers are still running then strobe has no effect (GH#985)
for (UINT pdl = 0; pdl < 4; pdl++)
@ -717,6 +725,28 @@ void JoyResetPosition(ULONG nExecutedCycles)
const UINT joyNum = (pdl & 2) ? 1 : 0;
UINT pdlPos = (pdl & 1) ? ypos[joyNum] : xpos[joyNum];
// "Square the circle" for controllers with analog sticks (but compatible with digital D-pads too) - GH#429
if (isJoystick[joyNum])
{
// Convert to unit circle, centred at (0,0)
const double x[2] = { ((double)xpos[joyNum]) / (0.5 * 255) - 1.0, ((double)ypos[joyNum]) / (0.5 * 255) - 1.0};
double axis = x[pdl & 1];
if (x[0] * x[1] != 0.0)
{
// rescale the circle to the square
const double ratio2 = (x[1] * x[1]) / (x[0] * x[0]);
const double c = min(ratio2, 1.0 / ratio2);
const double coeff = sqrt(1.0 + c);
axis *= coeff;
}
if (axis < -1.0) axis = -1.0;
else if (axis > 1.0) axis = 1.0;
pdlPos = static_cast<int>((axis + 1.0) * 0.5 * 255);
}
// This is from KEGS. It helps games like Championship Lode Runner, Boulderdash & Learning with Leeper(GH#1128)
if (pdlPos >= 255)
pdlPos = 287;