andrew
/
ace-of-shades-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed to start in fullscreen mode.

This commit is contained in:
Andrew Lalis 2022-07-16 13:27:24 +02:00
parent 3c49b42b23
commit e9a0874991
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/main/java/nl/andrewl/aos2_client/render/GameRenderer.java
View File

@ -37,7 +37,7 @@ public class GameRenderer {
private boolean fullscreen; private boolean fullscreen;
private int screenWidth = 800; private int screenWidth = 800;
private int screenHeight = 600; private int screenHeight = 600;
private float fov = 70f; private float fov = 90f;
private final Matrix4f perspectiveTransform; private final Matrix4f perspectiveTransform;
@ -57,12 +57,15 @@ public class GameRenderer {
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE); glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
primaryMonitorSettings = glfwGetVideoMode(glfwGetPrimaryMonitor()); long monitorId = glfwGetPrimaryMonitor();
primaryMonitorSettings = glfwGetVideoMode(monitorId);
if (primaryMonitorSettings == null) throw new IllegalStateException("Could not get information about the primary monitory."); if (primaryMonitorSettings == null) throw new IllegalStateException("Could not get information about the primary monitory.");
log.debug("Primary monitor settings: Width: {}, Height: {}", primaryMonitorSettings.width(), primaryMonitorSettings.height()); log.debug("Primary monitor settings: Width: {}, Height: {}", primaryMonitorSettings.width(), primaryMonitorSettings.height());
windowHandle = glfwCreateWindow(screenWidth, screenHeight, "Ace of Shades 2", 0, 0); screenWidth = primaryMonitorSettings.width();
screenHeight = primaryMonitorSettings.height();
windowHandle = glfwCreateWindow(screenWidth, screenHeight, "Ace of Shades 2", monitorId, 0);
if (windowHandle == 0) throw new RuntimeException("Failed to create GLFW window."); if (windowHandle == 0) throw new RuntimeException("Failed to create GLFW window.");
fullscreen = false; fullscreen = true;
log.debug("Initialized GLFW window."); log.debug("Initialized GLFW window.");
// Setup callbacks. // Setup callbacks.
@ -106,12 +109,14 @@ public class GameRenderer {
public void setFullscreen(boolean fullscreen) { public void setFullscreen(boolean fullscreen) {
if (windowHandle == 0) throw new IllegalStateException("Window not setup."); if (windowHandle == 0) throw new IllegalStateException("Window not setup.");
long monitor = glfwGetPrimaryMonitor(); long monitor = glfwGetPrimaryMonitor();
if (!this.fullscreen && fullscreen) { if (fullscreen) {
log.debug("Changing to fullscreen: {} x {}", primaryMonitorSettings.width(), primaryMonitorSettings.height());
glfwSetWindowMonitor(windowHandle, monitor, 0, 0, primaryMonitorSettings.width(), primaryMonitorSettings.height(), primaryMonitorSettings.refreshRate()); glfwSetWindowMonitor(windowHandle, monitor, 0, 0, primaryMonitorSettings.width(), primaryMonitorSettings.height(), primaryMonitorSettings.refreshRate());
screenWidth = primaryMonitorSettings.width(); screenWidth = primaryMonitorSettings.width();
screenHeight = primaryMonitorSettings.height(); screenHeight = primaryMonitorSettings.height();
updatePerspective(); updatePerspective();
} else if (this.fullscreen && !fullscreen) { } else {
log.debug("Changing to windowed mode.");
screenWidth = 800; screenWidth = 800;
screenHeight = 600; screenHeight = 600;
int left = primaryMonitorSettings.width() / 2; int left = primaryMonitorSettings.width() / 2;