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

port: add rstick fields to OSContPad

Browse Source
This commit is contained in:
fgsfds committed 2023-08-21 00:29:51 +02:00
1 parent b9944e8669
commit 2670db7ca1
3 files changed
+21 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/PR/os_cont.h
+4
View File
@@ -61,6 +61,10 @@ typedef struct {
s8 stick_x; /* -80 <= stick_x <= 80 */ s8 stick_x; /* -80 <= stick_x <= 80 */
s8 stick_y; /* -80 <= stick_y <= 80 */ s8 stick_y; /* -80 <= stick_y <= 80 */
u8 errnum; u8 errnum;
#ifndef PLATFORM_N64
s8 rstick_x;
s8 rstick_y;
#endif
} OSContPad; } OSContPad;
typedef struct { typedef struct {
port/src/config.c
+1
View File
@@ -51,6 +51,7 @@ struct configentry {
{ "Input.RStickScaleX", CONFIG_F32, { .f32val = 1.f } }, { "Input.RStickScaleX", CONFIG_F32, { .f32val = 1.f } },
{ "Input.RStickScaleY", CONFIG_F32, { .f32val = 1.f } }, { "Input.RStickScaleY", CONFIG_F32, { .f32val = 1.f } },
{ "Input.SwapSticks", CONFIG_S32, { .s32val = 1 } }, { "Input.SwapSticks", CONFIG_S32, { .s32val = 1 } },
{ "Input.StickCButtons", CONFIG_S32, { .s32val = 1 } },
{ "Input.RumbleScale", CONFIG_F32, { .f32val = 0.333f } }, { "Input.RumbleScale", CONFIG_F32, { .f32val = 0.333f } },
{ "Input.FirstGamepadNum", CONFIG_S32, { .s32val = 0 } }, { "Input.FirstGamepadNum", CONFIG_S32, { .s32val = 0 } },
{ "Input.FakeGamepads", CONFIG_S32, { .s32val = 0 } }, { "Input.FakeGamepads", CONFIG_S32, { .s32val = 0 } },
port/src/input.c
+16 -6
View File
@@ -16,6 +16,8 @@
#define WHEEL_DN_MASK SDL_BUTTON(VK_MOUSE_WHEEL_DN - VK_MOUSE_BEGIN + 1) #define WHEEL_DN_MASK SDL_BUTTON(VK_MOUSE_WHEEL_DN - VK_MOUSE_BEGIN + 1)
static SDL_GameController *pads[INPUT_MAX_CONTROLLERS]; static SDL_GameController *pads[INPUT_MAX_CONTROLLERS];
static s32 rumbleSupported[INPUT_MAX_CONTROLLERS];
static u32 binds[MAXCONTROLLERS][CK_TOTAL_COUNT][MAX_BINDS]; // [i][CK_][b] = [VK_] static u32 binds[MAXCONTROLLERS][CK_TOTAL_COUNT][MAX_BINDS]; // [i][CK_][b] = [VK_]
static s32 connectedMask = 0; static s32 connectedMask = 0;
@@ -49,7 +51,7 @@ static s32 deadzone[4] = {
DEFAULT_DEADZONE, DEFAULT_DEADZONE_RY, DEFAULT_DEADZONE, DEFAULT_DEADZONE_RY,
}; };
static s32 rumbleSupported[INPUT_MAX_CONTROLLERS]; static s32 stickCButtons = 1;
void inputSetDefaultKeyBinds(void) void inputSetDefaultKeyBinds(void)
{ {
@@ -226,6 +228,8 @@ s32 inputInit(void)
stickSens[2] = configGetFloat("Input.RStickScaleX", 1.f); stickSens[2] = configGetFloat("Input.RStickScaleX", 1.f);
stickSens[3] = configGetFloat("Input.RStickScaleY", 1.f); stickSens[3] = configGetFloat("Input.RStickScaleY", 1.f);
stickCButtons = configGetInt("Input.StickCButtons", 1);
if (configGetInt("Input.SwapSticks", 1)) { if (configGetInt("Input.SwapSticks", 1)) {
// invert axis map // invert axis map
axisMap[0][0] = SDL_CONTROLLER_AXIS_RIGHTX; axisMap[0][0] = SDL_CONTROLLER_AXIS_RIGHTX;
@@ -305,20 +309,26 @@ s32 inputReadController(s32 idx, OSContPad *npad)
rightX = inputAxisScale(rightX, deadzone[axisMap[1][0]], stickSens[axisMap[1][0]]); rightX = inputAxisScale(rightX, deadzone[axisMap[1][0]], stickSens[axisMap[1][0]]);
rightY = inputAxisScale(rightY, deadzone[axisMap[1][1]], stickSens[axisMap[1][1]]); rightY = inputAxisScale(rightY, deadzone[axisMap[1][1]], stickSens[axisMap[1][1]]);
if (rightX < -0x4000) npad->button |= L_CBUTTONS; if (stickCButtons) {
if (rightX > +0x4000) npad->button |= R_CBUTTONS; if (rightX < -0x4000) npad->button |= L_CBUTTONS;
if (rightY < -0x4000) npad->button |= U_CBUTTONS; if (rightX > +0x4000) npad->button |= R_CBUTTONS;
if (rightY > +0x4000) npad->button |= D_CBUTTONS; if (rightY < -0x4000) npad->button |= U_CBUTTONS;
if (rightY > +0x4000) npad->button |= D_CBUTTONS;
}
if (!npad->stick_x && leftX) { if (!npad->stick_x && leftX) {
npad->stick_x = leftX / 0x100; npad->stick_x = leftX / 0x100;
} }
const s32 stickY = -leftY / 0x100; s32 stickY = -leftY / 0x100;
if (!npad->stick_y && stickY) { if (!npad->stick_y && stickY) {
npad->stick_y = (stickY == 128) ? 127 : stickY; npad->stick_y = (stickY == 128) ? 127 : stickY;
} }
stickY = -rightY / 0x100;
npad->rstick_y = (stickY == 128) ? 127 : stickY;
npad->rstick_x = rightX / 0x100;
return 0; return 0;
} }