diff --git a/build.gradle b/build.gradle index 38d2ad7a..43cfb46c 100644 --- a/build.gradle +++ b/build.gradle @@ -55,17 +55,7 @@ project(":demo4d-numberxd") { } } -project(":desktop") { - apply plugin: "java-library" - dependencies { - implementation project(":core") - api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" - api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" - api "games.spooky.gdx:gdx-nativefilechooser-desktop:$nativefilechooserVersion" - } -} - -project(":core") { +project(":demo4d-gdxapp") { apply plugin: "java-library" dependencies { //api "org.x4o:x4o-driver:$x4oVersion" @@ -79,3 +69,13 @@ project(":core") { api "games.spooky.gdx:gdx-nativefilechooser:$nativefilechooserVersion" } } + +project(":demo4d-gdxapp-desktop") { + apply plugin: "java-library" + dependencies { + implementation project(":demo4d-gdxapp") + api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" + api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" + api "games.spooky.gdx:gdx-nativefilechooser-desktop:$nativefilechooserVersion" + } +} diff --git a/core/build.gradle b/core/build.gradle deleted file mode 100644 index d1edc0c4..00000000 --- a/core/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -sourceCompatibility = appJvmCode -[compileJava, compileTestJava]*.options*.encoding = appEncoding - -sourceSets.main.java.srcDirs = [ "src/", "resources/" ] - -eclipse.project.name = appName + "-core" diff --git a/desktop/build.gradle b/demo4d-gdxapp-desktop/build.gradle similarity index 82% rename from desktop/build.gradle rename to demo4d-gdxapp-desktop/build.gradle index a88ecc95..6d164566 100644 --- a/desktop/build.gradle +++ b/demo4d-gdxapp-desktop/build.gradle @@ -1,11 +1,11 @@ sourceCompatibility = appJvmCode [compileJava, compileTestJava]*.options*.encoding = appEncoding -sourceSets.main.java.srcDirs = [ "src/" ] -sourceSets.main.resources.srcDirs = ["../core/assets"] +sourceSets.main.java.srcDirs = [ "src/main/"] +sourceSets.main.resources.srcDirs = ["../demo4d-gdxapp/assets"] project.ext.mainClassName = "love.distributedrebirth.demo4d.desktop.DesktopLauncher" -project.ext.assetsDir = new File("../core/assets") +project.ext.assetsDir = new File("../demo4d-gdxapp/assets") task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName @@ -35,7 +35,4 @@ task dist(type: Jar) { with jar } - dist.dependsOn classes - -eclipse.project.name = appName + "-desktop" diff --git a/desktop/src/love/distributedrebirth/demo4d/desktop/DesktopConfig.java b/demo4d-gdxapp-desktop/src/main/love/distributedrebirth/demo4d/desktop/DesktopConfig.java similarity index 100% rename from desktop/src/love/distributedrebirth/demo4d/desktop/DesktopConfig.java rename to demo4d-gdxapp-desktop/src/main/love/distributedrebirth/demo4d/desktop/DesktopConfig.java diff --git a/desktop/src/love/distributedrebirth/demo4d/desktop/DesktopLauncher.java b/demo4d-gdxapp-desktop/src/main/love/distributedrebirth/demo4d/desktop/DesktopLauncher.java similarity index 100% rename from desktop/src/love/distributedrebirth/demo4d/desktop/DesktopLauncher.java rename to demo4d-gdxapp-desktop/src/main/love/distributedrebirth/demo4d/desktop/DesktopLauncher.java diff --git a/core/assets/background/doom-credits.png b/demo4d-gdxapp/assets/background/doom-credits.png similarity index 100% rename from core/assets/background/doom-credits.png rename to demo4d-gdxapp/assets/background/doom-credits.png diff --git a/core/assets/background/temple-os.png b/demo4d-gdxapp/assets/background/temple-os.png similarity index 100% rename from core/assets/background/temple-os.png rename to demo4d-gdxapp/assets/background/temple-os.png diff --git a/core/assets/background/terrydavis-front.png b/demo4d-gdxapp/assets/background/terrydavis-front.png similarity index 100% rename from core/assets/background/terrydavis-front.png rename to demo4d-gdxapp/assets/background/terrydavis-front.png diff --git a/core/assets/background/terrydavis-nose.png b/demo4d-gdxapp/assets/background/terrydavis-nose.png similarity index 100% rename from core/assets/background/terrydavis-nose.png rename to demo4d-gdxapp/assets/background/terrydavis-nose.png diff --git a/core/assets/font/FreeSans.ttf b/demo4d-gdxapp/assets/font/FreeSans.ttf similarity index 100% rename from core/assets/font/FreeSans.ttf rename to demo4d-gdxapp/assets/font/FreeSans.ttf diff --git a/core/assets/font/NotoSansCJKjp-Medium.otf b/demo4d-gdxapp/assets/font/NotoSansCJKjp-Medium.otf similarity index 100% rename from core/assets/font/NotoSansCJKjp-Medium.otf rename to demo4d-gdxapp/assets/font/NotoSansCJKjp-Medium.otf diff --git a/core/assets/icon/window-128.png b/demo4d-gdxapp/assets/icon/window-128.png similarity index 100% rename from core/assets/icon/window-128.png rename to demo4d-gdxapp/assets/icon/window-128.png diff --git a/core/assets/icon/window-16.png b/demo4d-gdxapp/assets/icon/window-16.png similarity index 100% rename from core/assets/icon/window-16.png rename to demo4d-gdxapp/assets/icon/window-16.png diff --git a/core/assets/icon/window-32.png b/demo4d-gdxapp/assets/icon/window-32.png similarity index 100% rename from core/assets/icon/window-32.png rename to demo4d-gdxapp/assets/icon/window-32.png diff --git a/core/assets/music/idtech-doom-sigil.mp3 b/demo4d-gdxapp/assets/music/idtech-doom-sigil.mp3 similarity index 100% rename from core/assets/music/idtech-doom-sigil.mp3 rename to demo4d-gdxapp/assets/music/idtech-doom-sigil.mp3 diff --git a/core/assets/music/panoramacircle-waterfowl.mp3 b/demo4d-gdxapp/assets/music/panoramacircle-waterfowl.mp3 similarity index 100% rename from core/assets/music/panoramacircle-waterfowl.mp3 rename to demo4d-gdxapp/assets/music/panoramacircle-waterfowl.mp3 diff --git a/core/assets/music/sanctumwave-devine-intellect.mp3 b/demo4d-gdxapp/assets/music/sanctumwave-devine-intellect.mp3 similarity index 100% rename from core/assets/music/sanctumwave-devine-intellect.mp3 rename to demo4d-gdxapp/assets/music/sanctumwave-devine-intellect.mp3 diff --git a/core/assets/music/sanctumwave-nightwalk.mp3 b/demo4d-gdxapp/assets/music/sanctumwave-nightwalk.mp3 similarity index 100% rename from core/assets/music/sanctumwave-nightwalk.mp3 rename to demo4d-gdxapp/assets/music/sanctumwave-nightwalk.mp3 diff --git a/core/assets/music/sanctumwave-risen.mp3 b/demo4d-gdxapp/assets/music/sanctumwave-risen.mp3 similarity index 100% rename from core/assets/music/sanctumwave-risen.mp3 rename to demo4d-gdxapp/assets/music/sanctumwave-risen.mp3 diff --git a/core/assets/music/theselfhelpgroup-temple-os.mp3 b/demo4d-gdxapp/assets/music/theselfhelpgroup-temple-os.mp3 similarity index 100% rename from core/assets/music/theselfhelpgroup-temple-os.mp3 rename to demo4d-gdxapp/assets/music/theselfhelpgroup-temple-os.mp3 diff --git a/core/assets/shader/color.fragment.glsl b/demo4d-gdxapp/assets/shader/color.fragment.glsl similarity index 100% rename from core/assets/shader/color.fragment.glsl rename to demo4d-gdxapp/assets/shader/color.fragment.glsl diff --git a/core/assets/shader/color.vertex.glsl b/demo4d-gdxapp/assets/shader/color.vertex.glsl similarity index 100% rename from core/assets/shader/color.vertex.glsl rename to demo4d-gdxapp/assets/shader/color.vertex.glsl diff --git a/demo4d-gdxapp/build.gradle b/demo4d-gdxapp/build.gradle new file mode 100644 index 00000000..84a26470 --- /dev/null +++ b/demo4d-gdxapp/build.gradle @@ -0,0 +1,7 @@ +sourceCompatibility = appJvmCode +[compileJava, compileTestJava]*.options*.encoding = appEncoding + +sourceSets.main.java.srcDirs = [ "src/main/"] +sourceSets.main.resources.srcDirs = [ "src/resources/" ] +sourceSets.test.java.srcDirs = [ "src/test/"] +sourceSets.test.resources.srcDirs = [ "src/test-resources/" ] diff --git a/core/src/love/distributedrebirth/demo4d/Demo4DMain.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/Demo4DMain.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/Demo4DMain.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/Demo4DMain.java diff --git a/core/src/love/distributedrebirth/demo4d/Demo4DMainAdapter.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/Demo4DMainAdapter.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/Demo4DMainAdapter.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/Demo4DMainAdapter.java diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiRenderer.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/ImGuiRenderer.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/ImGuiRenderer.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/ImGuiRenderer.java diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiRendererMain.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/ImGuiRendererMain.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/ImGuiRendererMain.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/ImGuiRendererMain.java diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/ImGuiSetup.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/ImGuiSetup.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/ImGuiSetup.java diff --git a/core/src/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java diff --git a/core/src/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicManager.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicManager.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/music/MusicManager.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicManager.java diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicSong.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicSong.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/music/MusicSong.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicSong.java diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicSongType.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicSongType.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/music/MusicSongType.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/music/MusicSongType.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/BasePartRenderer.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/BasePartRenderer.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenCredits.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenCredits.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScreenCredits.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenCredits.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenDefault.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenDefault.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScreenDefault.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenDefault.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenHelp.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenHelp.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScreenHelp.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenHelp.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenIntro.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenIntro.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScreenIntro.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenIntro.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java b/demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java similarity index 100% rename from core/src/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java rename to demo4d-gdxapp/src/main/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java diff --git a/settings.gradle b/settings.gradle index 76962f73..29b96176 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'desktop', 'core', 'demo4d-bassboonyd', 'demo4d-numberxd' \ No newline at end of file +include 'demo4d-gdxapp-desktop', 'demo4d-gdxapp', 'demo4d-bassboonyd', 'demo4d-numberxd' \ No newline at end of file