ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7680 from jordan-woyak/dinput-axis-range 

DirectInput: Use more than 8 bits of precision on axis inputs.
This commit is contained in:
Léo Lam 2019-01-16 18:52:11 +01:00 committed by GitHub
parent 634ef78a26 a7c45fb49e
commit b2de98cad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <limits>
#include <map> #include <map>
#include <sstream> #include <sstream>
@ -121,13 +122,13 @@ Joystick::Joystick(/*const LPCDIDEVICEINSTANCE lpddi, */ const LPDIRECTINPUTDEVI
for (unsigned int offset = 0; offset < DIJOFS_BUTTON(0) / sizeof(LONG); ++offset) for (unsigned int offset = 0; offset < DIJOFS_BUTTON(0) / sizeof(LONG); ++offset)
{ {
range.diph.dwObj = offset * sizeof(LONG); range.diph.dwObj = offset * sizeof(LONG);
// try to set some nice power of 2 values (128) to match the GameCube controls // Try to set a range with 16 bits of precision:
range.lMin = -(1 << 7); range.lMin = std::numeric_limits<s16>::min();
range.lMax = (1 << 7); range.lMax = std::numeric_limits<s16>::max();
m_device->SetProperty(DIPROP_RANGE, &range.diph); m_device->SetProperty(DIPROP_RANGE, &range.diph);
// but I guess not all devices support setting range // Not all devices support setting DIPROP_RANGE so we must GetProperty right back.
// so I getproperty right afterward incase it didn't set. // This also checks that the axis is present.
// This also checks that the axis is present // Note: Even though not all devices support setting DIPROP_RANGE, some require it.
if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph))) if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph)))
{ {
const LONG base = (range.lMin + range.lMax) / 2; const LONG base = (range.lMin + range.lMax) / 2;