From e539a14374b4b83517e51d8fe4d088ecefe0cdd1 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sun, 30 Aug 2020 16:06:22 +0300 Subject: [PATCH] add rudimentary SDL1 controller backend it's more to deal with the mouse not working I suppose --- Makefile | 2 +- src/pc/controller/controller_entry_point.c | 5 +- src/pc/controller/controller_sdl1.c | 285 +++++++++++++++++++++ 3 files changed, 288 insertions(+), 4 deletions(-) create mode 100644 src/pc/controller/controller_sdl1.c diff --git a/Makefile b/Makefile index fc8f8e61..aa9c3d7a 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ RENDER_API ?= GL WINDOW_API ?= SDL2 # Audio backends: SDL1, SDL2 AUDIO_API ?= SDL2 -# Controller backends (can have multiple, space separated): SDL2 +# Controller backends (can have multiple, space separated): SDL2, SDL1 CONTROLLER_API ?= SDL2 # Misc settings for EXTERNAL_DATA diff --git a/src/pc/controller/controller_entry_point.c b/src/pc/controller/controller_entry_point.c index 5e8f16c9..34ca9ca0 100644 --- a/src/pc/controller/controller_entry_point.c +++ b/src/pc/controller/controller_entry_point.c @@ -13,16 +13,15 @@ static struct ControllerAPI *controller_implementations[] = { &controller_recorded_tas, - #ifdef CAPI_SDL2 + #if defined(CAPI_SDL2) || defined(CAPI_SDL1) &controller_sdl, #endif &controller_keyboard, }; s32 osContInit(UNUSED OSMesgQueue *mq, u8 *controllerBits, UNUSED OSContStatus *status) { - for (size_t i = 0; i < sizeof(controller_implementations) / sizeof(struct ControllerAPI *); i++) { + for (size_t i = 0; i < sizeof(controller_implementations) / sizeof(struct ControllerAPI *); i++) controller_implementations[i]->init(); - } *controllerBits = 1; return 0; } diff --git a/src/pc/controller/controller_sdl1.c b/src/pc/controller/controller_sdl1.c new file mode 100644 index 00000000..37316674 --- /dev/null +++ b/src/pc/controller/controller_sdl1.c @@ -0,0 +1,285 @@ +#ifdef CAPI_SDL1 + +#include +#include +#include +#include + +#include + +// Analog camera movement by Pathétique (github.com/vrmiguel), y0shin and Mors +// Contribute or communicate bugs at github.com/vrmiguel/sm64-analog-camera + +#include + +#include "controller_api.h" +#include "controller_sdl.h" +#include "../configfile.h" +#include "../platform.h" +#include "../fs/fs.h" + +#include "game/level_update.h" + +// mouse buttons are also in the controller namespace (why), just offset 0x100 +#define VK_OFS_SDL_MOUSE 0x0100 +#define VK_BASE_SDL_MOUSE (VK_BASE_SDL_GAMEPAD + VK_OFS_SDL_MOUSE) +#define MAX_JOYBINDS 32 +#define MAX_MOUSEBUTTONS 8 // arbitrary +#define MAX_JOYBUTTONS 32 // arbitrary; includes virtual keys for triggers +#define AXIS_THRESHOLD (30 * 256) + +enum { + JOY_AXIS_LEFTX, + JOY_AXIS_LEFTY, + JOY_AXIS_RIGHTX, + JOY_AXIS_RIGHTY, + JOY_AXIS_LTRIG, + JOY_AXIS_RTRIG, + MAX_AXES, +}; + +int mouse_x; +int mouse_y; + +#ifdef BETTERCAMERA +extern u8 newcam_mouse; +#endif + +static bool init_ok; +static SDL_Joystick *sdl_joy; + +static u32 num_joy_binds = 0; +static u32 num_mouse_binds = 0; +static u32 joy_binds[MAX_JOYBINDS][2]; +static u32 mouse_binds[MAX_JOYBINDS][2]; +static int joy_axis_binds[MAX_AXES] = { 0, 1, 2, 3, 4, 5 }; + +static bool joy_buttons[MAX_JOYBUTTONS] = { false }; +static u32 mouse_buttons = 0; +static u32 last_mouse = VK_INVALID; +static u32 last_joybutton = VK_INVALID; + +static int num_joy_axes = 0; +static int num_joy_buttons = 0; +static int num_joy_hats = 0; + +static inline void controller_add_binds(const u32 mask, const u32 *btns) { + for (u32 i = 0; i < MAX_BINDS; ++i) { + if (btns[i] >= VK_BASE_SDL_GAMEPAD && btns[i] <= VK_BASE_SDL_GAMEPAD + VK_SIZE) { + if (btns[i] >= VK_BASE_SDL_MOUSE && num_joy_binds < MAX_JOYBINDS) { + mouse_binds[num_mouse_binds][0] = btns[i] - VK_BASE_SDL_MOUSE; + mouse_binds[num_mouse_binds][1] = mask; + ++num_mouse_binds; + } else if (num_mouse_binds < MAX_JOYBINDS) { + joy_binds[num_joy_binds][0] = btns[i] - VK_BASE_SDL_GAMEPAD; + joy_binds[num_joy_binds][1] = mask; + ++num_joy_binds; + } + } + } +} + +static void controller_sdl_bind(void) { + bzero(joy_binds, sizeof(joy_binds)); + bzero(mouse_binds, sizeof(mouse_binds)); + num_joy_binds = 0; + num_mouse_binds = 0; + + controller_add_binds(A_BUTTON, configKeyA); + controller_add_binds(B_BUTTON, configKeyB); + controller_add_binds(Z_TRIG, configKeyZ); + controller_add_binds(STICK_UP, configKeyStickUp); + controller_add_binds(STICK_LEFT, configKeyStickLeft); + controller_add_binds(STICK_DOWN, configKeyStickDown); + controller_add_binds(STICK_RIGHT, configKeyStickRight); + controller_add_binds(U_CBUTTONS, configKeyCUp); + controller_add_binds(L_CBUTTONS, configKeyCLeft); + controller_add_binds(D_CBUTTONS, configKeyCDown); + controller_add_binds(R_CBUTTONS, configKeyCRight); + controller_add_binds(L_TRIG, configKeyL); + controller_add_binds(R_TRIG, configKeyR); + controller_add_binds(START_BUTTON, configKeyStart); +} + +static void controller_sdl_init(void) { + if (SDL_Init(SDL_INIT_JOYSTICK) != 0) { + fprintf(stderr, "SDL init error: %s\n", SDL_GetError()); + return; + } + + if (SDL_NumJoysticks() > 0) + sdl_joy = SDL_JoystickOpen(0); + + if (sdl_joy) { + num_joy_axes = SDL_JoystickNumAxes(sdl_joy); + num_joy_buttons = SDL_JoystickNumButtons(sdl_joy); + num_joy_hats = SDL_JoystickNumHats(sdl_joy); + + for (int i = 0; i < MAX_AXES; ++i) + if (i >= num_joy_axes) + joy_axis_binds[i] = -1; + } + +#ifdef BETTERCAMERA + if (newcam_mouse == 1) + SDL_WM_GrabInput(SDL_GRAB_ON); + SDL_GetRelativeMouseState(&mouse_x, &mouse_y); +#endif + + controller_sdl_bind(); + + init_ok = true; +} + +static inline void update_button(const int i, const bool new) { + const bool pressed = !joy_buttons[i] && new; + joy_buttons[i] = new; + if (pressed) last_joybutton = i; +} + +static inline int16_t get_axis(const int i) { + if (joy_axis_binds[i] >= 0) + return SDL_JoystickGetAxis(sdl_joy, i); + else + return 0; +} + +static void controller_sdl_read(OSContPad *pad) { + if (!init_ok) return; + +#ifdef BETTERCAMERA + if (newcam_mouse == 1 && sCurrPlayMode != 2) + SDL_WM_GrabInput(SDL_GRAB_ON); + else + SDL_WM_GrabInput(SDL_GRAB_OFF); + + u32 mouse = SDL_GetRelativeMouseState(&mouse_x, &mouse_y); + + for (u32 i = 0; i < num_mouse_binds; ++i) + if (mouse & SDL_BUTTON(mouse_binds[i][0])) + pad->button |= mouse_binds[i][1]; + + // remember buttons that changed from 0 to 1 + last_mouse = (mouse_buttons ^ mouse) & mouse; + mouse_buttons = mouse; +#endif + + if (!sdl_joy) return; + + SDL_JoystickUpdate(); + + int16_t leftx = get_axis(JOY_AXIS_LEFTX); + int16_t lefty = get_axis(JOY_AXIS_LEFTY); + int16_t rightx = get_axis(JOY_AXIS_RIGHTX); + int16_t righty = get_axis(JOY_AXIS_RIGHTY); + + int16_t ltrig = get_axis(JOY_AXIS_LTRIG); + int16_t rtrig = get_axis(JOY_AXIS_RTRIG); + +#ifdef TARGET_WEB + // Firefox has a bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1606562 + // It sets down y to 32768.0f / 32767.0f, which is greater than the allowed 1.0f, + // which SDL then converts to a int16_t by multiplying by 32767.0f, which overflows into -32768. + // Maximum up will hence never become -32768 with the current version of SDL2, + // so this workaround should be safe in compliant browsers. + if (lefty == -32768) { + lefty = 32767; + } + if (righty == -32768) { + righty = 32767; + } +#endif + + for (int i = 0; i < num_joy_buttons; ++i) { + const bool new = SDL_JoystickGetButton(sdl_joy, i); + update_button(i, new); + } + + update_button(VK_LTRIGGER - VK_BASE_SDL_GAMEPAD, ltrig > AXIS_THRESHOLD); + update_button(VK_RTRIGGER - VK_BASE_SDL_GAMEPAD, rtrig > AXIS_THRESHOLD); + + u32 buttons_down = 0; + for (u32 i = 0; i < num_joy_binds; ++i) + if (joy_buttons[joy_binds[i][0]]) + buttons_down |= joy_binds[i][1]; + + pad->button |= buttons_down; + + const u32 xstick = buttons_down & STICK_XMASK; + const u32 ystick = buttons_down & STICK_YMASK; + if (xstick == STICK_LEFT) + pad->stick_x = -128; + else if (xstick == STICK_RIGHT) + pad->stick_x = 127; + if (ystick == STICK_DOWN) + pad->stick_y = -128; + else if (ystick == STICK_UP) + pad->stick_y = 127; + + if (rightx < -0x4000) pad->button |= L_CBUTTONS; + if (rightx > 0x4000) pad->button |= R_CBUTTONS; + if (righty < -0x4000) pad->button |= U_CBUTTONS; + if (righty > 0x4000) pad->button |= D_CBUTTONS; + + uint32_t magnitude_sq = (uint32_t)(leftx * leftx) + (uint32_t)(lefty * lefty); + uint32_t stickDeadzoneActual = configStickDeadzone * DEADZONE_STEP; + if (magnitude_sq > (uint32_t)(stickDeadzoneActual * stickDeadzoneActual)) { + pad->stick_x = leftx / 0x100; + int stick_y = -lefty / 0x100; + pad->stick_y = stick_y == 128 ? 127 : stick_y; + } + + magnitude_sq = (uint32_t)(rightx * rightx) + (uint32_t)(righty * righty); + stickDeadzoneActual = configStickDeadzone * DEADZONE_STEP; + if (magnitude_sq > (uint32_t)(stickDeadzoneActual * stickDeadzoneActual)) { + pad->ext_stick_x = rightx / 0x100; + int stick_y = -righty / 0x100; + pad->ext_stick_y = stick_y == 128 ? 127 : stick_y; + } +} + +static void controller_sdl_rumble_play(f32 strength, f32 length) { } + +static void controller_sdl_rumble_stop(void) { } + +static u32 controller_sdl_rawkey(void) { + if (last_joybutton != VK_INVALID) { + const u32 ret = last_joybutton; + last_joybutton = VK_INVALID; + return ret; + } + + for (int i = 0; i < MAX_MOUSEBUTTONS; ++i) { + if (last_mouse & SDL_BUTTON(i)) { + const u32 ret = VK_OFS_SDL_MOUSE + i; + last_mouse = 0; + return ret; + } + } + return VK_INVALID; +} + +static void controller_sdl_shutdown(void) { + if (SDL_WasInit(SDL_INIT_JOYSTICK)) { + if (sdl_joy) { + SDL_JoystickClose(sdl_joy); + sdl_joy = NULL; + } + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); + } + + init_ok = false; +} + +struct ControllerAPI controller_sdl = { + VK_BASE_SDL_GAMEPAD, + controller_sdl_init, + controller_sdl_read, + controller_sdl_rawkey, + controller_sdl_rumble_play, + controller_sdl_rumble_stop, + controller_sdl_bind, + controller_sdl_shutdown +}; + +#endif // CAPI_SDL1