mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-22 17:12:25 -05:00
Code Issues Projects Releases Packages Wiki Activity

Webclient: Support joysticks and ZL/ZR buttons for gamepad

Browse source
This commit is contained in:
UnknownShadow200 2023-09-02 17:46:16 +10:00
parent b836fc6cb4
commit 18c15cc700
3 changed files with 55 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Menus.c
View file

@ -1813,9 +1813,8 @@ void LoadLevelScreen_Show(void) {
}
/*########################################################################################################################*
*----------------------------------------------------EditHotkeyScreen-----------------------------------------------------*
*----------------------------------------------------BindSourcesScreen----------------------------------------------------*
*#########################################################################################################################*/
static struct BindsSourceScreen {
Screen_Body

4
src/Program.c
View file

@ -77,8 +77,8 @@ static int RunProgram(int argc, char** argv) {
#ifdef _MSC_VER
/* NOTE: Make sure to comment this out before pushing a commit */
//cc_string rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565");
cc_string rawArgs = String_FromConst("UnknownShadow200");
argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
//cc_string rawArgs = String_FromConst("UnknownShadow200");
//argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
#endif
if (argsCount == 0) {

69
src/Window_Web.c
View file

@ -525,27 +525,62 @@ static void ProcessPendingResize(void) {
UpdateWindowBounds();
}
#define GetGamePadButton(i) i < numButtons ? ev->digitalButton[i] : 0
static void ProcessGamePadInput(EmscriptenGamepadEvent* ev) {
/* https://www.w3.org/TR/gamepad/#dfn-standard-gamepad */
#define GetGamepadButton(i) i < numButtons ? ev->digitalButton[i] : 0
static void ProcessGamepadButtons(EmscriptenGamepadEvent* ev) {
int numButtons = ev->numButtons;
Input.Sources |= INPUT_SOURCE_GAMEPAD;
/* https://www.w3.org/TR/gamepad/#dfn-standard-gamepad */
Input_SetNonRepeatable(CCPAD_A, GetGamePadButton(0));
Input_SetNonRepeatable(CCPAD_B, GetGamePadButton(1));
Input_SetNonRepeatable(CCPAD_X, GetGamePadButton(2));
Input_SetNonRepeatable(CCPAD_Y, GetGamePadButton(3));
Input_SetNonRepeatable(CCPAD_A, GetGamepadButton(0));
Input_SetNonRepeatable(CCPAD_B, GetGamepadButton(1));
Input_SetNonRepeatable(CCPAD_X, GetGamepadButton(2));
Input_SetNonRepeatable(CCPAD_Y, GetGamepadButton(3));
Input_SetNonRepeatable(CCPAD_L, GetGamePadButton(4));
Input_SetNonRepeatable(CCPAD_R, GetGamePadButton(5));
Input_SetNonRepeatable(CCPAD_L, GetGamepadButton(4));
Input_SetNonRepeatable(CCPAD_R, GetGamepadButton(5));
Input_SetNonRepeatable(CCPAD_ZL, GetGamepadButton(6));
Input_SetNonRepeatable(CCPAD_ZR, GetGamepadButton(7));
Input_SetNonRepeatable(CCPAD_SELECT, GetGamePadButton(8));
Input_SetNonRepeatable(CCPAD_START, GetGamePadButton(9));
Input_SetNonRepeatable(CCPAD_SELECT, GetGamepadButton(8));
Input_SetNonRepeatable(CCPAD_START, GetGamepadButton(9));
Input_SetNonRepeatable(CCPAD_UP, GetGamePadButton(12));
Input_SetNonRepeatable(CCPAD_DOWN, GetGamePadButton(13));
Input_SetNonRepeatable(CCPAD_LEFT, GetGamePadButton(14));
Input_SetNonRepeatable(CCPAD_RIGHT, GetGamePadButton(15));
Input_SetNonRepeatable(CCPAD_UP, GetGamepadButton(12));
Input_SetNonRepeatable(CCPAD_DOWN, GetGamepadButton(13));
Input_SetNonRepeatable(CCPAD_LEFT, GetGamepadButton(14));
Input_SetNonRepeatable(CCPAD_RIGHT, GetGamepadButton(15));
}
static void ProcessGamepadCamera(float x, float y, double delta) {
float scale = (delta * 60.0) * 8.0f;
/* Deadzone adjustment */
if (x >= -0.1 && x <= 0.1) x = 0;
if (y >= -0.1 && y <= 0.1) y = 0;
if (x == 0 && y == 0) return;
Event_RaiseRawMove(&PointerEvents.RawMoved, x * scale, y * scale);
}
static void ProcessGamepadMovement(float x, float y) {
/* Deadzone adjustment */
if (x >= -0.1 && x <= 0.1) x = 0;
if (y >= -0.1 && y <= 0.1) y = 0;
if (x == 0 && y == 0) return;
Input.JoystickMovement = true;
Input.JoystickAngle = Math_Atan2(x, y);
}
static void ProcessGamepadInput(EmscriptenGamepadEvent* ev, double delta) {
Input.Sources |= INPUT_SOURCE_GAMEPAD;
Input.JoystickMovement = false;
ProcessGamepadButtons(ev);
if (ev->numAxes >= 4) {
ProcessGamepadMovement(ev->axis[0], ev->axis[1]);
ProcessGamepadCamera( ev->axis[2], ev->axis[3], delta);
} else if (ev->numAxes >= 2) {
ProcessGamepadCamera(ev->axis[0], ev->axis[1], delta);
}
}
void Window_ProcessEvents(double delta) {
@ -559,7 +594,7 @@ void Window_ProcessEvents(double delta) {
{
EmscriptenGamepadEvent ev;
res = emscripten_get_gamepad_status(i, &ev);
if (res == 0) ProcessGamePadInput(&ev);
if (res == 0) ProcessGamepadInput(&ev, delta);
}
}