geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "More than one binding might trigger a gamepad button" 

This reverts commit 6251504ac8aeb632cba5c9bb3502ad3628bc1bb3.

This is added CPU cost for a use case that was never supported. testcontroller will explicitly clear any previous binding, so I'm backing this out until there is a good use case.
main
Sam Lantinga 2023-07-16 03:18:51 -07:00
parent 0bcd9944a3
commit 538292c1da
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/joystick/SDL_gamepad.c
View File

@ -269,6 +269,7 @@ static void HandleJoystickButton(Uint64 timestamp, SDL_Gamepad *gamepad, int but
} else {
SDL_SendGamepadButton(timestamp, gamepad, binding->output.button, state);
}
break;
}
}
}
@ -2423,28 +2424,24 @@ Uint8 SDL_GetGamepadButton(SDL_Gamepad *gamepad, SDL_GamepadButton button)
int threshold = binding->input.axis.axis_min + (binding->input.axis.axis_max - binding->input.axis.axis_min) / 2;
if (binding->input.axis.axis_min < binding->input.axis.axis_max) {
valid_input_range = (value >= binding->input.axis.axis_min && value <= binding->input.axis.axis_max);
if (valid_input_range && value >= threshold) {
retval = SDL_PRESSED;
if (valid_input_range) {
retval = (value >= threshold) ? SDL_PRESSED : SDL_RELEASED;
break;
}
} else {
valid_input_range = (value >= binding->input.axis.axis_max && value <= binding->input.axis.axis_min);
if (valid_input_range && value <= threshold) {
retval = SDL_PRESSED;
if (valid_input_range) {
retval = (value <= threshold) ? SDL_PRESSED : SDL_RELEASED;
break;
}
}
} else if (binding->inputType == SDL_GAMEPAD_BINDTYPE_BUTTON) {
if (SDL_GetJoystickButton(gamepad->joystick, binding->input.button)) {
retval = SDL_TRUE;
break;
}
retval = SDL_GetJoystickButton(gamepad->joystick, binding->input.button);
break;
} else if (binding->inputType == SDL_GAMEPAD_BINDTYPE_HAT) {
int hat_mask = SDL_GetJoystickHat(gamepad->joystick, binding->input.hat.hat);
if (hat_mask & binding->input.hat.hat_mask) {
retval = SDL_TRUE;
break;
}
retval = (hat_mask & binding->input.hat.hat_mask) ? SDL_PRESSED : SDL_RELEASED;
break;
}
}
}