MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix web_rgfw gamepad

Browse Source
This commit is contained in:
ColleagueRiley 2024-11-20 21:42:50 -05:00
parent efe1bd282b
commit 8dc647153c
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/external/RGFW.h vendored
View File

@ -8318,12 +8318,28 @@ EM_BOOL Emscripten_on_resize(int eventType, const EmscriptenUiEvent* e, void* us
}
EM_BOOL Emscripten_on_fullscreenchange(int eventType, const EmscriptenFullscreenChangeEvent* e, void* userData) {
static bool fullscreen = false;
static RGFW_rect ogRect;
if (fullscreen == false) {
ogRect = RGFW_root->r;
}
fullscreen = !fullscreen;
RGFW_UNUSED(eventType); RGFW_UNUSED(userData);
RGFW_events[RGFW_eventLen].type = RGFW_windowResized;
RGFW_eventLen++;
RGFW_root->r = RGFW_RECT(0, 0, e->elementWidth, e->elementHeight);
if (fullscreen == false) {
emscripten_set_canvas_element_size("#canvas", ogRect.w, ogRect.h);
RGFW_root->r = RGFW_RECT(0, 0, ogRect.w, ogRect.h);
}
RGFW_windowResizeCallback(RGFW_root, RGFW_root->r);
return EM_TRUE;
}
@ -8736,9 +8752,9 @@ RGFW_Event* RGFW_window_checkEvent(RGFW_window* win) {
}
for (int j = 0; (j < gamepadState.numAxes) && (j < 4); j += 2) {
win->event.axisesCount = gamepadState.numAxes;
if (win->event.axis[j].x != (i8)(gamepadState.axis[j] * 100.0f) ||
win->event.axis[j].y != (i8)(gamepadState.axis[j + 1] * 100.0f)
win->event.axisesCount = gamepadState.numAxes / 2;
if (win->event.axis[j / 2].x != (i8)(gamepadState.axis[j] * 100.0f) ||
win->event.axis[j / 2].y != (i8)(gamepadState.axis[j + 1] * 100.0f)
) {
win->event.axis[j / 2].x = (i8)(gamepadState.axis[j] * 100.0f);
win->event.axis[j / 2].y = (i8)(gamepadState.axis[j + 1] * 100.0f);

49
src/platforms/rcore_desktop_rgfw.c
View File

@ -1166,43 +1166,26 @@ void PollInputEvents(void)
switch(event->whichAxis) {
case 0:
{
if (abs(event->axis[0].x) > abs(event->axis[0].y))
{
axis = GAMEPAD_AXIS_LEFT_X;
value = event->axis[0].x;
break;
}
value = event->axis[0].y;
axis = GAMEPAD_AXIS_LEFT_Y;
#ifndef __linux__
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_LEFT_X] = event->axis[0].x / 100.0f;
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_LEFT_Y] = event->axis[0].y / 100.0f;
#else
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_LEFT_X] = event->axis[0].x / 32767.0f;
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_LEFT_Y] = event->axis[0].y / 32767.0f;
#endif
} break;
case 1:
{
if (abs(event->axis[1].x) > abs(event->axis[1].y))
{
axis = GAMEPAD_AXIS_RIGHT_X;
value = event->axis[1].x;
break;
}
value = event->axis[1].y;
axis = GAMEPAD_AXIS_RIGHT_Y;
} break;
case 2: axis = GAMEPAD_AXIS_LEFT_TRIGGER; break;
case 3: axis = GAMEPAD_AXIS_RIGHT_TRIGGER; break;
default: break;
}
#ifdef __linux__
value = (float)(value)/32767.0f;
#ifndef __linux__
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_RIGHT_X] = event->axis[1].x / 100.0f;
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_RIGHT_Y] = event->axis[1].y / 100.0f;
#else
value = ((float)value / 100.0f);
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_RIGHT_X] = event->axis[1].x / 32767.0f;
CORE.Input.Gamepad.axisState[event->joystick][GAMEPAD_AXIS_RIGHT_Y] = event->axis[1].y / 32767.0f;
#endif
CORE.Input.Gamepad.axisState[event->joystick][axis] = value;
// Register button state for triggers in addition to their axes
if ((axis == GAMEPAD_AXIS_LEFT_TRIGGER) || (axis == GAMEPAD_AXIS_RIGHT_TRIGGER))
{
} break;
case 2: axis = GAMEPAD_AXIS_LEFT_TRIGGER;
case 3: { if (axis == -1) axis = GAMEPAD_AXIS_RIGHT_TRIGGER;
int button = (axis == GAMEPAD_AXIS_LEFT_TRIGGER)? GAMEPAD_BUTTON_LEFT_TRIGGER_2 : GAMEPAD_BUTTON_RIGHT_TRIGGER_2;
int pressed = (value > 0.1f);
CORE.Input.Gamepad.currentButtonState[event->joystick][button] = pressed;
@ -1210,6 +1193,8 @@ void PollInputEvents(void)
if (pressed) CORE.Input.Gamepad.lastButtonPressed = button;
else if (CORE.Input.Gamepad.lastButtonPressed == button) CORE.Input.Gamepad.lastButtonPressed = 0;
}
default: break;
}
} break;
default: break;
}