From 7e01fc8bd43a7ad602ab95dd1d97dd164691ebf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= Date: Sat, 15 Nov 2025 17:14:22 +0100 Subject: [PATCH] refactor --- core/src/main/java/wtf/beatrice/retrorender/Main.java | 11 +---------- .../retrorender/engine/{ => config}/GameSettings.java | 2 +- .../engine/{ => render}/DayNightCycle.java | 2 +- .../engine/{ => render}/FpsCameraController.java | 4 +++- .../retrorender/{ => engine/render}/GameScreen.java | 10 ++++++++-- .../engine/{ => render}/RetroViewportHelper.java | 2 +- .../retrorender/engine/{ => ui}/DebugHud.java | 3 ++- .../beatrice/retrorender/engine/{ => ui}/GameUi.java | 4 +++- .../retrorender/engine/{ => ui}/PauseMenu.java | 2 +- .../retrorender/engine/{ => ui}/SettingsMenu.java | 3 ++- .../beatrice/retrorender/engine/{ => ui}/UiMode.java | 2 +- .../retrorender/engine/{ => world}/Collider.java | 2 +- .../retrorender/engine/{ => world}/ModelLibrary.java | 2 +- .../retrorender/engine/{ => world}/TownFactory.java | 3 ++- .../retrorender/engine/{ => world}/World3D.java | 2 +- .../retrorender/engine/{ => world}/WorldObject.java | 2 +- 16 files changed, 30 insertions(+), 26 deletions(-) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => config}/GameSettings.java (86%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => render}/DayNightCycle.java (99%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => render}/FpsCameraController.java (98%) rename core/src/main/java/wtf/beatrice/retrorender/{ => engine/render}/GameScreen.java (95%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => render}/RetroViewportHelper.java (97%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => ui}/DebugHud.java (97%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => ui}/GameUi.java (95%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => ui}/PauseMenu.java (99%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => ui}/SettingsMenu.java (98%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => ui}/UiMode.java (73%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => world}/Collider.java (93%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => world}/ModelLibrary.java (98%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => world}/TownFactory.java (97%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => world}/World3D.java (99%) rename core/src/main/java/wtf/beatrice/retrorender/engine/{ => world}/WorldObject.java (96%) diff --git a/core/src/main/java/wtf/beatrice/retrorender/Main.java b/core/src/main/java/wtf/beatrice/retrorender/Main.java index da5a1e8..aedb116 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/Main.java +++ b/core/src/main/java/wtf/beatrice/retrorender/Main.java @@ -1,16 +1,7 @@ package wtf.beatrice.retrorender; -import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Game; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.*; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.graphics.g3d.*; -import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute; -import com.badlogic.gdx.graphics.g3d.environment.DirectionalLight; -import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder; -import com.badlogic.gdx.math.Vector3; -import com.badlogic.gdx.utils.ScreenUtils; +import wtf.beatrice.retrorender.engine.render.GameScreen; /** {@link com.badlogic.gdx.ApplicationListener} implementation shared by all platforms. */ public class Main extends Game diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/GameSettings.java b/core/src/main/java/wtf/beatrice/retrorender/engine/config/GameSettings.java similarity index 86% rename from core/src/main/java/wtf/beatrice/retrorender/engine/GameSettings.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/config/GameSettings.java index 29d94e7..92ccc76 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/GameSettings.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/config/GameSettings.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.config; public class GameSettings { diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/DayNightCycle.java b/core/src/main/java/wtf/beatrice/retrorender/engine/render/DayNightCycle.java similarity index 99% rename from core/src/main/java/wtf/beatrice/retrorender/engine/DayNightCycle.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/render/DayNightCycle.java index f798ccc..d5f57f1 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/DayNightCycle.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/render/DayNightCycle.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.render; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute; diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/FpsCameraController.java b/core/src/main/java/wtf/beatrice/retrorender/engine/render/FpsCameraController.java similarity index 98% rename from core/src/main/java/wtf/beatrice/retrorender/engine/FpsCameraController.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/render/FpsCameraController.java index fa9eff6..b83ff54 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/FpsCameraController.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/render/FpsCameraController.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.render; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; @@ -6,6 +6,8 @@ import com.badlogic.gdx.graphics.Cursor; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.PerspectiveCamera; import com.badlogic.gdx.math.Vector3; +import wtf.beatrice.retrorender.engine.config.GameSettings; +import wtf.beatrice.retrorender.engine.world.World3D; public class FpsCameraController { diff --git a/core/src/main/java/wtf/beatrice/retrorender/GameScreen.java b/core/src/main/java/wtf/beatrice/retrorender/engine/render/GameScreen.java similarity index 95% rename from core/src/main/java/wtf/beatrice/retrorender/GameScreen.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/render/GameScreen.java index 2b89069..430506c 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/GameScreen.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/render/GameScreen.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender; +package wtf.beatrice.retrorender.engine.render; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; @@ -16,7 +16,13 @@ import com.badlogic.gdx.graphics.g3d.environment.DirectionalShadowLight; import com.badlogic.gdx.graphics.g3d.utils.DepthShaderProvider; import com.badlogic.gdx.graphics.glutils.FrameBuffer; import com.badlogic.gdx.math.Vector3; -import wtf.beatrice.retrorender.engine.*; +import wtf.beatrice.retrorender.Main; +import wtf.beatrice.retrorender.engine.config.GameSettings; +import wtf.beatrice.retrorender.engine.world.ModelLibrary; +import wtf.beatrice.retrorender.engine.ui.DebugHud; +import wtf.beatrice.retrorender.engine.ui.GameUi; +import wtf.beatrice.retrorender.engine.ui.UiMode; +import wtf.beatrice.retrorender.engine.world.World3D; public class GameScreen implements Screen { diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/RetroViewportHelper.java b/core/src/main/java/wtf/beatrice/retrorender/engine/render/RetroViewportHelper.java similarity index 97% rename from core/src/main/java/wtf/beatrice/retrorender/engine/RetroViewportHelper.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/render/RetroViewportHelper.java index bdf051c..1491463 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/RetroViewportHelper.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/render/RetroViewportHelper.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.render; public class RetroViewportHelper { diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/DebugHud.java b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/DebugHud.java similarity index 97% rename from core/src/main/java/wtf/beatrice/retrorender/engine/DebugHud.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/ui/DebugHud.java index ed90f51..570715f 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/DebugHud.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/DebugHud.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.ui; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.PerspectiveCamera; @@ -8,6 +8,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; +import wtf.beatrice.retrorender.engine.render.DayNightCycle; public class DebugHud { diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/GameUi.java b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/GameUi.java similarity index 95% rename from core/src/main/java/wtf/beatrice/retrorender/engine/GameUi.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/ui/GameUi.java index d6de06e..c49b401 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/GameUi.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/GameUi.java @@ -1,4 +1,6 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.ui; + +import wtf.beatrice.retrorender.engine.config.GameSettings; public class GameUi { diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/PauseMenu.java b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/PauseMenu.java similarity index 99% rename from core/src/main/java/wtf/beatrice/retrorender/engine/PauseMenu.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/ui/PauseMenu.java index ffb37ca..e275e37 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/PauseMenu.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/PauseMenu.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.ui; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/SettingsMenu.java b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/SettingsMenu.java similarity index 98% rename from core/src/main/java/wtf/beatrice/retrorender/engine/SettingsMenu.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/ui/SettingsMenu.java index cec55be..eace606 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/SettingsMenu.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/SettingsMenu.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.ui; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; @@ -9,6 +9,7 @@ import com.badlogic.gdx.graphics.g2d.GlyphLayout; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.math.MathUtils; +import wtf.beatrice.retrorender.engine.config.GameSettings; public class SettingsMenu { diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/UiMode.java b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/UiMode.java similarity index 73% rename from core/src/main/java/wtf/beatrice/retrorender/engine/UiMode.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/ui/UiMode.java index 96d73de..faa6ae5 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/UiMode.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/ui/UiMode.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.ui; public enum UiMode { GAMEPLAY, diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/Collider.java b/core/src/main/java/wtf/beatrice/retrorender/engine/world/Collider.java similarity index 93% rename from core/src/main/java/wtf/beatrice/retrorender/engine/Collider.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/world/Collider.java index 3dbb483..de31eba 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/Collider.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/world/Collider.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.world; import com.badlogic.gdx.math.Vector3; diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/ModelLibrary.java b/core/src/main/java/wtf/beatrice/retrorender/engine/world/ModelLibrary.java similarity index 98% rename from core/src/main/java/wtf/beatrice/retrorender/engine/ModelLibrary.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/world/ModelLibrary.java index d68c56b..9e0fa9c 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/ModelLibrary.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/world/ModelLibrary.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.world; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/TownFactory.java b/core/src/main/java/wtf/beatrice/retrorender/engine/world/TownFactory.java similarity index 97% rename from core/src/main/java/wtf/beatrice/retrorender/engine/TownFactory.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/world/TownFactory.java index abbcf16..da7ce6b 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/TownFactory.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/world/TownFactory.java @@ -1,6 +1,7 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.world; import com.badlogic.gdx.graphics.g3d.ModelInstance; + public class TownFactory { private final ModelLibrary models; diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/World3D.java b/core/src/main/java/wtf/beatrice/retrorender/engine/world/World3D.java similarity index 99% rename from core/src/main/java/wtf/beatrice/retrorender/engine/World3D.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/world/World3D.java index a35abe8..091d1ff 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/World3D.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/world/World3D.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.world; import com.badlogic.gdx.graphics.g3d.Environment; import com.badlogic.gdx.graphics.g3d.ModelBatch; diff --git a/core/src/main/java/wtf/beatrice/retrorender/engine/WorldObject.java b/core/src/main/java/wtf/beatrice/retrorender/engine/world/WorldObject.java similarity index 96% rename from core/src/main/java/wtf/beatrice/retrorender/engine/WorldObject.java rename to core/src/main/java/wtf/beatrice/retrorender/engine/world/WorldObject.java index ef9219b..1a03fe5 100644 --- a/core/src/main/java/wtf/beatrice/retrorender/engine/WorldObject.java +++ b/core/src/main/java/wtf/beatrice/retrorender/engine/world/WorldObject.java @@ -1,4 +1,4 @@ -package wtf.beatrice.retrorender.engine; +package wtf.beatrice.retrorender.engine.world; import com.badlogic.gdx.graphics.g3d.ModelInstance; import com.badlogic.gdx.math.Vector3;