mirror of
https://github.com/open-goal/jak-project
synced 2026-08-08 10:34:30 -04:00
1f6438e517
This PR updates to SDL3, and with it, adds a handful of new features. Everything seems to work but I'm going to look over the code once last time before merging, some of the API changes are hard to spot. Fixes #2773 ### Pressure sensitivity support for DS3 Controllers SDL3 adds pressure sensitivity support for DS3 controllers on windows. I have not tested on linux. The option is disabled by default. On windows you will need https://docs.nefarius.at/projects/DsHidMini/ and to be using SXS mode. ### DualSense and Xbox One Trigger Effects If enabled, Jak 2 will have certain trigger effects. They are: - xbox1: - small vibrate when collecting dark eco - big vibrate when changing to dark jak - vibrate when shooting gun, proportional to gun type - ps5: - resistance when changing to dark jak - different gun shooting effects - red (resistance) - yellow (weapon trigger) - blue (vibrates) - purple (less resistance) > **Gun Shooting effects are only enabled if the new "Swap R1 and R2" option is enabled** There are more effects that could be used in `dualsense_effects.cpp`, but I only exposed the ones I needed to OpenGOAL. If a modder wants to use some of the others and wires them up end-to-end, please consider contributing that upstream. ### New ImGUI Menu Added new imgui options for selecting the active controller, for those people that struggle to select the initial controller.  ### Testing The highlights of what I tested successfully: - display - [x] all mode switch permutations - [x] launch with all modes saved - [x] switch monitors / unplug monitor that was active, how does it handle it - [x] load with alternate monitor saved and all modes - [x] allowing hidpi doesnt break macos - controls - [x] keyboard and mouse still work - [x] pressure sensitivity on linux
297 lines
9.1 KiB
C
Vendored
Generated
297 lines
9.1 KiB
C
Vendored
Generated
/*
|
|
Copyright (C) 1997-2025 Sam Lantinga <slouken@libsdl.org>
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
warranty. In no event will the authors be held liable for any damages
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely.
|
|
*/
|
|
|
|
#include <SDL3/SDL_test_common.h>
|
|
#include <SDL3/SDL_test_font.h>
|
|
#include <SDL3/SDL_main.h>
|
|
|
|
#ifdef SDL_PLATFORM_EMSCRIPTEN
|
|
#include <emscripten/emscripten.h>
|
|
#endif
|
|
|
|
static SDLTest_CommonState *state;
|
|
static int done;
|
|
|
|
static const char *cursorNames[] = {
|
|
"arrow",
|
|
"ibeam",
|
|
"wait",
|
|
"crosshair",
|
|
"waitarrow",
|
|
"sizeNWSE",
|
|
"sizeNESW",
|
|
"sizeWE",
|
|
"sizeNS",
|
|
"sizeALL",
|
|
"NO",
|
|
"hand",
|
|
"window top left",
|
|
"window top",
|
|
"window top right",
|
|
"window right",
|
|
"window bottom right",
|
|
"window bottom",
|
|
"window bottom left",
|
|
"window left"
|
|
};
|
|
SDL_COMPILE_TIME_ASSERT(cursorNames, SDL_arraysize(cursorNames) == SDL_SYSTEM_CURSOR_COUNT);
|
|
|
|
static int system_cursor = -1;
|
|
static SDL_Cursor *cursor = NULL;
|
|
static SDL_DisplayMode highlighted_mode;
|
|
|
|
/* Draws the modes menu, and stores the mode index under the mouse in highlighted_mode */
|
|
static void
|
|
draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_FRect viewport)
|
|
{
|
|
SDL_DisplayMode **modes;
|
|
char text[1024];
|
|
const int lineHeight = 10;
|
|
int i, j;
|
|
int column_chars = 0;
|
|
int text_length;
|
|
float x, y;
|
|
float table_top;
|
|
SDL_FPoint mouse_pos = { -1.0f, -1.0f };
|
|
SDL_DisplayID *displays;
|
|
|
|
/* Get mouse position */
|
|
if (SDL_GetMouseFocus() == window) {
|
|
float window_x, window_y;
|
|
float logical_x, logical_y;
|
|
|
|
SDL_GetMouseState(&window_x, &window_y);
|
|
SDL_RenderCoordinatesFromWindow(renderer, window_x, window_y, &logical_x, &logical_y);
|
|
|
|
mouse_pos.x = logical_x;
|
|
mouse_pos.y = logical_y;
|
|
}
|
|
|
|
x = 0.0f;
|
|
y = viewport.y;
|
|
|
|
y += lineHeight;
|
|
|
|
SDL_strlcpy(text, "Click on a mode to set it with SDL_SetWindowFullscreenMode", sizeof(text));
|
|
SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
|
|
SDLTest_DrawString(renderer, x, y, text);
|
|
y += lineHeight;
|
|
|
|
SDL_strlcpy(text, "Press Ctrl+Enter to toggle SDL_WINDOW_FULLSCREEN", sizeof(text));
|
|
SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
|
|
SDLTest_DrawString(renderer, x, y, text);
|
|
y += lineHeight;
|
|
|
|
table_top = y;
|
|
|
|
/* Clear the cached mode under the mouse */
|
|
if (window == SDL_GetMouseFocus()) {
|
|
SDL_zero(highlighted_mode);
|
|
}
|
|
|
|
displays = SDL_GetDisplays(NULL);
|
|
if (displays) {
|
|
for (i = 0; displays[i]; ++i) {
|
|
SDL_DisplayID display = displays[i];
|
|
modes = SDL_GetFullscreenDisplayModes(display, NULL);
|
|
for (j = 0; modes[j]; ++j) {
|
|
SDL_FRect cell_rect;
|
|
const SDL_DisplayMode *mode = modes[j];
|
|
|
|
(void)SDL_snprintf(text, sizeof(text), "%s mode %d: %dx%d@%gx %gHz",
|
|
SDL_GetDisplayName(display),
|
|
j, mode->w, mode->h, mode->pixel_density, mode->refresh_rate);
|
|
|
|
/* Update column width */
|
|
text_length = (int)SDL_strlen(text);
|
|
column_chars = SDL_max(column_chars, text_length);
|
|
|
|
/* Check if under mouse */
|
|
cell_rect.x = x;
|
|
cell_rect.y = y;
|
|
cell_rect.w = (float)(text_length * FONT_CHARACTER_SIZE);
|
|
cell_rect.h = (float)lineHeight;
|
|
|
|
if (SDL_PointInRectFloat(&mouse_pos, &cell_rect)) {
|
|
SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
|
|
|
|
/* Update cached mode under the mouse */
|
|
if (window == SDL_GetMouseFocus()) {
|
|
SDL_copyp(&highlighted_mode, mode);
|
|
}
|
|
} else {
|
|
SDL_SetRenderDrawColor(renderer, 170, 170, 170, 255);
|
|
}
|
|
|
|
SDLTest_DrawString(renderer, x, y, text);
|
|
y += lineHeight;
|
|
|
|
if ((y + lineHeight) > (viewport.y + viewport.h)) {
|
|
/* Advance to next column */
|
|
x += (column_chars + 1) * FONT_CHARACTER_SIZE;
|
|
y = table_top;
|
|
column_chars = 0;
|
|
}
|
|
}
|
|
SDL_free(modes);
|
|
}
|
|
SDL_free(displays);
|
|
}
|
|
}
|
|
|
|
static void loop(void)
|
|
{
|
|
int i;
|
|
SDL_Event event;
|
|
|
|
#ifdef TEST_WAITEVENTTIMEOUT
|
|
/* Wait up to 20 ms for input, as a test */
|
|
Uint64 then = SDL_GetTicks();
|
|
if (SDL_WaitEventTimeout(NULL, 20)) {
|
|
SDL_Log("Got an event!");
|
|
}
|
|
Uint64 now = SDL_GetTicks();
|
|
SDL_Log("Waited %d ms for events", (int)(now - then));
|
|
#endif
|
|
|
|
while (SDL_PollEvent(&event)) {
|
|
SDLTest_CommonEvent(state, &event, &done);
|
|
SDL_ConvertEventToRenderCoordinates(SDL_GetRenderer(SDL_GetWindowFromEvent(&event)), &event);
|
|
|
|
if (event.type == SDL_EVENT_WINDOW_RESIZED) {
|
|
SDL_Window *window = SDL_GetWindowFromEvent(&event);
|
|
if (window) {
|
|
SDL_Log("Window %" SDL_PRIu32 " resized to %" SDL_PRIs32 "x%" SDL_PRIs32,
|
|
event.window.windowID,
|
|
event.window.data1,
|
|
event.window.data2);
|
|
}
|
|
}
|
|
if (event.type == SDL_EVENT_WINDOW_MOVED) {
|
|
SDL_Window *window = SDL_GetWindowFromEvent(&event);
|
|
if (window) {
|
|
SDL_Log("Window %" SDL_PRIu32 " moved to %" SDL_PRIs32 ",%" SDL_PRIs32 " (display %s)",
|
|
event.window.windowID,
|
|
event.window.data1,
|
|
event.window.data2,
|
|
SDL_GetDisplayName(SDL_GetDisplayForWindow(window)));
|
|
}
|
|
}
|
|
if (event.type == SDL_EVENT_KEY_UP) {
|
|
bool updateCursor = false;
|
|
|
|
if (event.key.key == SDLK_A) {
|
|
SDL_assert(!"Keyboard generated assert");
|
|
} else if (event.key.key == SDLK_LEFT) {
|
|
--system_cursor;
|
|
if (system_cursor < 0) {
|
|
system_cursor = SDL_SYSTEM_CURSOR_COUNT - 1;
|
|
}
|
|
updateCursor = true;
|
|
} else if (event.key.key == SDLK_RIGHT) {
|
|
++system_cursor;
|
|
if (system_cursor >= SDL_SYSTEM_CURSOR_COUNT) {
|
|
system_cursor = 0;
|
|
}
|
|
updateCursor = true;
|
|
}
|
|
if (updateCursor) {
|
|
SDL_Log("Changing cursor to \"%s\"", cursorNames[system_cursor]);
|
|
SDL_DestroyCursor(cursor);
|
|
cursor = SDL_CreateSystemCursor((SDL_SystemCursor)system_cursor);
|
|
SDL_SetCursor(cursor);
|
|
}
|
|
}
|
|
if (event.type == SDL_EVENT_MOUSE_BUTTON_UP) {
|
|
SDL_Window *window = SDL_GetMouseFocus();
|
|
if (highlighted_mode.w && window) {
|
|
SDL_copyp(&state->fullscreen_mode, &highlighted_mode);
|
|
SDL_SetWindowFullscreenMode(window, &highlighted_mode);
|
|
}
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < state->num_windows; ++i) {
|
|
SDL_Window *window = state->windows[i];
|
|
SDL_Renderer *renderer = state->renderers[i];
|
|
if (window && renderer) {
|
|
float y = 0.0f;
|
|
SDL_Rect viewport;
|
|
SDL_FRect menurect;
|
|
|
|
SDL_SetRenderViewport(renderer, NULL);
|
|
SDL_GetRenderSafeArea(renderer, &viewport);
|
|
SDL_SetRenderViewport(renderer, &viewport);
|
|
|
|
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
|
|
SDL_RenderClear(renderer);
|
|
|
|
SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
|
|
SDLTest_CommonDrawWindowInfo(renderer, state->windows[i], &y);
|
|
|
|
menurect.x = 0.0f;
|
|
menurect.y = y;
|
|
menurect.w = (float)viewport.w;
|
|
menurect.h = (float)viewport.h - y;
|
|
draw_modes_menu(window, renderer, menurect);
|
|
|
|
SDL_Delay(16);
|
|
SDL_RenderPresent(renderer);
|
|
}
|
|
}
|
|
#ifdef SDL_PLATFORM_EMSCRIPTEN
|
|
if (done) {
|
|
emscripten_cancel_main_loop();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int i;
|
|
|
|
/* Initialize test framework */
|
|
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
|
|
if (!state) {
|
|
return 1;
|
|
}
|
|
|
|
/* Parse commandline */
|
|
if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) {
|
|
SDLTest_CommonQuit(state);
|
|
return 1;
|
|
}
|
|
|
|
for (i = 0; i < state->num_windows; ++i) {
|
|
SDL_Renderer *renderer = state->renderers[i];
|
|
SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
|
|
SDL_RenderClear(renderer);
|
|
}
|
|
|
|
SDL_StopTextInput(state->windows[0]);
|
|
SDL_StopTextInput(state->windows[0]);
|
|
/* Main render loop */
|
|
done = 0;
|
|
#ifdef SDL_PLATFORM_EMSCRIPTEN
|
|
emscripten_set_main_loop(loop, 0, 1);
|
|
#else
|
|
while (!done) {
|
|
loop();
|
|
}
|
|
#endif
|
|
SDL_DestroyCursor(cursor);
|
|
|
|
SDLTest_CleanupTextDrawing();
|
|
SDLTest_CommonQuit(state);
|
|
return 0;
|
|
}
|