Skip to content

W
wine-winehq
Commit 79b5883f authored by Bruno Jesus's avatar Bruno Jesus Committed by Alexandre Julliard
Browse files
Options

dinput: Simplify cartesian and fix polar direction calculations.

Based on formulas by Elias Vanderstuyft. Signed-off-by: 's avatarBruno Jesus <00cpxxx@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d0070935
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 17 deletions
dlls/dinput/effect_linuxinput.c
View file @ 79b5883f
......@@ -519,23 +519,32 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
/* one-axis effects must use cartesian coords */
return DIERR_INVALIDPARAM;
}
} else { /* two axes */
if (peff->dwFlags & DIEFF_CARTESIAN) {
LONG x, y;
if (This->first_axis_is_x) {
x = peff->rglDirection[0];
y = peff->rglDirection[1];
} else {
x = peff->rglDirection[1];
y = peff->rglDirection[0];
}
This->effect.direction = (int)((3 * M_PI / 2 - atan2(y, x)) * -0x7FFF / M_PI);
} else {
/* Polar and spherical are the same for 2 axes */
/* Precision is important here, so we do double math with exact constants */
This->effect.direction = (int)(((double)peff->rglDirection[0] - 90) / 35999) * 0x7FFF;
}
}
}
/* two axes */
else
{
if (peff->dwFlags & DIEFF_CARTESIAN)
{
LONG x, y;
if (This->first_axis_is_x)
{
x = peff->rglDirection[0];
y = peff->rglDirection[1];
}
else
{
x = peff->rglDirection[1];
y = peff->rglDirection[0];
}
This->effect.direction = (unsigned int)((M_PI / 2 + atan2(y, x)) * 0x8000 / M_PI);
}
else
{
/* Polar and spherical are the same for 2 axes */
/* Precision is important here, so we do double math with exact constants */
This->effect.direction = (unsigned int)(((double)peff->rglDirection[0] / 18000) * 0x8000);
}
}
}
if (dwFlags & DIEP_DURATION)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment