encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve single joycons mode (#16) 

* Set NpadJoyHoldType_Horizontal for single joycons

* Improve single joycons mode
This commit is contained in:
R-YaTian 2022-05-15 21:22:53 +08:00 committed by GitHub
parent 0705288edd
commit 988d15cfe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/joystick/switch/SDL_sysjoystick.c
View File

@ -84,12 +84,14 @@ static const HidNpadButton pad_mapping_right_joy[] = {
BIT(31), BIT(31), BIT(31), BIT(31) BIT(31), BIT(31), BIT(31), BIT(31)
}; };
static void SWITCH_ShowControllerSupport(void) { static void SWITCH_UpdateControllerSupport(bool handheld) {
if (!handheld) {
HidLaControllerSupportResultInfo info; HidLaControllerSupportResultInfo info;
HidLaControllerSupportArg args; HidLaControllerSupportArg args;
hidLaCreateControllerSupportArg(&args); hidLaCreateControllerSupportArg(&args);
args.hdr.player_count_max = JOYSTICK_COUNT; args.hdr.player_count_max = JOYSTICK_COUNT;
hidLaShowControllerSupportForSystem(&info, &args, false); hidLaShowControllerSupportForSystem(&info, &args, false);
}
// update pads states // update pads states
for (int i = 0; i < JOYSTICK_COUNT; i++) { for (int i = 0; i < JOYSTICK_COUNT; i++) {
@ -134,17 +136,39 @@ static int SWITCH_JoystickInit(void) {
// initialize first pad to defaults // initialize first pad to defaults
padInitializeDefault(&state[0].pad); padInitializeDefault(&state[0].pad);
padUpdate(&state[0].pad); padUpdate(&state[0].pad);
state[0].pad_mapping = (HidNpadButton *) &pad_mapping_default; hidSetNpadJoyHoldType(HidNpadJoyHoldType_Horizontal);
state[0].pad_type = state[0].pad_type_prev = hidGetNpadDeviceType((HidNpadIdType) 0); state[0].pad_type = state[0].pad_type_prev = hidGetNpadDeviceType((HidNpadIdType) 0);
state[0].pad_style = state[0].pad_style_prev = hidGetNpadStyleSet((HidNpadIdType) 0); state[0].pad_style = state[0].pad_style_prev = hidGetNpadStyleSet((HidNpadIdType) 0);
if (!(state[0].pad_style & HidNpadStyleTag_NpadJoyDual) &&
(state[0].pad_type & HidDeviceTypeBits_JoyLeft)) {
state[0].pad_mapping = (HidNpadButton*)&pad_mapping_left_joy;
}
else if (!(state[0].pad_style & HidNpadStyleTag_NpadJoyDual) &&
(state[0].pad_type & HidDeviceTypeBits_JoyRight)) {
state[0].pad_mapping = (HidNpadButton*)&pad_mapping_right_joy;
}
else {
state[0].pad_mapping = (HidNpadButton*)&pad_mapping_default;
}
// initialize pad and vibrations for pad 1 to 7 // initialize pad and vibrations for pad 1 to 7
for (int i = 1; i < JOYSTICK_COUNT; i++) { for (int i = 1; i < JOYSTICK_COUNT; i++) {
padInitialize(&state[i].pad, HidNpadIdType_No1 + i); padInitialize(&state[i].pad, HidNpadIdType_No1 + i);
padUpdate(&state[i].pad); padUpdate(&state[i].pad);
state[i].pad_mapping = (HidNpadButton *) &pad_mapping_default;
state[i].pad_type = state[i].pad_type_prev = hidGetNpadDeviceType((HidNpadIdType) i); state[i].pad_type = state[i].pad_type_prev = hidGetNpadDeviceType((HidNpadIdType) i);
state[i].pad_style = state[i].pad_style_prev = hidGetNpadStyleSet((HidNpadIdType) i); state[i].pad_style = state[i].pad_style_prev = hidGetNpadStyleSet((HidNpadIdType) i);
if (!(state[i].pad_style & HidNpadStyleTag_NpadJoyDual) &&
(state[i].pad_type & HidDeviceTypeBits_JoyLeft)) {
state[i].pad_mapping = (HidNpadButton*)&pad_mapping_left_joy;
}
else if (!(state[i].pad_style & HidNpadStyleTag_NpadJoyDual) &&
(state[i].pad_type & HidDeviceTypeBits_JoyRight)) {
state[i].pad_mapping = (HidNpadButton*)&pad_mapping_right_joy;
}
else {
state[i].pad_mapping = (HidNpadButton*)&pad_mapping_default;
}
hidInitializeVibrationDevices(&state[i].vibrationDeviceHandles, 1, hidInitializeVibrationDevices(&state[i].vibrationDeviceHandles, 1,
HidNpadIdType_No1 + i, state[i].pad_style); HidNpadIdType_No1 + i, state[i].pad_style);
} }
@ -252,7 +276,7 @@ static void SWITCH_JoystickUpdate(SDL_Joystick *joystick) {
state[index].pad_style = hidGetNpadStyleSet((HidNpadIdType) index); state[index].pad_style = hidGetNpadStyleSet((HidNpadIdType) index);
if (state[index].pad_type != state[index].pad_type_prev if (state[index].pad_type != state[index].pad_type_prev
|| state[index].pad_style != state[index].pad_style_prev) { || state[index].pad_style != state[index].pad_style_prev) {
SWITCH_ShowControllerSupport(); SWITCH_UpdateControllerSupport(padIsHandheld(&state[index].pad) ? true : false);
return; return;
} }