X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=desktop%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fdesktop%2FDesktopLauncher.java;h=025beb484ed0e573abf795d267d3705feac6ee7b;hb=213d66fcddbc54faf262c3136be61fad9c35ffb0;hp=4551dce958cbeae0496e7f65636dcbe21d751b8a;hpb=ef32f2e88b9c0daa411d0c304ce62b1235541fb1;p=cavedroid.git

diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
index 4551dce..025beb4 100644
--- a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
+++ b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
@@ -1,24 +1,40 @@
 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;
 
 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 = 144;
-        config.title = "CaveDroid";
-		config.width = 960;
-		config.height = 540;
+		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;
+		String assetsPath = null;
+
 		for (String anArg : arg) {
-			if (anArg.equals("--touch")) touch = true;
+            if (anArg.equals("--touch")) {
+                touch = true;
+            }
+
+			if (anArg.startsWith("--assets")) {
+				String[] splitArg = anArg.split("=");
+				if (splitArg.length >= 2) {
+					assetsPath = splitArg[1];
+				}
+			}
 		}
-        new LwjglApplication(new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch), config);
+
+        new Lwjgl3Application(
+				new CaveGame(
+						System.getProperty("user.home") + "/.cavedroid",
+						touch,
+						assetsPath),
+				config
+		);
 	}
 }