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

fixed bug related to axes vs buttons

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-03-31 20:33:44 +00:00
parent 4eadddd8ab
commit 43ed6ea083
3 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/device_manager.cpp
View File

@ -50,7 +50,7 @@ bool DeviceManager::mapInputToPlayerAndAction( Input::InputType type, int id0, i
// std::cout << "stick motion, ID=" <<id0 << " axis=" << id1 << " value=" << value << std::endl; // std::cout << "stick motion, ID=" <<id0 << " axis=" << id1 << " value=" << value << std::endl;
for(unsigned int n=0; n<m_gamepad_amount; n++) for(unsigned int n=0; n<m_gamepad_amount; n++)
{ {
if( /*m_gamepads[n].m_index == id0 &&*/ m_gamepads[n].hasBinding(id1 /* axis */, value, *player, action /* out */) ) if(m_gamepads[n].hasBinding(type, id1 /* axis or button */, value, *player, action /* out */) )
return true; return true;
} }
return false; return false;

116
src/input/input_device.cpp
View File

@ -1,4 +1,5 @@
#include "input/input.hpp"
#include "input/input_device.hpp" #include "input/input_device.hpp"
#include "race_manager.hpp" #include "race_manager.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
@ -264,68 +265,83 @@ void GamePadDevice::resetAxisDirection(const int axis, Input::AxisDirection dire
} }
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
bool GamePadDevice::hasBinding(const int axis, const int value, const int player, PlayerAction* action /* out */) bool GamePadDevice::hasBinding(Input::InputType type, const int id, const int value, const int player, PlayerAction* action /* out */)
{ {
// going to negative from positive if(type == Input::IT_STICKMOTION)
if (value < 0 && m_prevAxisDirections[axis] == Input::AD_POSITIVE)
{ {
// set positive axis to 0 // going to negative from positive
resetAxisDirection(axis, Input::AD_POSITIVE, player); if (value < 0 && m_prevAxisDirections[id] == Input::AD_POSITIVE)
}
// going to positive from negative
else if (value > 0 && m_prevAxisDirections[axis] == Input::AD_NEGATIVE)
{
// set negative axis to 0
resetAxisDirection(axis, Input::AD_NEGATIVE, player);
}
if(value > 0) m_prevAxisDirections[axis] = Input::AD_POSITIVE;
else if(value < 0) m_prevAxisDirections[axis] = Input::AD_NEGATIVE;
// check if within deadzone
if(value > -m_deadzone && value < m_deadzone)
{
// Axis stands still: This is reported once for digital axes and
// can be called multipled times for analog ones. Uses the
// previous direction in which the axis was triggered to
// determine which one has to be brought into the released
// state. This allows us to regard two directions of an axis
// as completely independent input variants (as if they where
// two buttons).
if(m_prevAxisDirections[axis] == Input::AD_NEGATIVE)
{ {
// set negative axis to 0 // set positive id to 0
resetAxisDirection(axis, Input::AD_NEGATIVE, player); resetAxisDirection(id, Input::AD_POSITIVE, player);
} }
else if(m_prevAxisDirections[axis] == Input::AD_POSITIVE) // going to positive from negative
else if (value > 0 && m_prevAxisDirections[id] == Input::AD_NEGATIVE)
{ {
// set positive axis to 0 // set negative id to 0
resetAxisDirection(axis, Input::AD_POSITIVE, player); resetAxisDirection(id, Input::AD_NEGATIVE, player);
} }
m_prevAxisDirections[axis] = Input::AD_NEUTRAL;
return false; if(value > 0) m_prevAxisDirections[id] = Input::AD_POSITIVE;
} else if(value < 0) m_prevAxisDirections[id] = Input::AD_NEGATIVE;
// find corresponding action and return it // check if within deadzone
for(int n=0; n<PA_COUNT; n++) if(value > -m_deadzone && value < m_deadzone)
{
if(m_bindings[n].id == axis)
{ {
if(m_bindings[n].dir == Input::AD_NEGATIVE && value < 0) // Axis stands still: This is reported once for digital axes and
// can be called multipled times for analog ones. Uses the
// previous direction in which the id was triggered to
// determine which one has to be brought into the released
// state. This allows us to regard two directions of an id
// as completely independent input variants (as if they where
// two buttons).
if(m_prevAxisDirections[id] == Input::AD_NEGATIVE)
{
// set negative id to 0
resetAxisDirection(id, Input::AD_NEGATIVE, player);
}
else if(m_prevAxisDirections[id] == Input::AD_POSITIVE)
{
// set positive id to 0
resetAxisDirection(id, Input::AD_POSITIVE, player);
}
m_prevAxisDirections[id] = Input::AD_NEUTRAL;
return false;
}
// find corresponding action and return it
for(int n=0; n<PA_COUNT; n++)
{
if(m_bindings[n].type == type && m_bindings[n].id == id)
{
if(m_bindings[n].dir == Input::AD_NEGATIVE && value < 0)
{
*action = (PlayerAction)n;
return true;
}
else if(m_bindings[n].dir == Input::AD_POSITIVE && value > 0)
{
*action = (PlayerAction)n;
return true;
}
}
}// next device
}
else if(type == Input::IT_STICKBUTTON)
{
// find corresponding action and return it
for(int n=0; n<PA_COUNT; n++)
{
if(m_bindings[n].type == type && m_bindings[n].id == id)
{ {
*action = (PlayerAction)n; *action = (PlayerAction)n;
return true; return true;
} }
else if(m_bindings[n].dir == Input::AD_POSITIVE && value > 0) }// next device
{ }
*action = (PlayerAction)n;
return true;
}
}
}// next device
return false; return false;
} }

2
src/input/input_device.hpp
View File

@ -66,7 +66,7 @@ public:
/** checks if this key belongs to this belongs. if yes, sets action and returns true; otherwise returns false. /** checks if this key belongs to this belongs. if yes, sets action and returns true; otherwise returns false.
The 'player' id passed is simply to know where to send 'axis reset's when necessary*/ The 'player' id passed is simply to know where to send 'axis reset's when necessary*/
bool hasBinding(const int axis, const int value, const int player, PlayerAction* action /* out */); bool hasBinding(Input::InputType type, const int id, const int value, const int player, PlayerAction* action /* out */);
void open(const int sdl_id); void open(const int sdl_id);