diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index b3c1094d529..d141814051d 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -87,7 +87,7 @@ com.badlogicgames.gdx gdx-backend-android - 1.9.13 + 1.10.0 diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index dbebebeda91..7cf8b07aef3 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -68,7 +68,7 @@ com.badlogicgames.gdx gdx-backend-robovm - 1.9.13 + 1.10.0 diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index e909c6ff7cb..cf63e1454a7 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -59,19 +59,19 @@ com.badlogicgames.gdx - gdx-backend-lwjgl - 1.9.13 + gdx-backend-lwjgl3 + 1.10.0 com.badlogicgames.gdx gdx-platform - 1.9.13 + 1.10.0 natives-desktop com.badlogicgames.gdx gdx-freetype-platform - 1.9.13 + 1.10.0 natives-desktop diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index 849cdbf0bb5..299f240bc42 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -9,6 +9,7 @@ import java.io.OutputStream; import javax.imageio.ImageIO; +import com.badlogic.gdx.graphics.glutils.HdpiMode; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; @@ -17,9 +18,9 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.backends.lwjgl.LwjglApplication; -import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import com.badlogic.gdx.backends.lwjgl.LwjglClipboard; +import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; +import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; +import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Clipboard; import forge.Forge; import forge.assets.AssetsDownloader; @@ -85,8 +86,8 @@ public class Main { // Fullscreen width and height for desktop mode (desktopMode = true) // Can be specified inside the file fullscreen_resolution.ini to override default (in the format WxH, e.g. 1920x1080) - int desktopScreenWidth = LwjglApplicationConfiguration.getDesktopDisplayMode().width; - int desktopScreenHeight = LwjglApplicationConfiguration.getDesktopDisplayMode().height; + int desktopScreenWidth = Lwjgl3ApplicationConfiguration.getDisplayMode().width; + int desktopScreenHeight = Lwjgl3ApplicationConfiguration.getDisplayMode().height; boolean fullscreenFlag = true; if (FileUtil.doesFileExist(desktopModeAssetsDir + "screen_resolution.ini")) { res = FileUtil.readFileToString(desktopModeAssetsDir + "screen_resolution.ini").split("x"); @@ -97,17 +98,18 @@ public class Main { } } - LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); - config.resizable = false; - config.width = desktopMode ? desktopScreenWidth : screenWidth; - config.height = desktopMode ? desktopScreenHeight : screenHeight; - config.fullscreen = desktopMode && fullscreenFlag; - config.title = "Forge"; - config.useHDPI = desktopMode; // enable HiDPI on Mac OS + Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); + config.setResizable(false); + config.setWindowedMode(desktopMode ? desktopScreenWidth : screenWidth, desktopMode ? desktopScreenHeight : screenHeight); + if (desktopMode && fullscreenFlag) + config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode()); + config.setTitle("Forge"); + if (desktopMode) + config.setHdpiMode(HdpiMode.Logical); ForgePreferences prefs = FModel.getPreferences(); boolean propertyConfig = prefs != null && prefs.getPrefBoolean(ForgePreferences.FPref.UI_NETPLAY_COMPAT); - new LwjglApplication(Forge.getApp(new LwjglClipboard(), new DesktopAdapter(switchOrientationFile),//todo get totalRAM && isTabletDevice + new Lwjgl3Application(Forge.getApp(new Lwjgl3Clipboard(), new DesktopAdapter(switchOrientationFile),//todo get totalRAM && isTabletDevice desktopMode ? desktopModeAssetsDir : assetsDir, propertyConfig, false, 0, false, 0, "", ""), config); } diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 85dbd988e11..403aa275d2b 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -48,12 +48,12 @@ com.badlogicgames.gdx gdx - 1.9.13 + 1.10.0 com.badlogicgames.gdx gdx-freetype - 1.9.13 + 1.10.0 diff --git a/forge-gui-mobile/src/forge/Graphics.java b/forge-gui-mobile/src/forge/Graphics.java index 735cad4acc0..63dc73fa840 100644 --- a/forge-gui-mobile/src/forge/Graphics.java +++ b/forge-gui-mobile/src/forge/Graphics.java @@ -681,12 +681,11 @@ public class Graphics { batch.draw(image, adjustX(x), adjustY(y, h), w, h); } else { batch.end(); - shaderOutline.begin(); + shaderOutline.bind(); shaderOutline.setUniformf("u_viewportInverse", new Vector2(1f / w, 1f / h)); shaderOutline.setUniformf("u_offset", 3f); shaderOutline.setUniformf("u_step", Math.min(1f, w / 70f)); shaderOutline.setUniformf("u_color", new Vector3(glowColor.r, glowColor.g, glowColor.b)); - shaderOutline.end(); batch.setShader(shaderOutline); batch.begin(); //glow @@ -705,12 +704,11 @@ public class Graphics { batch.draw(image, adjustX(x), adjustY(yBox, h), w, h); } else { batch.end(); - shaderOutline.begin(); + shaderOutline.bind(); shaderOutline.setUniformf("u_viewportInverse", new Vector2(1f / w, 1f / h)); shaderOutline.setUniformf("u_offset", 3f); shaderOutline.setUniformf("u_step", Math.min(1f, w / 70f)); shaderOutline.setUniformf("u_color", new Vector3(glowColor.r, glowColor.g, glowColor.b)); - shaderOutline.end(); batch.setShader(shaderOutline); batch.begin(); //glow