diff --git a/app/build.gradle b/app/build.gradle index 29c9e67c..7890be5d 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,5 +82,5 @@ dependencies { application { // Define the main class for the application. - mainClass = 'com.bartlomiejpluta.samplegame.App' + mainClass = 'com.bartlomiejpluta.base.App' } diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/App.java b/app/src/main/java/com/bartlomiejpluta/base/App.java similarity index 89% rename from app/src/main/java/com/bartlomiejpluta/samplegame/App.java rename to app/src/main/java/com/bartlomiejpluta/base/App.java index 302e45c7..a387ef6c 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/App.java +++ b/app/src/main/java/com/bartlomiejpluta/base/App.java @@ -1,9 +1,9 @@ /* * This Java source file was generated by the Gradle 'init' task. */ -package com.bartlomiejpluta.samplegame; +package com.bartlomiejpluta.base; -import com.bartlomiejpluta.samplegame.core.engine.GameEngine; +import com.bartlomiejpluta.base.core.engine.GameEngine; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/engine/DefaultGameEngine.java b/app/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java similarity index 84% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/engine/DefaultGameEngine.java rename to app/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java index f99467bf..a69c3c0d 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/engine/DefaultGameEngine.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.samplegame.core.engine; +package com.bartlomiejpluta.base.core.engine; -import com.bartlomiejpluta.samplegame.core.logic.GameLogic; -import com.bartlomiejpluta.samplegame.core.thread.ThreadManager; -import com.bartlomiejpluta.samplegame.core.time.ChronoMeter; -import com.bartlomiejpluta.samplegame.core.ui.Window; -import com.bartlomiejpluta.samplegame.core.ui.WindowManager; +import com.bartlomiejpluta.base.core.logic.GameLogic; +import com.bartlomiejpluta.base.core.thread.ThreadManager; +import com.bartlomiejpluta.base.core.time.ChronoMeter; +import com.bartlomiejpluta.base.core.ui.Window; +import com.bartlomiejpluta.base.core.ui.WindowManager; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java b/app/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java new file mode 100755 index 00000000..a993c243 --- /dev/null +++ b/app/src/main/java/com/bartlomiejpluta/base/core/engine/GameEngine.java @@ -0,0 +1,5 @@ +package com.bartlomiejpluta.base.core.engine; + +public interface GameEngine { + void start(); +} diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/error/AppException.java b/app/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java similarity index 88% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/error/AppException.java rename to app/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java index 70736592..ab3e5902 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/error/AppException.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/error/AppException.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.error; +package com.bartlomiejpluta.base.core.error; public class AppException extends RuntimeException { public AppException() { diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/material/Material.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java similarity index 89% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/material/Material.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java index c53940d7..7631e974 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/material/Material.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/material/Material.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.gl.object.material; +package com.bartlomiejpluta.base.core.gl.object.material; -import com.bartlomiejpluta.samplegame.core.gl.object.texture.Texture; +import com.bartlomiejpluta.base.core.gl.object.texture.Texture; import lombok.Getter; import org.joml.Vector2f; import org.joml.Vector4f; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/mesh/Mesh.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java similarity index 85% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/mesh/Mesh.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java index ceb7e239..5a3cc5f0 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/mesh/Mesh.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java @@ -1,12 +1,8 @@ -package com.bartlomiejpluta.samplegame.core.gl.object.mesh; +package com.bartlomiejpluta.base.core.gl.object.mesh; -import com.bartlomiejpluta.samplegame.core.gl.object.material.Material; -import com.bartlomiejpluta.samplegame.core.gl.render.Renderable; -import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager; -import com.bartlomiejpluta.samplegame.core.ui.Window; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; +import com.bartlomiejpluta.base.core.gl.render.Renderable; +import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager; +import com.bartlomiejpluta.base.core.ui.Window; import org.lwjgl.opengl.GL15; import org.lwjgl.system.MemoryStack; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/DefaultTextureManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java similarity index 84% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/DefaultTextureManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java index 5f8b8904..021d3a46 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/DefaultTextureManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.gl.object.texture; +package com.bartlomiejpluta.base.core.gl.object.texture; -import com.bartlomiejpluta.samplegame.core.util.res.ResourcesManager; +import com.bartlomiejpluta.base.core.util.res.ResourcesManager; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/Texture.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java similarity index 87% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/Texture.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java index 8d8143ac..a106d38f 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/Texture.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.gl.object.texture; +package com.bartlomiejpluta.base.core.gl.object.texture; -import com.bartlomiejpluta.samplegame.core.error.AppException; +import com.bartlomiejpluta.base.core.error.AppException; import lombok.Getter; import org.lwjgl.system.MemoryStack; @@ -9,7 +9,6 @@ import java.nio.ByteBuffer; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL13.GL_TEXTURE0; import static org.lwjgl.opengl.GL13.glActiveTexture; -import static org.lwjgl.opengl.GL30.glGenerateMipmap; import static org.lwjgl.stb.STBImage.stbi_failure_reason; import static org.lwjgl.stb.STBImage.stbi_load_from_memory; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/TextureManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java similarity index 55% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/TextureManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java index ce5316eb..f896df17 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/object/texture/TextureManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.gl.object.texture; +package com.bartlomiejpluta.base.core.gl.object.texture; public interface TextureManager { Texture loadTexture(String textureFileName); diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/DefaultRenderer.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java similarity index 84% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/DefaultRenderer.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java index b5f12261..0d1bb710 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/DefaultRenderer.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.samplegame.core.gl.render; +package com.bartlomiejpluta.base.core.gl.render; -import com.bartlomiejpluta.samplegame.core.gl.shader.constant.UniformName; -import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager; -import com.bartlomiejpluta.samplegame.core.ui.Window; +import com.bartlomiejpluta.base.core.gl.shader.constant.UniformName; +import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager; +import com.bartlomiejpluta.base.core.ui.Window; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java new file mode 100755 index 00000000..d3fb962a --- /dev/null +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java @@ -0,0 +1,9 @@ +package com.bartlomiejpluta.base.core.gl.render; + +import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager; +import com.bartlomiejpluta.base.core.ui.Window; + +public interface Renderable { + void render(Window window, ShaderManager shaderManager); + void cleanUp(); +} diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderer.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java similarity index 50% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderer.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java index d64d670d..f8f8c514 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderer.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.gl.render; +package com.bartlomiejpluta.base.core.gl.render; -import com.bartlomiejpluta.samplegame.core.ui.Window; +import com.bartlomiejpluta.base.core.ui.Window; public interface Renderer { void init(); diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/constant/UniformName.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java similarity index 84% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/constant/UniformName.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java index c8b82de1..6638bc68 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/constant/UniformName.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/constant/UniformName.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.gl.shader.constant; +package com.bartlomiejpluta.base.core.gl.shader.constant; public interface UniformName { String UNI_MODEL_MATRIX = "modelMatrix"; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/manager/DefaultShaderManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java similarity index 90% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/manager/DefaultShaderManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java index aa99d608..241a2e66 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/manager/DefaultShaderManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.samplegame.core.gl.shader.manager; +package com.bartlomiejpluta.base.core.gl.shader.manager; -import com.bartlomiejpluta.samplegame.core.util.res.ResourcesManager; -import com.bartlomiejpluta.samplegame.core.gl.shader.program.ShaderProgram; -import com.bartlomiejpluta.samplegame.core.gl.shader.uniform.Uniform; +import com.bartlomiejpluta.base.core.gl.shader.program.ShaderProgram; +import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform; +import com.bartlomiejpluta.base.core.util.res.ResourcesManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.joml.*; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/manager/ShaderManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java similarity index 88% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/manager/ShaderManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java index b5226d0d..e000245f 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/manager/ShaderManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.gl.shader.manager; +package com.bartlomiejpluta.base.core.gl.shader.manager; -import com.bartlomiejpluta.samplegame.core.gl.shader.uniform.Uniform; +import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform; import org.joml.*; public interface ShaderManager { diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/program/ShaderProgram.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java similarity index 93% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/program/ShaderProgram.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java index db983f1f..e17844b8 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/program/ShaderProgram.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.samplegame.core.gl.shader.program; +package com.bartlomiejpluta.base.core.gl.shader.program; -import com.bartlomiejpluta.samplegame.core.error.AppException; -import com.bartlomiejpluta.samplegame.core.gl.shader.uniform.Uniform; +import com.bartlomiejpluta.base.core.error.AppException; +import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform; import lombok.extern.slf4j.Slf4j; import org.joml.*; import org.lwjgl.system.MemoryStack; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/uniform/Uniform.java b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java similarity index 53% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/uniform/Uniform.java rename to app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java index 080fcf57..8cb8fcdf 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/shader/uniform/Uniform.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/gl/shader/uniform/Uniform.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.gl.shader.uniform; +package com.bartlomiejpluta.base.core.gl.shader.uniform; -import com.bartlomiejpluta.samplegame.core.gl.shader.program.ShaderProgram; +import com.bartlomiejpluta.base.core.gl.shader.program.ShaderProgram; public interface Uniform { void createUniform(ShaderProgram shaderProgram, String uniformName); diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/logic/GameLogic.java b/app/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java similarity index 58% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/logic/GameLogic.java rename to app/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java index abeb969e..c45c030f 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/logic/GameLogic.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.logic; +package com.bartlomiejpluta.base.core.logic; -import com.bartlomiejpluta.samplegame.core.ui.Window; +import com.bartlomiejpluta.base.core.ui.Window; public interface GameLogic { void init(Window window); diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/thread/ThreadManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java similarity index 76% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/thread/ThreadManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java index 870952ae..3b3b9c29 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/thread/ThreadManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/thread/ThreadManager.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.thread; +package com.bartlomiejpluta.base.core.thread; import org.springframework.stereotype.Component; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/time/ChronoMeter.java b/app/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java similarity index 84% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/time/ChronoMeter.java rename to app/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java index 61b0a4e8..52db247b 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/time/ChronoMeter.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/time/ChronoMeter.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.time; +package com.bartlomiejpluta.base.core.time; public class ChronoMeter { private double latchedTime; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/ui/Window.java b/app/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java similarity index 92% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/ui/Window.java rename to app/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java index b2c46a03..19fa6785 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/ui/Window.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/ui/Window.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.ui; +package com.bartlomiejpluta.base.core.ui; -import com.bartlomiejpluta.samplegame.core.error.AppException; +import com.bartlomiejpluta.base.core.error.AppException; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL; import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL11.GL_DEPTH_TEST; import static org.lwjgl.system.MemoryUtil.NULL; @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/ui/WindowManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java similarity index 78% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/ui/WindowManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java index 1785c448..f0bd4fd5 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/ui/WindowManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/ui/WindowManager.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.ui; +package com.bartlomiejpluta.base.core.ui; import org.springframework.stereotype.Component; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/util/res/ResourcesManager.java b/app/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java similarity index 82% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/util/res/ResourcesManager.java rename to app/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java index 211905fc..f3187768 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/util/res/ResourcesManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/util/res/ResourcesManager.java @@ -1,7 +1,6 @@ -package com.bartlomiejpluta.samplegame.core.util.res; +package com.bartlomiejpluta.base.core.util.res; -import com.bartlomiejpluta.samplegame.core.error.AppException; -import com.bartlomiejpluta.samplegame.core.gl.object.texture.Texture; +import com.bartlomiejpluta.base.core.error.AppException; import org.springframework.stereotype.Component; import java.io.IOException; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/camera/Camera.java b/app/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java similarity index 72% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/world/camera/Camera.java rename to app/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java index 85fb6401..9923dcb0 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/camera/Camera.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/world/camera/Camera.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.samplegame.core.world.camera; +package com.bartlomiejpluta.base.core.world.camera; -import com.bartlomiejpluta.samplegame.core.ui.Window; -import com.bartlomiejpluta.samplegame.core.world.object.Object; +import com.bartlomiejpluta.base.core.ui.Window; +import com.bartlomiejpluta.base.core.world.object.Object; import org.joml.Matrix4f; public class Camera extends Object { diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/Object.java b/app/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java similarity index 91% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/Object.java rename to app/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java index c93a2325..90dbc415 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/Object.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/world/object/Object.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.core.world.object; +package com.bartlomiejpluta.base.core.world.object; import lombok.Getter; import lombok.Setter; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/RenderableObject.java b/app/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java similarity index 55% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/RenderableObject.java rename to app/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java index 54299fe5..892394de 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/object/RenderableObject.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.samplegame.core.world.object; +package com.bartlomiejpluta.base.core.world.object; -import com.bartlomiejpluta.samplegame.core.gl.object.material.Material; -import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh; -import com.bartlomiejpluta.samplegame.core.gl.render.Renderable; -import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager; -import com.bartlomiejpluta.samplegame.core.ui.Window; +import com.bartlomiejpluta.base.core.gl.object.material.Material; +import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; +import com.bartlomiejpluta.base.core.gl.render.Renderable; +import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager; +import com.bartlomiejpluta.base.core.ui.Window; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/scene/Scene.java b/app/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java similarity index 75% rename from app/src/main/java/com/bartlomiejpluta/samplegame/core/world/scene/Scene.java rename to app/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java index d03f87cf..63214cfc 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/world/scene/Scene.java +++ b/app/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java @@ -1,12 +1,12 @@ -package com.bartlomiejpluta.samplegame.core.world.scene; +package com.bartlomiejpluta.base.core.world.scene; -import com.bartlomiejpluta.samplegame.core.gl.render.Renderable; -import com.bartlomiejpluta.samplegame.core.gl.shader.constant.UniformName; -import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager; -import com.bartlomiejpluta.samplegame.core.ui.Window; -import com.bartlomiejpluta.samplegame.core.world.camera.Camera; -import com.bartlomiejpluta.samplegame.core.world.object.RenderableObject; -import com.bartlomiejpluta.samplegame.game.world.map.GameMap; +import com.bartlomiejpluta.base.core.gl.render.Renderable; +import com.bartlomiejpluta.base.core.gl.shader.constant.UniformName; +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 lombok.AllArgsConstructor; import lombok.Setter; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/AnimationableObject.java b/app/src/main/java/com/bartlomiejpluta/base/game/animation/AnimationableObject.java similarity index 68% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/AnimationableObject.java rename to app/src/main/java/com/bartlomiejpluta/base/game/animation/AnimationableObject.java index 37df3b57..85ce3677 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/AnimationableObject.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/animation/AnimationableObject.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.samplegame.game.animation; +package com.bartlomiejpluta.base.game.animation; -import com.bartlomiejpluta.samplegame.core.gl.object.material.Material; -import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh; -import com.bartlomiejpluta.samplegame.core.world.object.RenderableObject; +import com.bartlomiejpluta.base.core.gl.object.material.Material; +import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; +import com.bartlomiejpluta.base.core.world.object.RenderableObject; import org.joml.Vector2f; import org.joml.Vector2i; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/Animator.java b/app/src/main/java/com/bartlomiejpluta/base/game/animation/Animator.java similarity index 56% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/Animator.java rename to app/src/main/java/com/bartlomiejpluta/base/game/animation/Animator.java index d7b921d1..14afa705 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/Animator.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/animation/Animator.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.samplegame.game.animation; +package com.bartlomiejpluta.base.game.animation; public interface Animator { void animate(AnimationableObject[] objects); diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/DefaultAnimator.java b/app/src/main/java/com/bartlomiejpluta/base/game/animation/DefaultAnimator.java similarity index 85% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/DefaultAnimator.java rename to app/src/main/java/com/bartlomiejpluta/base/game/animation/DefaultAnimator.java index 825c60ef..022e824b 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/animation/DefaultAnimator.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/animation/DefaultAnimator.java @@ -1,6 +1,5 @@ -package com.bartlomiejpluta.samplegame.game.animation; +package com.bartlomiejpluta.base.game.animation; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @Component diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/logic/DefaultGameLogic.java b/app/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java similarity index 62% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/logic/DefaultGameLogic.java rename to app/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java index 00cf4d21..55366bff 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/logic/DefaultGameLogic.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java @@ -1,12 +1,12 @@ -package com.bartlomiejpluta.samplegame.game.logic; +package com.bartlomiejpluta.base.game.logic; -import com.bartlomiejpluta.samplegame.core.gl.render.Renderer; -import com.bartlomiejpluta.samplegame.core.logic.GameLogic; -import com.bartlomiejpluta.samplegame.core.ui.Window; -import com.bartlomiejpluta.samplegame.core.world.camera.Camera; -import com.bartlomiejpluta.samplegame.core.world.scene.Scene; -import com.bartlomiejpluta.samplegame.game.world.map.GameMap; -import com.bartlomiejpluta.samplegame.game.world.tileset.manager.TileSetManager; +import com.bartlomiejpluta.base.core.gl.render.Renderer; +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 lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/map/GameMap.java b/app/src/main/java/com/bartlomiejpluta/base/game/world/map/GameMap.java similarity index 85% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/world/map/GameMap.java rename to app/src/main/java/com/bartlomiejpluta/base/game/world/map/GameMap.java index 1646bad9..f0aea4bd 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/map/GameMap.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/world/map/GameMap.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.samplegame.game.world.map; +package com.bartlomiejpluta.base.game.world.map; -import com.bartlomiejpluta.samplegame.game.world.tileset.model.Tile; +import com.bartlomiejpluta.base.game.world.tileset.model.Tile; import lombok.Getter; import java.util.Arrays; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/manager/DefaultTileSetManager.java b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/DefaultTileSetManager.java similarity index 78% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/manager/DefaultTileSetManager.java rename to app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/DefaultTileSetManager.java index b74ac3c8..5433a8a4 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/manager/DefaultTileSetManager.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/DefaultTileSetManager.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.samplegame.game.world.tileset.manager; +package com.bartlomiejpluta.base.game.world.tileset.manager; -import com.bartlomiejpluta.samplegame.core.gl.object.texture.TextureManager; -import com.bartlomiejpluta.samplegame.game.world.tileset.model.TileSet; +import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager; +import com.bartlomiejpluta.base.game.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/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 new file mode 100755 index 00000000..7f81ea06 --- /dev/null +++ b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/TileSetManager.java @@ -0,0 +1,7 @@ +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/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/model/Tile.java b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/Tile.java similarity index 51% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/model/Tile.java rename to app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/Tile.java index 5701bd99..60a5e773 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/model/Tile.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/Tile.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.samplegame.game.world.tileset.model; +package com.bartlomiejpluta.base.game.world.tileset.model; -import com.bartlomiejpluta.samplegame.core.gl.object.material.Material; -import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh; -import com.bartlomiejpluta.samplegame.core.world.object.RenderableObject; +import com.bartlomiejpluta.base.core.gl.object.material.Material; +import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; +import com.bartlomiejpluta.base.core.world.object.RenderableObject; import lombok.Getter; @Getter diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/model/TileSet.java b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/TileSet.java similarity index 71% rename from app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/model/TileSet.java rename to app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/TileSet.java index 0829def9..f9905627 100755 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/model/TileSet.java +++ b/app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/model/TileSet.java @@ -1,9 +1,8 @@ -package com.bartlomiejpluta.samplegame.game.world.tileset.model; +package com.bartlomiejpluta.base.game.world.tileset.model; -import com.bartlomiejpluta.samplegame.core.gl.object.material.Material; -import com.bartlomiejpluta.samplegame.core.gl.object.mesh.Mesh; -import com.bartlomiejpluta.samplegame.core.gl.object.texture.Texture; -import com.bartlomiejpluta.samplegame.core.world.object.RenderableObject; +import com.bartlomiejpluta.base.core.gl.object.material.Material; +import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh; +import com.bartlomiejpluta.base.core.gl.object.texture.Texture; public class TileSet { private final Texture texture; diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/engine/GameEngine.java b/app/src/main/java/com/bartlomiejpluta/samplegame/core/engine/GameEngine.java deleted file mode 100755 index 9707820f..00000000 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/engine/GameEngine.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.bartlomiejpluta.samplegame.core.engine; - -public interface GameEngine { - void start(); -} diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderable.java b/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderable.java deleted file mode 100755 index 64576e4c..00000000 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/core/gl/render/Renderable.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bartlomiejpluta.samplegame.core.gl.render; - -import com.bartlomiejpluta.samplegame.core.gl.shader.manager.ShaderManager; -import com.bartlomiejpluta.samplegame.core.ui.Window; - -public interface Renderable { - void render(Window window, ShaderManager shaderManager); - void cleanUp(); -} diff --git a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/manager/TileSetManager.java b/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/manager/TileSetManager.java deleted file mode 100755 index 919afea1..00000000 --- a/app/src/main/java/com/bartlomiejpluta/samplegame/game/world/tileset/manager/TileSetManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bartlomiejpluta.samplegame.game.world.tileset.manager; - -import com.bartlomiejpluta.samplegame.game.world.tileset.model.TileSet; - -public interface TileSetManager { - TileSet createTileSet(String tileSetFileName, int rows, int columns); -} diff --git a/settings.gradle b/settings.gradle index c4346da6..ffc54302 100755 --- a/settings.gradle +++ b/settings.gradle @@ -7,5 +7,5 @@ * in the user manual at https://docs.gradle.org/6.8.1/userguide/multi_project_builds.html */ -rootProject.name = 'SampleGame' +rootProject.name = 'BASE' include('app')