mirror of
https://github.com/open-goal/jak-project
synced 2026-06-07 03:58:11 -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
213 lines
5.8 KiB
C
Vendored
Generated
213 lines
5.8 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.
|
|
*/
|
|
|
|
/* Test the thread and mutex locking functions
|
|
Also exercises the system's signal/thread interaction
|
|
*/
|
|
|
|
#include <signal.h>
|
|
#include <stdlib.h> /* for atexit() */
|
|
|
|
#include <SDL3/SDL.h>
|
|
#include <SDL3/SDL_main.h>
|
|
#include <SDL3/SDL_test.h>
|
|
|
|
static SDL_Mutex *mutex = NULL;
|
|
static SDL_ThreadID mainthread;
|
|
static SDL_AtomicInt doterminate;
|
|
static int nb_threads = 6;
|
|
static SDL_Thread **threads;
|
|
static int worktime = 1000;
|
|
static SDLTest_CommonState *state;
|
|
|
|
/**
|
|
* SDL_Quit() shouldn't be used with atexit() directly because
|
|
* calling conventions may differ...
|
|
*/
|
|
static void
|
|
SDL_Quit_Wrapper(void)
|
|
{
|
|
SDL_Quit();
|
|
SDLTest_CommonDestroyState(state);
|
|
}
|
|
|
|
static void printid(void)
|
|
{
|
|
SDL_Log("Thread %" SDL_PRIu64 ": exiting", SDL_GetCurrentThreadID());
|
|
}
|
|
|
|
static void terminate(int sig)
|
|
{
|
|
(void)signal(SIGINT, terminate);
|
|
SDL_SetAtomicInt(&doterminate, 1);
|
|
}
|
|
|
|
static void closemutex(int sig)
|
|
{
|
|
SDL_ThreadID id = SDL_GetCurrentThreadID();
|
|
int i;
|
|
SDL_Log("Thread %" SDL_PRIu64 ": Cleaning up...", id == mainthread ? 0 : id);
|
|
SDL_SetAtomicInt(&doterminate, 1);
|
|
if (threads) {
|
|
for (i = 0; i < nb_threads; ++i) {
|
|
SDL_WaitThread(threads[i], NULL);
|
|
}
|
|
SDL_free(threads);
|
|
threads = NULL;
|
|
}
|
|
SDL_DestroyMutex(mutex);
|
|
/* Let 'main()' return normally */
|
|
if (sig != 0) {
|
|
exit(sig);
|
|
}
|
|
}
|
|
|
|
static int SDLCALL
|
|
Run(void *data)
|
|
{
|
|
SDL_ThreadID current_thread = SDL_GetCurrentThreadID();
|
|
|
|
if (current_thread == mainthread) {
|
|
(void)signal(SIGTERM, closemutex);
|
|
}
|
|
SDL_Log("Thread %" SDL_PRIu64 ": starting up", current_thread);
|
|
while (!SDL_GetAtomicInt(&doterminate)) {
|
|
SDL_Log("Thread %" SDL_PRIu64 ": ready to work", current_thread);
|
|
SDL_LockMutex(mutex);
|
|
SDL_Log("Thread %" SDL_PRIu64 ": start work!", current_thread);
|
|
SDL_Delay(1 * worktime);
|
|
SDL_Log("Thread %" SDL_PRIu64 ": work done!", current_thread);
|
|
SDL_UnlockMutex(mutex);
|
|
|
|
/* If this sleep isn't done, then threads may starve */
|
|
SDL_Delay(10);
|
|
}
|
|
if (current_thread == mainthread && SDL_GetAtomicInt(&doterminate)) {
|
|
SDL_Log("Thread %" SDL_PRIu64 ": raising SIGTERM", current_thread);
|
|
(void)raise(SIGTERM);
|
|
}
|
|
SDL_Log("Thread %" SDL_PRIu64 ": exiting!", current_thread);
|
|
return 0;
|
|
}
|
|
|
|
#ifndef _WIN32
|
|
static Uint32 hit_timeout(void *param, SDL_TimerID timerID, Uint32 interval) {
|
|
SDL_Log("Hit timeout! Sending SIGINT!");
|
|
(void)raise(SIGINT);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int i;
|
|
#ifndef _WIN32
|
|
int timeout = 0;
|
|
#endif
|
|
|
|
/* 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(argv[i], "--nbthreads") == 0) {
|
|
if (argv[i + 1]) {
|
|
char *endptr;
|
|
nb_threads = SDL_strtol(argv[i + 1], &endptr, 0);
|
|
if (endptr != argv[i + 1] && *endptr == '\0' && nb_threads > 0) {
|
|
consumed = 2;
|
|
}
|
|
}
|
|
} else if (SDL_strcmp(argv[i], "--worktime") == 0) {
|
|
if (argv[i + 1]) {
|
|
char *endptr;
|
|
nb_threads = SDL_strtol(argv[i + 1], &endptr, 0);
|
|
if (endptr != argv[i + 1] && *endptr == '\0' && nb_threads > 0) {
|
|
consumed = 2;
|
|
}
|
|
}
|
|
#ifndef _WIN32
|
|
} else if (SDL_strcmp(argv[i], "--timeout") == 0) {
|
|
if (argv[i + 1]) {
|
|
char *endptr;
|
|
timeout = SDL_strtol(argv[i + 1], &endptr, 0);
|
|
if (endptr != argv[i + 1] && *endptr == '\0' && timeout > 0) {
|
|
consumed = 2;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
if (consumed <= 0) {
|
|
static const char *options[] = {
|
|
"[--nbthreads NB]",
|
|
"[--worktime ms]",
|
|
#ifndef _WIN32
|
|
"[--timeout ms]",
|
|
#endif
|
|
NULL,
|
|
};
|
|
SDLTest_CommonLogUsage(state, argv[0], options);
|
|
exit(1);
|
|
}
|
|
|
|
i += consumed;
|
|
}
|
|
|
|
threads = SDL_malloc(nb_threads * sizeof(SDL_Thread*));
|
|
|
|
/* Load the SDL library */
|
|
if (!SDL_Init(0)) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%s", SDL_GetError());
|
|
exit(1);
|
|
}
|
|
(void)atexit(SDL_Quit_Wrapper);
|
|
|
|
SDL_SetAtomicInt(&doterminate, 0);
|
|
|
|
mutex = SDL_CreateMutex();
|
|
if (!mutex) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create mutex: %s", SDL_GetError());
|
|
exit(1);
|
|
}
|
|
|
|
mainthread = SDL_GetCurrentThreadID();
|
|
SDL_Log("Main thread: %" SDL_PRIu64, mainthread);
|
|
(void)atexit(printid);
|
|
for (i = 0; i < nb_threads; ++i) {
|
|
char name[64];
|
|
(void)SDL_snprintf(name, sizeof(name), "Worker%d", i);
|
|
threads[i] = SDL_CreateThread(Run, name, NULL);
|
|
if (threads[i] == NULL) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread!");
|
|
}
|
|
}
|
|
|
|
#ifndef _WIN32
|
|
if (timeout) {
|
|
SDL_AddTimer(timeout, hit_timeout, NULL);
|
|
}
|
|
#endif
|
|
|
|
(void)signal(SIGINT, terminate);
|
|
Run(NULL);
|
|
|
|
return 0; /* Never reached */
|
|
}
|