Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed joystick POV values not being set properly for devices that are accessed via DirectInput.

Browse Source
This commit is contained in:
binary1248 2020-11-29 13:39:33 +01:00 committed by Lukas Dürrenberger
parent 4cbb34ddb4
commit a262636590
1 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/SFML/Window/Win32/JoystickImpl.cpp
View File

@ -907,7 +907,7 @@ JoystickState JoystickImpl::updateDInputBuffered()
{ {
if (m_axes[j] == events[i].dwOfs) if (m_axes[j] == events[i].dwOfs)
{ {
if (j == Joystick::PovX) if ((j == Joystick::PovX) || (j == Joystick::PovY))
{ {
unsigned short value = LOWORD(events[i].dwData); unsigned short value = LOWORD(events[i].dwData);
@ -915,26 +915,13 @@ JoystickState JoystickImpl::updateDInputBuffered()
{ {
float angle = (static_cast<float>(value)) * 3.141592654f / DI_DEGREES / 180.f; float angle = (static_cast<float>(value)) * 3.141592654f / DI_DEGREES / 180.f;
m_state.axes[j] = std::sin(angle) * 100.f; m_state.axes[Joystick::PovX] = std::sin(angle) * 100.f;
m_state.axes[Joystick::PovY] = std::cos(angle) * 100.f;
} }
else else
{ {
m_state.axes[j] = 0; m_state.axes[Joystick::PovX] = 0.f;
} m_state.axes[Joystick::PovY] = 0.f;
}
else if (j == Joystick::PovY)
{
unsigned short value = LOWORD(events[i].dwData);
if (value != 0xFFFF)
{
float angle = (static_cast<float>(value)) * 3.141592654f / DI_DEGREES / 180.f;
m_state.axes[j] = std::cos(angle) * 100.f;
}
else
{
m_state.axes[j] = 0.f;
} }
} }
else else
@ -1009,7 +996,7 @@ JoystickState JoystickImpl::updateDInputPolled()
{ {
if (m_axes[i] != -1) if (m_axes[i] != -1)
{ {
if (i == Joystick::PovX) if ((i == Joystick::PovX) || (i == Joystick::PovY))
{ {
unsigned short value = LOWORD(*reinterpret_cast<const DWORD*>(reinterpret_cast<const char*>(&joystate) + m_axes[i])); unsigned short value = LOWORD(*reinterpret_cast<const DWORD*>(reinterpret_cast<const char*>(&joystate) + m_axes[i]));
@ -1017,26 +1004,13 @@ JoystickState JoystickImpl::updateDInputPolled()
{ {
float angle = (static_cast<float>(value)) * 3.141592654f / DI_DEGREES / 180.f; float angle = (static_cast<float>(value)) * 3.141592654f / DI_DEGREES / 180.f;
state.axes[i] = std::sin(angle) * 100.f; state.axes[Joystick::PovX] = std::sin(angle) * 100.f;
state.axes[Joystick::PovY] = std::cos(angle) * 100.f;
} }
else else
{ {
state.axes[i] = 0; state.axes[Joystick::PovX] = 0.f;
} state.axes[Joystick::PovY] = 0.f;
}
else if (i == Joystick::PovY)
{
unsigned short value = LOWORD(*reinterpret_cast<const DWORD*>(reinterpret_cast<const char*>(&joystate) + m_axes[i]));
if (value != 0xFFFF)
{
float angle = (static_cast<float>(value)) * 3.141592654f / DI_DEGREES / 180.f;
state.axes[i] = std::cos(angle) * 100.f;
}
else
{
state.axes[i] = 0.f;
} }
} }
else else