mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-24 01:41:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with camera movement with controller when mouse tracking is also enabled (#3409)

Browse Source 
Fixes #3408
This commit is contained in:
Tyler Wilding
2024-03-07 23:35:38 -05:00
committed by GitHub
parent a80f4e7cca
commit 0626862a8c
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/system/hid/display_manager.cpp
+5
View File
@@ -202,6 +202,7 @@ void DisplayManager::set_window_display_mode(WindowDisplayMode mode) {
case WindowDisplayMode::Windowed:
result = SDL_SetWindowFullscreen(m_window, 0);
if (result == 0) {
lg::info("windowed mode - resizing window to {}x{}", m_window_width, m_window_height);
SDL_SetWindowSize(m_window, m_window_width, m_window_height);
} else {
sdl_util::log_error("unable to change window to windowed mode");
@@ -219,6 +220,8 @@ void DisplayManager::set_window_display_mode(WindowDisplayMode mode) {
m_selected_fullscreen_display_id));
} else {
// 2. move it to the right monitor
lg::info("preparing fullscreen - moving window to {},{} on display id {}",
display_bounds.x + 50, display_bounds.y + 50, m_selected_fullscreen_display_id);
SDL_SetWindowPosition(m_window, display_bounds.x + 50, display_bounds.y + 50);
if (mode == WindowDisplayMode::Fullscreen) {
update_video_modes();
@@ -227,6 +230,8 @@ void DisplayManager::set_window_display_mode(WindowDisplayMode mode) {
// Some people are weird and don't use the monitor's maximum supported resolution
// in which case, we use what the user actually has selected.
const auto& display_res = m_current_display_modes.at(m_selected_fullscreen_display_id);
lg::info("preparing fullscreen - setting window resolution to {}x{}",
display_res.screen_width, display_res.screen_height);
set_window_size(display_res.screen_width, display_res.screen_height);
}
// 3. fullscreen it!