mirror of
https://github.com/open-goal/jak-project
synced 2026-05-27 08:09:29 -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
161 lines
4.3 KiB
C
Vendored
Generated
161 lines
4.3 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.
|
|
*/
|
|
|
|
/* Simple test of the SDL threading code */
|
|
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
|
|
#include <SDL3/SDL.h>
|
|
#include <SDL3/SDL_main.h>
|
|
#include <SDL3/SDL_test.h>
|
|
|
|
static SDL_TLSID tls;
|
|
static SDL_Thread *thread = NULL;
|
|
static SDL_AtomicInt alive;
|
|
static int testprio = 0;
|
|
static SDLTest_CommonState *state;
|
|
|
|
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
|
|
static void
|
|
quit(int rc)
|
|
{
|
|
SDL_Quit();
|
|
SDLTest_CommonDestroyState(state);
|
|
/* Let 'main()' return normally */
|
|
if (rc != 0) {
|
|
exit(rc);
|
|
}
|
|
}
|
|
|
|
static const char *
|
|
getprioritystr(SDL_ThreadPriority priority)
|
|
{
|
|
switch (priority) {
|
|
case SDL_THREAD_PRIORITY_LOW:
|
|
return "SDL_THREAD_PRIORITY_LOW";
|
|
case SDL_THREAD_PRIORITY_NORMAL:
|
|
return "SDL_THREAD_PRIORITY_NORMAL";
|
|
case SDL_THREAD_PRIORITY_HIGH:
|
|
return "SDL_THREAD_PRIORITY_HIGH";
|
|
case SDL_THREAD_PRIORITY_TIME_CRITICAL:
|
|
return "SDL_THREAD_PRIORITY_TIME_CRITICAL";
|
|
}
|
|
|
|
return "???";
|
|
}
|
|
|
|
static int SDLCALL
|
|
ThreadFunc(void *data)
|
|
{
|
|
SDL_ThreadPriority prio = SDL_THREAD_PRIORITY_NORMAL;
|
|
|
|
SDL_SetTLS(&tls, "baby thread", NULL);
|
|
SDL_Log("Started thread %s: My thread id is %" SDL_PRIu64 ", thread data = %s",
|
|
(char *)data, SDL_GetCurrentThreadID(), (const char *)SDL_GetTLS(&tls));
|
|
while (SDL_GetAtomicInt(&alive)) {
|
|
SDL_Log("Thread '%s' is alive!", (char *)data);
|
|
|
|
if (testprio) {
|
|
SDL_Log("SDL_SetCurrentThreadPriority(%s):%d", getprioritystr(prio), SDL_SetCurrentThreadPriority(prio));
|
|
if (++prio > SDL_THREAD_PRIORITY_TIME_CRITICAL) {
|
|
prio = SDL_THREAD_PRIORITY_LOW;
|
|
}
|
|
}
|
|
|
|
SDL_Delay(1 * 1000);
|
|
}
|
|
SDL_Log("Thread '%s' exiting!", (char *)data);
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
killed(int sig)
|
|
{
|
|
SDL_Log("Killed with SIGTERM, waiting 5 seconds to exit");
|
|
SDL_Delay(5 * 1000);
|
|
SDL_SetAtomicInt(&alive, 0);
|
|
SDL_WaitThread(thread, NULL);
|
|
quit(0);
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int i;
|
|
|
|
/* Initialize test framework */
|
|
state = SDLTest_CommonCreateState(argv, 0);
|
|
if (!state) {
|
|
return 1;
|
|
}
|
|
|
|
/* Parse commandline */
|
|
for (i = 1; i < argc;) {
|
|
int consumed;
|
|
|
|
consumed = SDLTest_CommonArg(state, i);
|
|
if (!consumed) {
|
|
if (SDL_strcmp("--prio", argv[i]) == 0) {
|
|
testprio = 1;
|
|
consumed = 1;
|
|
}
|
|
}
|
|
if (consumed <= 0) {
|
|
static const char *options[] = { "[--prio]", NULL };
|
|
SDLTest_CommonLogUsage(state, argv[0], options);
|
|
exit(1);
|
|
}
|
|
|
|
i += consumed;
|
|
}
|
|
|
|
/* Load the SDL library */
|
|
if (!SDL_Init(0)) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s", SDL_GetError());
|
|
return 1;
|
|
}
|
|
|
|
if (SDL_GetEnvironmentVariable(SDL_GetEnvironment(), "SDL_TESTS_QUICK") != NULL) {
|
|
SDL_Log("Not running slower tests");
|
|
SDL_Quit();
|
|
return 0;
|
|
}
|
|
|
|
SDL_SetTLS(&tls, "main thread", NULL);
|
|
SDL_Log("Main thread data initially: %s", (const char *)SDL_GetTLS(&tls));
|
|
|
|
SDL_SetAtomicInt(&alive, 1);
|
|
thread = SDL_CreateThread(ThreadFunc, "One", "#1");
|
|
if (!thread) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
SDL_Delay(5 * 1000);
|
|
SDL_Log("Waiting for thread #1");
|
|
SDL_SetAtomicInt(&alive, 0);
|
|
SDL_WaitThread(thread, NULL);
|
|
|
|
SDL_Log("Main thread data finally: %s", (const char *)SDL_GetTLS(&tls));
|
|
|
|
SDL_SetAtomicInt(&alive, 1);
|
|
(void)signal(SIGTERM, killed);
|
|
thread = SDL_CreateThread(ThreadFunc, "Two", "#2");
|
|
if (!thread) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
(void)raise(SIGTERM);
|
|
|
|
SDL_Quit(); /* Never reached */
|
|
return 0; /* Never reached */
|
|
}
|