Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from RetroPie/revert-58-xpad_trigger

Browse source 
Revert "workaround for analogue trigger configuration - eg with xpad."
This commit is contained in:
Jools Wills 2016-08-14 20:25:12 +01:00 committed by GitHub
parent 684ab17e95 3eba889bdf
commit 3354b8f1b1
2 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
es-core/src/InputManager.cpp
View file

@ -89,14 +89,7 @@ void InputManager::addJoystickByDeviceIndex(int id)
// set up the prevAxisValues // set up the prevAxisValues
int numAxes = SDL_JoystickNumAxes(joy); int numAxes = SDL_JoystickNumAxes(joy);
mPrevAxisValues[joyId] = new int[numAxes]; mPrevAxisValues[joyId] = new int[numAxes];
mInitAxisValues[joyId] = new int[numAxes]; std::fill(mPrevAxisValues[joyId], mPrevAxisValues[joyId] + numAxes, 0); //initialize array to 0
int axis;
for (int i = 0; i< numAxes; i++) {
axis = SDL_JoystickGetAxis(joy, i);
mInitAxisValues[joyId][i] = axis;
mPrevAxisValues[joyId][i] = axis;
}
} }
void InputManager::removeJoystickByJoystickID(SDL_JoystickID joyId) void InputManager::removeJoystickByJoystickID(SDL_JoystickID joyId)
@ -177,28 +170,21 @@ InputConfig* InputManager::getInputConfigByDevice(int device)
bool InputManager::parseEvent(const SDL_Event& ev, Window* window) bool InputManager::parseEvent(const SDL_Event& ev, Window* window)
{ {
bool causedEvent = false; bool causedEvent = false;
int axis;
int deadzone = DEADZONE;
switch(ev.type) switch(ev.type)
{ {
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:
axis = ev.jaxis.value;
if (mInitAxisValues[ev.jaxis.which][ev.jaxis.axis] == -32768)
{
deadzone /= 2;
axis = (axis + 32767) / 2;
}
//if it switched boundaries //if it switched boundaries
if((abs(axis) > deadzone) != (abs(mPrevAxisValues[ev.jaxis.which][ev.jaxis.axis]) > deadzone)) if((abs(ev.jaxis.value) > DEADZONE) != (abs(mPrevAxisValues[ev.jaxis.which][ev.jaxis.axis]) > DEADZONE))
{ {
int normValue; int normValue;
if(abs(axis) <= deadzone) if(abs(ev.jaxis.value) <= DEADZONE)
normValue = 0; normValue = 0;
else else
if(axis > 0) if(ev.jaxis.value > 0)
normValue = 1; normValue = 1;
else else
normValue = -1; normValue = -1;
window->input(getInputConfigByDevice(ev.jaxis.which), Input(ev.jaxis.which, TYPE_AXIS, ev.jaxis.axis, normValue, false)); window->input(getInputConfigByDevice(ev.jaxis.which), Input(ev.jaxis.which, TYPE_AXIS, ev.jaxis.axis, normValue, false));
causedEvent = true; causedEvent = true;
} }

1
es-core/src/InputManager.h
View file

@ -26,7 +26,6 @@ private:
InputConfig* mKeyboardInputConfig; InputConfig* mKeyboardInputConfig;
std::map<SDL_JoystickID, int*> mPrevAxisValues; std::map<SDL_JoystickID, int*> mPrevAxisValues;
std::map<SDL_JoystickID, int*> mInitAxisValues;
bool initialized() const; bool initialized() const;