From 8d1f78cb1db2f0460907d5213a31920c81dfd26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Sun, 31 Jan 2021 10:22:27 +0100 Subject: [PATCH] Split project to submodules --- .../world/tileset/manager/TileSetManager.java | 7 ---- {app => engine}/build.gradle | 17 ++++---- .../base/core/engine/DefaultGameEngine.java | 0 .../base/core/engine/GameEngine.java | 0 .../base/core/error/AppException.java | 0 .../core/gl/object/material/Material.java | 0 .../base/core/gl/object/mesh/Mesh.java | 0 .../object/texture/DefaultTextureManager.java | 0 .../base/core/gl/object/texture/Texture.java | 0 .../gl/object/texture/TextureManager.java | 0 .../base/core/gl/render/DefaultRenderer.java | 0 .../base/core/gl/render/Renderable.java | 0 .../base/core/gl/render/Renderer.java | 0 .../core/gl/shader/constant/UniformName.java | 0 .../shader/manager/DefaultShaderManager.java | 0 .../core/gl/shader/manager/ShaderManager.java | 0 .../core/gl/shader/program/ShaderProgram.java | 0 .../base/core/gl/shader/uniform/Uniform.java | 0 .../base/core/logic/GameLogic.java | 0 .../base/core/thread/ThreadManager.java | 0 .../base/core/time/ChronoMeter.java | 0 .../bartlomiejpluta/base/core/ui/Window.java | 0 .../base/core/ui/WindowManager.java | 0 .../base/core/util/res/ResourcesManager.java | 0 .../world}/animation/AnimationableObject.java | 2 +- .../base/core/world}/animation/Animator.java | 2 +- .../world}/animation/DefaultAnimator.java | 2 +- .../base/core/world/camera/Camera.java | 0 .../base/core}/world/map/GameMap.java | 4 +- .../base/core/world/object/Object.java | 0 .../core/world/object/RenderableObject.java | 0 .../base/core/world/scene/Scene.java | 2 +- .../manager/DefaultTileSetManager.java | 4 +- .../world/tileset/manager/TileSetManager.java | 7 ++++ .../base/core}/world/tileset/model/Tile.java | 2 +- .../core}/world/tileset/model/TileSet.java | 2 +- .../src/main/resources/shaders/default.fs | 0 .../src/main/resources/shaders/default.vs | 0 game/build.gradle | 39 +++++++++++++++++++ .../com/bartlomiejpluta/base/game}/App.java | 4 +- .../base/game/logic/DefaultGameLogic.java | 4 +- .../src/main/resources/application.yml | 0 app/gradle.properties => gradle.properties | 0 settings.gradle | 4 +- 44 files changed, 73 insertions(+), 29 deletions(-) delete mode 100755 app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/TileSetManager.java rename {app => engine}/build.gradle (95%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java (100%) rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core/world}/animation/AnimationableObject.java (91%) rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core/world}/animation/Animator.java (56%) rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core/world}/animation/DefaultAnimator.java (90%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java (100%) rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core}/world/map/GameMap.java (86%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java (100%) rename {app => engine}/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java (95%) rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core}/world/tileset/manager/DefaultTileSetManager.java (86%) create mode 100755 engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/TileSetManager.java rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core}/world/tileset/model/Tile.java (86%) rename {app/src/main/java/com/bartlomiejpluta/base/game => engine/src/main/java/com/bartlomiejpluta/base/core}/world/tileset/model/TileSet.java (92%) rename {app => engine}/src/main/resources/shaders/default.fs (100%) rename {app => engine}/src/main/resources/shaders/default.vs (100%) create mode 100755 game/build.gradle rename {app/src/main/java/com/bartlomiejpluta/base => game/src/main/java/com/bartlomiejpluta/base/game}/App.java (89%) rename {app => game}/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java (87%) rename {app => game}/src/main/resources/application.yml (100%) rename app/gradle.properties => gradle.properties (100%) diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/TileSetManager.java b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/TileSetManager.java deleted file mode 100755 index 7f81ea06..00000000 --- a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/TileSetManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bartlomiejpluta.base.game.world.tileset.manager; - -import com.bartlomiejpluta.base.game.world.tileset.model.TileSet; - -public interface TileSetManager { - TileSet createTileSet(String tileSetFileName, int rows, int columns); -} diff --git a/app/build.gradle b/engine/build.gradle similarity index 95% rename from app/build.gradle rename to engine/build.gradle index 7890be5d..ab5b6068 100755 --- a/app/build.gradle +++ b/engine/build.gradle @@ -9,7 +9,6 @@ plugins { id 'org.springframework.boot' version "$springBootVersion" id 'io.spring.dependency-management' version "$springDependencyManagementVersion" - id 'application' id 'java' } @@ -30,6 +29,7 @@ switch (OperatingSystem.current()) { break } + configurations { compileOnly { extendsFrom annotationProcessor @@ -41,6 +41,14 @@ repositories { jcenter() } +bootJar { + enabled = false +} + +jar { + enabled = true +} + dependencies { implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion") @@ -78,9 +86,4 @@ dependencies { // This dependency is used by the application. implementation "com.google.guava:guava:${guavaVersion}" implementation "org.joml:joml:${jomlVersion}" -} - -application { - // Define the main class for the application. - mainClass = 'com.bartlomiejpluta.base.App' -} +} \ No newline at end of file diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java b/engine/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java b/engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java b/engine/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java b/engine/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/animation/AnimationableObject.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/AnimationableObject.java similarity index 91% rename from app/src/main/java/com/bartlomiejpluta/base/game/animation/AnimationableObject.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/AnimationableObject.java index 85ce3677..15977a56 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/animation/AnimationableObject.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/AnimationableObject.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.game.animation; +package com.bartlomiejpluta.base.core.world.animation; import com.bartlomiejpluta.base.core.gl.object.material.Material; import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/animation/Animator.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/Animator.java similarity index 56% rename from app/src/main/java/com/bartlomiejpluta/base/game/animation/Animator.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/Animator.java index 14afa705..39e0152b 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/animation/Animator.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/Animator.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.game.animation; +package com.bartlomiejpluta.base.core.world.animation; public interface Animator { void animate(AnimationableObject[] objects); diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/animation/DefaultAnimator.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/DefaultAnimator.java similarity index 90% rename from app/src/main/java/com/bartlomiejpluta/base/game/animation/DefaultAnimator.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/DefaultAnimator.java index 022e824b..6411c3b7 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/animation/DefaultAnimator.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/DefaultAnimator.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.game.animation; +package com.bartlomiejpluta.base.core.world.animation; import org.springframework.stereotype.Component; diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/world/map/GameMap.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/map/GameMap.java similarity index 86% rename from app/src/main/java/com/bartlomiejpluta/base/game/world/map/GameMap.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/map/GameMap.java index f0aea4bd..4a818265 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/world/map/GameMap.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/map/GameMap.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.game.world.map; +package com.bartlomiejpluta.base.core.world.map; -import com.bartlomiejpluta.base.game.world.tileset.model.Tile; +import com.bartlomiejpluta.base.core.world.tileset.model.Tile; import lombok.Getter; import java.util.Arrays; diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java similarity index 100% rename from app/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java similarity index 95% rename from app/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java index 63214cfc..1319c877 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java @@ -6,7 +6,7 @@ import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager; import com.bartlomiejpluta.base.core.ui.Window; import com.bartlomiejpluta.base.core.world.camera.Camera; import com.bartlomiejpluta.base.core.world.object.RenderableObject; -import com.bartlomiejpluta.base.game.world.map.GameMap; +import com.bartlomiejpluta.base.core.world.map.GameMap; import lombok.AllArgsConstructor; import lombok.Setter; diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/DefaultTileSetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/DefaultTileSetManager.java similarity index 86% rename from app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/DefaultTileSetManager.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/DefaultTileSetManager.java index 5433a8a4..c7485b1b 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/DefaultTileSetManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/DefaultTileSetManager.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.game.world.tileset.manager; +package com.bartlomiejpluta.base.core.world.tileset.manager; import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager; -import com.bartlomiejpluta.base.game.world.tileset.model.TileSet; +import com.bartlomiejpluta.base.core.world.tileset.model.TileSet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/TileSetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/TileSetManager.java new file mode 100755 index 00000000..fa430da9 --- /dev/null +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/TileSetManager.java @@ -0,0 +1,7 @@ +package com.bartlomiejpluta.base.core.world.tileset.manager; + +import com.bartlomiejpluta.base.core.world.tileset.model.TileSet; + +public interface TileSetManager { + TileSet createTileSet(String tileSetFileName, int rows, int columns); +} diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/Tile.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/Tile.java similarity index 86% rename from app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/Tile.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/Tile.java index 60a5e773..0315aa97 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/Tile.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/Tile.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.game.world.tileset.model; +package com.bartlomiejpluta.base.core.world.tileset.model; import com.bartlomiejpluta.base.core.gl.object.material.Material; import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/TileSet.java b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/TileSet.java similarity index 92% rename from app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/TileSet.java rename to engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/TileSet.java index f9905627..a606399f 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/TileSet.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/TileSet.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.game.world.tileset.model; +package com.bartlomiejpluta.base.core.world.tileset.model; import com.bartlomiejpluta.base.core.gl.object.material.Material; import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; diff --git a/app/src/main/resources/shaders/default.fs b/engine/src/main/resources/shaders/default.fs similarity index 100% rename from app/src/main/resources/shaders/default.fs rename to engine/src/main/resources/shaders/default.fs diff --git a/app/src/main/resources/shaders/default.vs b/engine/src/main/resources/shaders/default.vs similarity index 100% rename from app/src/main/resources/shaders/default.vs rename to engine/src/main/resources/shaders/default.vs diff --git a/game/build.gradle b/game/build.gradle new file mode 100755 index 00000000..fec57f29 --- /dev/null +++ b/game/build.gradle @@ -0,0 +1,39 @@ +plugins { + id 'org.springframework.boot' version "$springBootVersion" + id 'io.spring.dependency-management' version "$springDependencyManagementVersion" + id 'java' + id 'application' +} + +group 'com.bartlomiejpluta.base' +version 'unspecified' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() + jcenter() +} + +dependencies { + implementation project(":engine") + + // Spring + implementation 'org.springframework.boot:spring-boot-starter' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + // This dependency is used by the application. + implementation "com.google.guava:guava:${guavaVersion}" + implementation "org.joml:joml:${jomlVersion}" +} + +application { + // Define the main class for the application. + mainClass = 'com.bartlomiejpluta.base.game.App' +} diff --git a/app/src/main/java/com/bartlomiejpluta/base/App.java b/game/src/main/java/com/bartlomiejpluta/base/game/App.java similarity index 89% rename from app/src/main/java/com/bartlomiejpluta/base/App.java rename to game/src/main/java/com/bartlomiejpluta/base/game/App.java index a387ef6c..dcc9042b 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/App.java +++ b/game/src/main/java/com/bartlomiejpluta/base/game/App.java @@ -1,7 +1,7 @@ /* * This Java source file was generated by the Gradle 'init' task. */ -package com.bartlomiejpluta.base; +package com.bartlomiejpluta.base.game; import com.bartlomiejpluta.base.core.engine.GameEngine; import lombok.RequiredArgsConstructor; @@ -13,7 +13,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @Slf4j -@SpringBootApplication +@SpringBootApplication(scanBasePackages = "com.bartlomiejpluta.base") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class App implements ApplicationRunner { private final GameEngine gameEngine; diff --git a/app/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java b/game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java similarity index 87% rename from app/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java rename to game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java index 55366bff..5015fecb 100755 --- a/app/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java +++ b/game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java @@ -5,8 +5,8 @@ import com.bartlomiejpluta.base.core.logic.GameLogic; import com.bartlomiejpluta.base.core.ui.Window; import com.bartlomiejpluta.base.core.world.camera.Camera; import com.bartlomiejpluta.base.core.world.scene.Scene; -import com.bartlomiejpluta.base.game.world.map.GameMap; -import com.bartlomiejpluta.base.game.world.tileset.manager.TileSetManager; +import com.bartlomiejpluta.base.core.world.map.GameMap; +import com.bartlomiejpluta.base.core.world.tileset.manager.TileSetManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/app/src/main/resources/application.yml b/game/src/main/resources/application.yml similarity index 100% rename from app/src/main/resources/application.yml rename to game/src/main/resources/application.yml diff --git a/app/gradle.properties b/gradle.properties similarity index 100% rename from app/gradle.properties rename to gradle.properties diff --git a/settings.gradle b/settings.gradle index ffc54302..94daf08a 100755 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,6 @@ */ rootProject.name = 'BASE' -include('app') +include('engine') +include('game') +