From d3fe2e2bc6918151e1ed36bbcf0824a68de73fa1 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 19 Feb 2024 21:04:37 +0900 Subject: [PATCH] trying to debug why fullscreen is borked on macOS --- src/net/torvald/terrarum/App.java | 4 ++-- .../torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 065c3a74b..bf5b58dac 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -442,12 +442,12 @@ public class App implements ApplicationListener { if (useFullscreen) { // auto resize for fullscreen - var disp = Lwjgl3ApplicationConfiguration.getDisplayMode(); + var disp = Lwjgl3ApplicationConfiguration.getDisplayMode(Lwjgl3ApplicationConfiguration.getPrimaryMonitor()); var newWidth = ((int)(disp.width / magn)) & 0x7FFFFFFE; var newHeight = ((int)(disp.height / magn)) & 0x7FFFFFFE; scr.setDimension(newWidth, newHeight, magn); - appConfig.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode()); + appConfig.setFullscreenMode(disp); } else diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt index d1f10df8c..cf1650983 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt @@ -9,6 +9,7 @@ import net.torvald.terrarum.CreditSingleton import net.torvald.terrarum.ceilToInt import net.torvald.terrarum.ui.* import java.util.TreeMap +import kotlin.math.roundToInt open class UITitleWallOfText(private val text: List) : UICanvas() { init { @@ -95,6 +96,7 @@ class UISystemInfo(val remoCon: UIRemoCon) : UICanvas() { v.add("Gdx" to com.badlogic.gdx.Version.VERSION) v.add("LWJGL" to "${org.lwjgl.Version.VERSION_MAJOR}.${org.lwjgl.Version.VERSION_MINOR}.${org.lwjgl.Version.VERSION_REVISION}") v.add("OS" to "${App.OSName} ${App.OSVersion}") + v.add("Display" to "${App.scr.width}\u00D7${App.scr.height}@${App.scr.magn.times(100).roundToInt()}%") v.add("Processor" to "${App.THREAD_COUNT}\u2009\u00D7\u2009${App.processor}") v.add("Architecture" to App.systemArch) v.add("CPUID" to App.processorVendor.let { if (it == "null" || it == null) "n/a" else it })