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

Support multiple joystick buttons bound to the same gamepad button

Browse Source 
(cherry picked from commit ed943318e2)
This commit is contained in:
Sam Lantinga committed 2024-11-05 11:50:18 -08:00
1 parent 67b537cef4
commit 74ff82f4a2
1 file changed
+4 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/joystick/SDL_gamecontroller.c
+4 -8
View File
@@ -2364,23 +2364,19 @@ Uint8 SDL_GameControllerGetButton(SDL_GameController *gamecontroller, SDL_GameCo
if (binding->input.axis.axis_min < binding->input.axis.axis_max) { 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); valid_input_range = (value >= binding->input.axis.axis_min && value <= binding->input.axis.axis_max);
if (valid_input_range) { if (valid_input_range) {
retval = (value >= threshold) ? SDL_PRESSED : SDL_RELEASED; retval |= (value >= threshold) ? SDL_PRESSED : SDL_RELEASED;
break;
} }
} else { } else {
valid_input_range = (value >= binding->input.axis.axis_max && value <= binding->input.axis.axis_min); valid_input_range = (value >= binding->input.axis.axis_max && value <= binding->input.axis.axis_min);
if (valid_input_range) { if (valid_input_range) {
retval = (value <= threshold) ? SDL_PRESSED : SDL_RELEASED; retval |= (value <= threshold) ? SDL_PRESSED : SDL_RELEASED;
break;
} }
} }
} else if (binding->inputType == SDL_CONTROLLER_BINDTYPE_BUTTON) { } else if (binding->inputType == SDL_CONTROLLER_BINDTYPE_BUTTON) {
retval = SDL_JoystickGetButton(gamecontroller->joystick, binding->input.button); retval |= SDL_JoystickGetButton(gamecontroller->joystick, binding->input.button);
break;
} else if (binding->inputType == SDL_CONTROLLER_BINDTYPE_HAT) { } else if (binding->inputType == SDL_CONTROLLER_BINDTYPE_HAT) {
int hat_mask = SDL_JoystickGetHat(gamecontroller->joystick, binding->input.hat.hat); int hat_mask = SDL_JoystickGetHat(gamecontroller->joystick, binding->input.hat.hat);
retval = (hat_mask & binding->input.hat.hat_mask) ? SDL_PRESSED : SDL_RELEASED; retval |= (hat_mask & binding->input.hat.hat_mask) ? SDL_PRESSED : SDL_RELEASED;
break;
} }
} }
} }