diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | desktop/build.gradle | 2 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/Assets.java (renamed from core/src/ch/asynk/zproject/Assets.java) | 2 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java | 5 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/GameBoard.java (renamed from core/src/ch/asynk/zproject/GameBoard.java) | 2 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/GameHud.java (renamed from core/src/ch/asynk/zproject/GameHud.java) | 2 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/GameScreen.java (renamed from core/src/ch/asynk/zproject/GameScreen.java) | 2 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/GdxBoardTest.java (renamed from core/src/ch/asynk/zproject/GdxBoardTest.java) | 2 | ||||
| -rw-r--r-- | desktop/src/ch/asynk/zproject/desktop/LoadingScreen.java (renamed from core/src/ch/asynk/zproject/LoadingScreen.java) | 2 |
9 files changed, 10 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle index 759b698..b6cb934 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,7 @@ project(":desktop") { implementation project(":core") implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" + implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" } } @@ -44,7 +45,6 @@ project(":core") { dependencies { implementation "com.badlogicgames.gdx:gdx:$gdxVersion" - implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" } } diff --git a/desktop/build.gradle b/desktop/build.gradle index 8c4bc7f..8dde89f 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -5,7 +5,7 @@ apply plugin: "java" sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = [ "src/" ] -project.ext.mainClassName = "ch.asynk.gdx.board.desktop.DesktopLauncher" +project.ext.mainClassName = "ch.asynk.gdx.board.test.DesktopLauncher" project.ext.assetsDir = new File("build/assets"); task run(dependsOn: classes, type: JavaExec) { diff --git a/core/src/ch/asynk/zproject/Assets.java b/desktop/src/ch/asynk/zproject/desktop/Assets.java index 3673bf4..e89d2a9 100644 --- a/core/src/ch/asynk/zproject/Assets.java +++ b/desktop/src/ch/asynk/zproject/desktop/Assets.java @@ -1,4 +1,4 @@ -package ch.asynk.gdx.board; +package ch.asynk.gdx.board.test; import com.badlogic.gdx.assets.loaders.FileHandleResolver; import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver; diff --git a/desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java b/desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java index fbdd77c..0e14b17 100644 --- a/desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java +++ b/desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java @@ -1,13 +1,12 @@ -package ch.asynk.gdx.board.desktop; +package ch.asynk.gdx.board.test; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import ch.asynk.gdx.board.ZProject; public class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); - new LwjglApplication(new ZProject(), config); + new LwjglApplication(new GdxBoardTest(), config); config.width=800; config.height=600; } diff --git a/core/src/ch/asynk/zproject/GameBoard.java b/desktop/src/ch/asynk/zproject/desktop/GameBoard.java index b6f2331..a2343db 100644 --- a/core/src/ch/asynk/zproject/GameBoard.java +++ b/desktop/src/ch/asynk/zproject/desktop/GameBoard.java @@ -1,4 +1,4 @@ -package ch.asynk.gdx.board; +package ch.asynk.gdx.board.test; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.Texture; diff --git a/core/src/ch/asynk/zproject/GameHud.java b/desktop/src/ch/asynk/zproject/desktop/GameHud.java index 62a1046..d2c8649 100644 --- a/core/src/ch/asynk/zproject/GameHud.java +++ b/desktop/src/ch/asynk/zproject/desktop/GameHud.java @@ -1,4 +1,4 @@ -package ch.asynk.gdx.board; +package ch.asynk.gdx.board.test; import java.util.function.Supplier; diff --git a/core/src/ch/asynk/zproject/GameScreen.java b/desktop/src/ch/asynk/zproject/desktop/GameScreen.java index 4be7fae..253affa 100644 --- a/core/src/ch/asynk/zproject/GameScreen.java +++ b/desktop/src/ch/asynk/zproject/desktop/GameScreen.java @@ -1,4 +1,4 @@ -package ch.asynk.gdx.board; +package ch.asynk.gdx.board.test; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Screen; diff --git a/core/src/ch/asynk/zproject/GdxBoardTest.java b/desktop/src/ch/asynk/zproject/desktop/GdxBoardTest.java index 43ff6aa..03726f7 100644 --- a/core/src/ch/asynk/zproject/GdxBoardTest.java +++ b/desktop/src/ch/asynk/zproject/desktop/GdxBoardTest.java @@ -1,4 +1,4 @@ -package ch.asynk.gdx.board; +package ch.asynk.gdx.board.test; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; diff --git a/core/src/ch/asynk/zproject/LoadingScreen.java b/desktop/src/ch/asynk/zproject/desktop/LoadingScreen.java index 00c41c9..ee6ef2e 100644 --- a/core/src/ch/asynk/zproject/LoadingScreen.java +++ b/desktop/src/ch/asynk/zproject/desktop/LoadingScreen.java @@ -1,4 +1,4 @@ -package ch.asynk.gdx.board; +package ch.asynk.gdx.board.test; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Screen; |