Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

temp

Browse source
This commit is contained in:
Tyler Wilding 2024-08-04 21:52:10 -04:00
parent 8b7e0bde53
commit 52be78c088
No known key found for this signature in database
GPG key ID: BF7B068C2FEFD7EF
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
game/settings/settings.cpp
View file

@ -53,7 +53,7 @@ void DebugSettings::load_settings() {
} }
void DebugSettings::save_settings() { void DebugSettings::save_settings() {
// Update the version string as we are now saving it back ground // Update the version string as we are now saving it back
version = current_version; version = current_version;
json data = *this; json data = *this;
auto debug_settings_filename = auto debug_settings_filename =
@ -99,7 +99,7 @@ void DisplaySettings::load_settings() {
} }
void DisplaySettings::save_settings() { void DisplaySettings::save_settings() {
// Update the version string as we are now saving it back ground // Update the version string as we are now saving it back
version = current_version; version = current_version;
json data = *this; json data = *this;
auto file_path = file_util::get_user_settings_dir(g_game_version) / "display-settings.json"; auto file_path = file_util::get_user_settings_dir(g_game_version) / "display-settings.json";
@ -148,7 +148,7 @@ void InputSettings::load_settings() {
} }
void InputSettings::save_settings() { void InputSettings::save_settings() {
// Update the version string as we are now saving it back ground // Update the version string as we are now saving it back
version = current_version; version = current_version;
json data = *this; json data = *this;
auto file_path = file_util::get_user_settings_dir(g_game_version) / "input-settings.json"; auto file_path = file_util::get_user_settings_dir(g_game_version) / "input-settings.json";

24
game/system/hid/display_manager.cpp
View file

@ -18,12 +18,14 @@ DisplayManager::DisplayManager(SDL_Window* window) : m_window(window) {
// scales // scales
SetProcessDPIAware(); SetProcessDPIAware();
#endif #endif
// First, load the settings
m_display_settings.load_settings();
// then potentially move the window to a different display
initialize_window_position_from_settings();
// now that we are on that monitor, get the info and video modes for it
update_curr_display_info(); update_curr_display_info();
update_video_modes(); update_video_modes();
// Load from file now (after initializing current window settings) // finally, potentially change the display mode
m_display_settings.load_settings();
// Adjust window / monitor position
initialize_window_position_from_settings();
set_display_mode(m_display_settings.display_mode); set_display_mode(m_display_settings.display_mode);
} }
} }
@ -42,9 +44,12 @@ DisplayManager::~DisplayManager() {
void DisplayManager::initialize_window_position_from_settings() { void DisplayManager::initialize_window_position_from_settings() {
// Check that the display id is still valid // Check that the display id is still valid
if (m_current_display_modes.find(m_display_settings.display_id) == const auto num_displays = SDL_GetNumVideoDisplays();
m_current_display_modes.end()) { if (m_display_settings.display_id >= num_displays) {
lg::warn("[DISPLAY] Saved display ID is no longer valid, resetting to display 0"); lg::warn(
"[DISPLAY] Saved display ID: {} is no longer valid as only {} displays were detected, "
"resetting to display 0",
num_displays);
m_display_settings.display_id = 0; m_display_settings.display_id = 0;
m_display_settings.window_xpos = 50; m_display_settings.window_xpos = 50;
m_display_settings.window_ypos = 50; m_display_settings.window_ypos = 50;
@ -300,7 +305,7 @@ void DisplayManager::update_curr_display_info() {
if (get_active_display_id() < 0) { if (get_active_display_id() < 0) {
sdl_util::log_error("could not retrieve current window's display index"); sdl_util::log_error("could not retrieve current window's display index");
} }
lg::info("[DISPLAY] current display id is {}", m_display_settings.display_id); lg::info("[DISPLAY] current display id is {}", get_active_display_id());
SDL_GL_GetDrawableSize(m_window, &m_window_width, &m_window_height); SDL_GL_GetDrawableSize(m_window, &m_window_width, &m_window_height);
SDL_GetWindowPosition(m_window, &m_window_xpos, &m_window_ypos); SDL_GetWindowPosition(m_window, &m_window_xpos, &m_window_ypos);
// Update the scale of the display as well // Update the scale of the display as well
@ -391,7 +396,8 @@ void DisplayManager::update_resolutions() {
} }
Resolution new_res = {curr_mode.w, curr_mode.h, Resolution new_res = {curr_mode.w, curr_mode.h,
static_cast<float>(curr_mode.w) / static_cast<float>(curr_mode.h)}; static_cast<float>(curr_mode.w) / static_cast<float>(curr_mode.h)};
lg::info("[DISPLAY]: {}x{} is supported", new_res.width, new_res.height); lg::info("[DISPLAY]: {}x{}@{}hz is supported", new_res.width, new_res.height,
curr_mode.refresh_rate);
m_available_resolutions.push_back(new_res); m_available_resolutions.push_back(new_res);
} }

4
game/system/hid/display_manager.h
View file

@ -80,7 +80,9 @@ class DisplayManager {
game_settings::DisplaySettings::DisplayMode get_display_mode() { game_settings::DisplaySettings::DisplayMode get_display_mode() {
return m_display_settings.display_mode; return m_display_settings.display_mode;
} }
int get_num_resolutions() { return m_available_resolutions.size(); } int get_num_resolutions() {
return m_available_resolutions.size();
}
Resolution get_resolution(int id); Resolution get_resolution(int id);
bool is_supported_resolution(int width, int height); bool is_supported_resolution(int width, int height);

2
goal_src/jak1/pc/pckernel-common.gc
View file

@ -38,7 +38,7 @@
((= display-mode 'windowed) ((= display-mode 'windowed)
(set! (-> obj window-width) width) (set! (-> obj window-width) width)
(set! (-> obj window-height) height) (set! (-> obj window-height) height)
(format 0 "Setting window size to ~D x ~D~%" width height) (format 0 "Setting window size to ~D x ~D~%" (max PC_MIN_WIDTH (-> obj window-width)) (max PC_MIN_HEIGHT (-> obj window-height)))
(pc-set-window-size! (max PC_MIN_WIDTH (-> obj window-width)) (max PC_MIN_HEIGHT (-> obj window-height)))) (pc-set-window-size! (max PC_MIN_WIDTH (-> obj window-width)) (max PC_MIN_HEIGHT (-> obj window-height))))
(else (else
(format 0 "Setting borderless/fullscreen size to ~D x ~D~%" width height) (format 0 "Setting borderless/fullscreen size to ~D x ~D~%" width height)