mirror of
https://github.com/open-goal/jak-project
synced 2026-06-16 06:46:07 -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
81 lines
2.1 KiB
C++
81 lines
2.1 KiB
C++
#pragma once
|
|
|
|
#include "common/util/FileUtil.h"
|
|
#include "common/util/json_util.h"
|
|
|
|
#include "game/system/hid/input_bindings.h"
|
|
#include "game/system/hid/sdl_util.h"
|
|
#include "game/tools/filter_menu/filter_menu.h"
|
|
|
|
namespace game_settings {
|
|
struct DebugSettings {
|
|
DebugSettings();
|
|
|
|
std::string current_version = "1.2";
|
|
std::string version = current_version;
|
|
|
|
bool show_imgui = false;
|
|
int imgui_font_size = 16;
|
|
bool monospaced_font = true;
|
|
bool alternate_style = false;
|
|
bool ignore_hide_imgui = false;
|
|
bool treat_pad0_as_pad1 = false;
|
|
|
|
std::vector<DebugTextFilter> text_filters = {};
|
|
bool text_check_range = false;
|
|
float text_max_range = 0;
|
|
u32 hide_imgui_key = SDLK_LALT;
|
|
|
|
void load_settings();
|
|
void save_settings();
|
|
};
|
|
void to_json(json& j, const DebugSettings& obj);
|
|
void from_json(const json& j, DebugSettings& obj);
|
|
|
|
struct DisplaySettings {
|
|
enum class DisplayMode { Windowed = 0, Fullscreen = 1, Borderless = 2 };
|
|
|
|
DisplaySettings();
|
|
|
|
std::string current_version = "1.2";
|
|
std::string version = current_version;
|
|
|
|
int window_xpos = 50;
|
|
int window_ypos = 50;
|
|
int display_id = 0;
|
|
DisplayMode display_mode = DisplayMode::Borderless;
|
|
|
|
void load_settings();
|
|
void save_settings();
|
|
};
|
|
|
|
void to_json(json& j, const DisplaySettings& obj);
|
|
void from_json(const json& j, DisplaySettings& obj);
|
|
|
|
struct InputSettings {
|
|
InputSettings();
|
|
|
|
std::string current_version = "1.0";
|
|
std::string version = current_version;
|
|
|
|
// NOTE - assumes only port 0
|
|
std::string last_selected_controller_guid = "";
|
|
std::unordered_map<std::string, int> controller_port_mapping;
|
|
std::unordered_map<std::string, InputBindingGroups> controller_binds;
|
|
InputBindingGroups keyboard_binds;
|
|
InputBindingGroups mouse_binds;
|
|
bool keyboard_enabled = false;
|
|
bool enable_trigger_effects = false;
|
|
bool enable_pressure_sensitivity = false;
|
|
// not saved or restored, flips on if no controllers are detected
|
|
bool _keyboard_temp_enabled = false;
|
|
|
|
void load_settings();
|
|
void save_settings();
|
|
};
|
|
|
|
void to_json(json& j, const InputSettings& obj);
|
|
void from_json(const json& j, InputSettings& obj);
|
|
|
|
} // namespace game_settings
|