ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Taking inspiration from Grumbel's bug report, ignore all gamepad axes that always remain on their original value (even if this original value is maximum). This should fix several issues with bogus axes (especially on Linux) and as far as I can see doesn't have any ill effect

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7498 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-01-23 02:35:48 +00:00
parent 004d877365
commit 7b1bb38b9f
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/input/input_device.cpp
View File

@ -69,7 +69,8 @@ bool KeyboardDevice::processAndMapInput(const int id, InputManager::InputDriverM
#endif
GamePadDevice::GamePadDevice(const int irrIndex, const std::string name, const int axis_count, const int btnAmount, GamepadConfig *configuration)
GamePadDevice::GamePadDevice(const int irrIndex, const std::string name, const int axis_count,
const int btnAmount, GamepadConfig *configuration)
{
m_type = DT_GAMEPAD;
m_deadzone = DEADZONE_JOYSTICK;
@ -77,12 +78,18 @@ GamePadDevice::GamePadDevice(const int irrIndex, const std::string name, const i
m_configuration = configuration;
m_axis_count = axis_count;
m_prevAxisDirections = new Input::AxisDirection[axis_count];
m_prevAxisValue = new int[axis_count];
m_axis_ok = new bool[axis_count];
m_button_count = btnAmount;
m_index = irrIndex;
m_index = irrIndex;
m_name = name;
for (int i = 0; i < axis_count; i++)
{
m_prevAxisDirections[i] = Input::AD_NEUTRAL;
m_prevAxisValue[i] = -1;
m_axis_ok[i] = false;
}
for(int n=0; n<SEvent::SJoystickEvent::NUMBER_OF_BUTTONS; n++)
m_buttonPressed[n] = false;
@ -94,6 +101,7 @@ GamePadDevice::GamePadDevice(const int irrIndex, const std::string name, const i
GamePadDevice::~GamePadDevice()
{
delete[] m_prevAxisDirections;
delete[] m_prevAxisValue;
// FIXME - any need to close devices?
} // ~GamePadDevice
@ -169,9 +177,23 @@ bool GamePadDevice::processAndMapInput(Input::InputType type, const int id, cons
}
}
if(value > 0) m_prevAxisDirections[id] = Input::AD_POSITIVE;
if (value > 0) m_prevAxisDirections[id] = Input::AD_POSITIVE;
else if(value < 0) m_prevAxisDirections[id] = Input::AD_NEGATIVE;
if (!m_axis_ok[id])
{
if (m_prevAxisValue[id] == -1)
{
// first value we get from this axis
m_prevAxisValue[id] = value;
}
else if (m_prevAxisValue[id] != value)
{
// second different value we get from this axis, consider it OK
m_axis_ok[id] = true;
}
}
// check if within deadzone
if(value > -m_deadzone && value < m_deadzone && player != NULL)
{
@ -199,6 +221,9 @@ bool GamePadDevice::processAndMapInput(Input::InputType type, const int id, cons
}
}
// If axis did not send proper values yet, ignore it.
if (!m_axis_ok[id]) return false;
if (m_configuration != NULL)
{
if (mode == InputManager::INGAME)

11
src/input/input_device.hpp
View File

@ -80,6 +80,17 @@ class GamePadDevice : public InputDevice
public:
Input::AxisDirection *m_prevAxisDirections;
/** used to determine if an axis is valid; an axis is considered valid when at least 2 different
* values are read from this axis (if an axis keeps on sending the exact same value continuously,
* chances are that it's not meant by the user - for instance some gamepads have hats or analog
* switches that get reported as axis, we even had a report that on linux some hard disks may be
* reported as gamepads with uninteresting axis values)
*/
int *m_prevAxisValue;
/** \see m_prevAxisValue */
bool *m_axis_ok;
int m_deadzone;
int m_index;
int m_axis_count;