mirror of
https://github.com/open-goal/jak-project
synced 2026-05-31 17:32:51 -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
231 lines
7.7 KiB
C
Vendored
Generated
231 lines
7.7 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 MessageBox API */
|
|
#include <stdlib.h>
|
|
|
|
#include <SDL3/SDL.h>
|
|
#include <SDL3/SDL_main.h>
|
|
#include <SDL3/SDL_test.h>
|
|
|
|
/* This enables themed Windows dialogs when building with Visual Studio */
|
|
#if defined(SDL_PLATFORM_WINDOWS) && defined(_MSC_VER)
|
|
#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
|
|
#endif
|
|
|
|
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
|
|
static void
|
|
quit(int rc)
|
|
{
|
|
SDL_Quit();
|
|
/* Let 'main()' return normally */
|
|
if (rc != 0) {
|
|
exit(rc);
|
|
}
|
|
}
|
|
|
|
static int SDLCALL
|
|
button_messagebox(void *eventNumber)
|
|
{
|
|
const SDL_MessageBoxButtonData buttons[] = {
|
|
{ SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT,
|
|
0,
|
|
"OK" },
|
|
{ SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
|
|
1,
|
|
"Cancel" },
|
|
};
|
|
|
|
SDL_MessageBoxData data = {
|
|
SDL_MESSAGEBOX_INFORMATION,
|
|
NULL, /* no parent window */
|
|
"Custom MessageBox",
|
|
"This is a custom messagebox",
|
|
2,
|
|
NULL, /* buttons */
|
|
NULL /* Default color scheme */
|
|
};
|
|
|
|
int button = -1;
|
|
int success = 0;
|
|
data.buttons = buttons;
|
|
if (eventNumber) {
|
|
data.message = "This is a custom messagebox from a background thread.";
|
|
}
|
|
|
|
success = SDL_ShowMessageBox(&data, &button);
|
|
if (success == -1) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
if (eventNumber) {
|
|
SDL_Event event;
|
|
event.type = (Uint32)(intptr_t)eventNumber;
|
|
SDL_PushEvent(&event);
|
|
return 1;
|
|
} else {
|
|
quit(2);
|
|
}
|
|
}
|
|
SDL_Log("Pressed button: %d, %s", button, button == -1 ? "[closed]" : button == 1 ? "Cancel"
|
|
: "OK");
|
|
|
|
if (eventNumber) {
|
|
SDL_Event event;
|
|
event.type = (Uint32)(intptr_t)eventNumber;
|
|
SDL_PushEvent(&event);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int success;
|
|
SDLTest_CommonState *state;
|
|
|
|
/* Initialize test framework */
|
|
state = SDLTest_CommonCreateState(argv, 0);
|
|
if (!state) {
|
|
return 1;
|
|
}
|
|
|
|
/* Parse commandline */
|
|
if (!SDLTest_CommonDefaultArgs(state, argc, argv)) {
|
|
return 1;
|
|
}
|
|
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"Simple MessageBox",
|
|
"This is a simple error MessageBox",
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"Simple MessageBox",
|
|
"This is a simple MessageBox with a newline:\r\nHello world!",
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
NULL,
|
|
"NULL Title",
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"NULL Message",
|
|
NULL,
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
/* Google says this is Traditional Chinese for "beef with broccoli" */
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"UTF-8 Simple MessageBox",
|
|
"Unicode text: '牛肉西蘭花' ...",
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
/* Google says this is Traditional Chinese for "beef with broccoli" */
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"UTF-8 Simple MessageBox",
|
|
"Unicode text and newline:\r\n'牛肉西蘭花'\n'牛肉西蘭花'",
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
/* Google says this is Traditional Chinese for "beef with broccoli" */
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"牛肉西蘭花",
|
|
"Unicode text in the title.",
|
|
NULL);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
button_messagebox(NULL);
|
|
|
|
/* Test showing a message box from a background thread.
|
|
|
|
On macOS, the video subsystem needs to be initialized for this
|
|
to work, since the message box events are dispatched by the Cocoa
|
|
subsystem on the main thread.
|
|
*/
|
|
if (!SDL_Init(SDL_INIT_VIDEO)) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL video subsystem: %s", SDL_GetError());
|
|
return 1;
|
|
}
|
|
{
|
|
int status = 0;
|
|
SDL_Event event;
|
|
Uint32 eventNumber = SDL_RegisterEvents(1);
|
|
SDL_Thread *thread = SDL_CreateThread(&button_messagebox, "MessageBox", (void *)(uintptr_t)eventNumber);
|
|
|
|
while (SDL_WaitEvent(&event)) {
|
|
if (event.type == eventNumber) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
SDL_WaitThread(thread, &status);
|
|
|
|
SDL_Log("Message box thread return %i", status);
|
|
}
|
|
|
|
/* Test showing a message box with a parent window */
|
|
{
|
|
SDL_Event event;
|
|
SDL_Window *window = SDL_CreateWindow("Test", 640, 480, 0);
|
|
|
|
/* On wayland, no window will actually show until something has
|
|
actually been displayed.
|
|
*/
|
|
SDL_Renderer *renderer = SDL_CreateRenderer(window, NULL);
|
|
SDL_RenderPresent(renderer);
|
|
|
|
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
|
"Simple MessageBox",
|
|
"This is a simple error MessageBox with a parent window. Press a key or close the window after dismissing this messagebox.",
|
|
window);
|
|
if (!success) {
|
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s", SDL_GetError());
|
|
quit(1);
|
|
}
|
|
|
|
while (SDL_WaitEvent(&event)) {
|
|
if (event.type == SDL_EVENT_QUIT || event.type == SDL_EVENT_KEY_UP) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
SDL_Quit();
|
|
SDLTest_CommonDestroyState(state);
|
|
return 0;
|
|
}
|