LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0: switched desktop module to use lwjgl3 backend

Browse Source
This commit is contained in:
Evan Debenham 2019-10-28 20:58:29 -04:00
parent 8fe1b5979b
commit 4f430015c3
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/build.gradle
View File

@ -33,7 +33,7 @@ dependencies {
implementation project(':core') implementation project(':core')
implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
} }

51
desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
View File

@ -23,14 +23,14 @@ package com.shatteredpixel.shatteredpixeldungeon.desktop;
import com.badlogic.gdx.Files; import com.badlogic.gdx.Files;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.badlogic.gdx.backends.lwjgl.LwjglPreferences; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Preferences;
import com.badlogic.gdx.utils.SharedLibraryLoader; import com.badlogic.gdx.utils.SharedLibraryLoader;
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.utils.FileUtils; import com.watabou.utils.FileUtils;
import com.watabou.utils.GameSettings;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
@ -40,7 +40,12 @@ import javax.swing.JOptionPane;
public class DesktopLauncher { public class DesktopLauncher {
public static void main (String[] arg) { public static void main (String[] arg) {
final LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); final String title;
if (DesktopLauncher.class.getPackage().getSpecificationTitle() == null){
title = System.getProperty("Specification-Title");
} else {
title = DesktopLauncher.class.getPackage().getSpecificationTitle();
}
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override @Override
@ -49,18 +54,13 @@ public class DesktopLauncher {
PrintWriter pw = new PrintWriter(sw); PrintWriter pw = new PrintWriter(sw);
throwable.printStackTrace(pw); throwable.printStackTrace(pw);
pw.flush(); pw.flush();
JOptionPane.showMessageDialog(null, config.title + " has crashed, sorry about that!\n\n" + JOptionPane.showMessageDialog(null, title + " has run into an error it can't recover from and has crashed, sorry about that!\n\n" +
"If you could, please email this error message to me and I'll get it fixed (Evan@ShatteredPixel.com):\n\n" + "If you could, please email this error message to the developer (Evan@ShatteredPixel.com):\n\n" +
sw.toString(), "Game Crash!", JOptionPane.ERROR_MESSAGE); sw.toString(), title + " Has Crashed!", JOptionPane.ERROR_MESSAGE);
Gdx.app.exit(); Gdx.app.exit();
} }
}); });
config.title = DesktopLauncher.class.getPackage().getSpecificationTitle();
if (config.title == null) {
config.title = System.getProperty("Specification-Title");
}
Game.version = DesktopLauncher.class.getPackage().getSpecificationVersion(); Game.version = DesktopLauncher.class.getPackage().getSpecificationVersion();
if (Game.version == null) { if (Game.version == null) {
Game.version = System.getProperty("Specification-Version"); Game.version = System.getProperty("Specification-Version");
@ -72,30 +72,31 @@ public class DesktopLauncher {
Game.versionCode = Integer.parseInt(System.getProperty("Implementation-Version")); Game.versionCode = Integer.parseInt(System.getProperty("Implementation-Version"));
} }
config.width = 1920; Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
config.height = 1080;
//uncapped (but vsynced) framerate when focused, paused when not focused config.setTitle( title );
config.foregroundFPS = 0;
config.backgroundFPS = -1;
//TODO this is currently the same location and filenames as the old desktop codebase //TODO this is currently the same location and filenames as the old desktop codebase
// If I want to move it now would be the time // If I want to move it now would be the time
String basePath = "";
if (SharedLibraryLoader.isWindows) { if (SharedLibraryLoader.isWindows) {
if (System.getProperties().getProperty("os.name").equals("Windows XP")) { if (System.getProperties().getProperty("os.name").equals("Windows XP")) {
config.preferencesDirectory = "Application Data/.shatteredpixel/Shattered Pixel Dungeon/"; basePath = "Application Data/.shatteredpixel/Shattered Pixel Dungeon/";
} else { } else {
config.preferencesDirectory = "AppData/Roaming/.shatteredpixel/Shattered Pixel Dungeon/"; basePath = "AppData/Roaming/.shatteredpixel/Shattered Pixel Dungeon/";
} }
} else if (SharedLibraryLoader.isMac) { } else if (SharedLibraryLoader.isMac) {
config.preferencesDirectory = "Library/Application Support/Shattered Pixel Dungeon/"; basePath = "Library/Application Support/Shattered Pixel Dungeon/";
} else if (SharedLibraryLoader.isLinux) { } else if (SharedLibraryLoader.isLinux) {
config.preferencesDirectory = ".shatteredpixel/shattered-pixel-dungeon/"; basePath = ".shatteredpixel/shattered-pixel-dungeon/";
} }
GameSettings.set( new LwjglPreferences( "pd-prefs", config.preferencesDirectory) ); config.setPreferencesConfig( basePath, Files.FileType.External );
SPDSettings.set( new Lwjgl3Preferences( "pd-prefs", basePath) );
FileUtils.setDefaultFileProperties( Files.FileType.External, basePath );
FileUtils.setDefaultFileProperties( Files.FileType.External, config.preferencesDirectory ); config.setWindowSizeLimits( 800, 450, -1, -1 );
config.setWindowedMode( 1920, 1080 );
new LwjglApplication(new ShatteredPixelDungeon(new DesktopPlatformSupport()), config); new Lwjgl3Application(new ShatteredPixelDungeon(new DesktopPlatformSupport()), config);
} }
} }