X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=desktop%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fdesktop%2FDesktopLauncher.java;h=fe78235dd8fe5bc0ec937561b82ae1a9b4f6e87e;hb=c1fdecd8692e21b59a720eca1a3617cb5eb7c07f;hp=bdfdd7783b364bf16b91aee3f1d1d194c22f8619;hpb=0a855ca3c1d0c84de41a928cc99fd8544a933015;p=cavedroid.git

diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
index bdfdd77..fe78235 100644
--- a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
+++ b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
@@ -1,24 +1,42 @@
 package ru.deadsoftware.cavedroid.desktop;
 
 import com.badlogic.gdx.Files;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
 import ru.deadsoftware.cavedroid.CaveGame;
 
-public class DesktopLauncher {
-	public static void main (String[] arg) {
-		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
-		config.addIcon("icons/icon256.png", Files.FileType.Internal);
-		config.addIcon("icons/icon128.png", Files.FileType.Internal);
-		config.foregroundFPS = 60;
-        config.title = "CaveDroid";
-		config.width = 960;
-		config.height = 540;
-
-		boolean touch = false;
-		for (String anArg : arg) {
-			if (anArg.equals("--touch")) touch = true;
-		}
-        new LwjglApplication(new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch), config);
-	}
+class DesktopLauncher {
+    public static void main(String[] arg) {
+        Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
+        config.setWindowIcon(Files.FileType.Internal, "icons/icon256.png", "icons/icon128.png");
+        config.setTitle("CaveDroid");
+        config.setWindowedMode(960, 540);
+        config.useVsync(true);
+
+        boolean touch = false;
+        boolean debug = false;
+        String assetsPath = null;
+
+        for (String anArg : arg) {
+            if (anArg.equals("--touch")) {
+                touch = true;
+            }
+
+            if (anArg.equals("--debug")) {
+                debug = true;
+            }
+
+            if (anArg.startsWith("--assets")) {
+                String[] splitArg = anArg.split("=");
+                if (splitArg.length >= 2) {
+                    assetsPath = splitArg[1];
+                }
+            }
+        }
+
+        CaveGame caveGame = new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch, assetsPath);
+        caveGame.setDebug(debug);
+
+        new Lwjgl3Application(caveGame, config);
+    }
 }