Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-24 16:22:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

port: allow keyboard to act as a separate controller

Browse Source 
also add a way to fake controller connection status for testing
This commit is contained in:
fgsfds committed 2023-08-19 12:13:23 +02:00
1 parent 420053178e
commit 41cdef055e
2 files changed
+14 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

port/src/config.c
+2
View File
@@ -44,6 +44,8 @@ struct configentry {
{ "Input.RStickDeadzone", CONFIG_S32, { .s32val = 4096 } },
{ "Input.SwapSticks", CONFIG_S32, { .s32val = 1 } },
{ "Input.RumbleScale", CONFIG_F32, { .f32val = 0.333f } },
{ "Input.FirstGamepadNum", CONFIG_S32, { .s32val = 0 } },
{ "Input.FakeGamepads", CONFIG_S32, { .s32val = 0 } },
/* Game */
{ "Game.BaseDir", CONFIG_STR, { .strval = "./data" } },
{ "Game.MemorySize", CONFIG_S32, { .s32val = 16 } },
port/src/input.c
+12 -5
View File
@@ -137,16 +137,18 @@ static int inputEventFilter(void *data, SDL_Event *event)
s32 inputInit(void)
{
if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER)) {
if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) != 0) {
return -1;
}
SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
}
const s32 numJoys = SDL_NumJoysticks();
s32 ret = 1; // always report first controller as connected
for (s32 jidx = 0, cidx = 0; jidx < numJoys && cidx < INPUT_MAX_CONTROLLERS; ++jidx) {
// if this is set to 1, keyboard will count as a separate controller on its own,
// so the first connected gamepad will go to player 2 instead of player 1
const s32 cstart = configGetInt("Input.FirstGamepadNum", 0);
for (s32 jidx = 0, cidx = cstart; jidx < numJoys && cidx < INPUT_MAX_CONTROLLERS; ++jidx) {
if (SDL_IsGameController(jidx)) {
pads[cidx] = SDL_GameControllerOpen(jidx);
if (pads[cidx]) {
@@ -179,6 +181,11 @@ s32 inputInit(void)
axisMap[1][1] = SDL_CONTROLLER_AXIS_LEFTY;
}
const s32 overrideMask = (1 << configGetInt("Input.FakeGamepads", 0)) - 1;
if (overrideMask) {
ret = overrideMask;
}
connectedMask = ret;
return ret;
@@ -288,7 +295,7 @@ s32 inputControllerConnected(s32 idx)
if (idx < 0 || idx >= INPUT_MAX_CONTROLLERS) {
return 0;
}
return !idx || !!pads[idx]; // always report first controller as connected
return pads[idx] || (connectedMask & (1 << idx));
}
s32 inputRumbleSupported(s32 idx)