mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -04:00
Tyler Wilding
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
77 lines
3.0 KiB
Prolog
Vendored
Generated
77 lines
3.0 KiB
Prolog
Vendored
Generated
# Add project specific ProGuard rules here.
|
|
# By default, the flags in this file are appended to flags specified
|
|
# in [sdk]/tools/proguard/proguard-android.txt
|
|
# You can edit the include path and order by changing the proguardFiles
|
|
# directive in build.gradle.
|
|
#
|
|
# For more details, see
|
|
# https://developer.android.com/build/shrink-code
|
|
|
|
# Add any project specific keep options here:
|
|
|
|
# If your project uses WebView with JS, uncomment the following
|
|
# and specify the fully qualified class name to the JavaScript interface
|
|
# class:
|
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
|
# public *;
|
|
#}
|
|
|
|
-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivity {
|
|
java.lang.String nativeGetHint(java.lang.String); # Java-side doesn't use this, so it gets minified, but C-side still tries to register it
|
|
java.lang.String clipboardGetText();
|
|
boolean clipboardHasText();
|
|
void clipboardSetText(java.lang.String);
|
|
int createCustomCursor(int[], int, int, int, int);
|
|
void destroyCustomCursor(int);
|
|
android.content.Context getContext();
|
|
boolean getManifestEnvironmentVariables();
|
|
android.view.Surface getNativeSurface();
|
|
void initTouch();
|
|
boolean isAndroidTV();
|
|
boolean isChromebook();
|
|
boolean isDeXMode();
|
|
boolean isScreenKeyboardShown();
|
|
boolean isTablet();
|
|
void manualBackButton();
|
|
int messageboxShowMessageBox(int, java.lang.String, java.lang.String, int[], int[], java.lang.String[], int[]);
|
|
void minimizeWindow();
|
|
boolean openURL(java.lang.String);
|
|
void onNativePen(int, int, int , float , float , float);
|
|
void requestPermission(java.lang.String, int);
|
|
boolean showToast(java.lang.String, int, int, int, int);
|
|
boolean sendMessage(int, int);
|
|
boolean setActivityTitle(java.lang.String);
|
|
boolean setCustomCursor(int);
|
|
void setOrientation(int, int, boolean, java.lang.String);
|
|
boolean setRelativeMouseEnabled(boolean);
|
|
boolean setSystemCursor(int);
|
|
void setWindowStyle(boolean);
|
|
boolean shouldMinimizeOnFocusLoss();
|
|
boolean showTextInput(int, int, int, int, int);
|
|
boolean supportsRelativeMouse();
|
|
int openFileDescriptor(java.lang.String, java.lang.String);
|
|
boolean showFileDialog(java.lang.String[], boolean, boolean, int);
|
|
}
|
|
|
|
-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.HIDDeviceManager {
|
|
void closeDevice(int);
|
|
boolean initialize(boolean, boolean);
|
|
boolean openDevice(int);
|
|
boolean readReport(int, byte[], boolean);
|
|
int writeReport(int, byte[], boolean);
|
|
}
|
|
|
|
-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLAudioManager {
|
|
void registerAudioDeviceCallback();
|
|
void unregisterAudioDeviceCallback();
|
|
void audioSetThreadPriority(boolean, int);
|
|
}
|
|
|
|
-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLControllerManager {
|
|
void pollInputDevices();
|
|
void pollHapticDevices();
|
|
void hapticRun(int, float, int);
|
|
void hapticRumble(int, float, float, int);
|
|
void hapticStop(int);
|
|
}
|