From f56af5e3dd0b4f3b330b9ee094266e7aeaba3164 Mon Sep 17 00:00:00 2001 From: MickWerf Date: Mon, 11 May 2020 14:32:22 +0200 Subject: [PATCH] Added util package for all mutual classes between server and client. Added FrameRate and GameApplicationConfiguration to util package. Added super class for controllers. Added controllers package for server and client packages. Added gamecontroller for server. Added character, object and score controllers for server and create them on gamecontroller creation. Added sessioncontroller for server and client. Added graphicsController for client. Removed unused imports. --- core/src/netwerkprog/game/MainGame.java | 3 +-- .../client/controllers/GrapicsController.java | 6 ++++++ .../client/controllers/SessionController.java | 6 ++++++ .../server/controllers/SessionController.java | 6 ++++++ .../controllers/game/CharacterController.java | 6 ++++++ .../server/controllers/game/GameController.java | 16 ++++++++++++++++ .../controllers/game/ObjectController.java | 6 ++++++ .../server/controllers/game/ScoreController.java | 6 ++++++ core/src/netwerkprog/game/util/Controller.java | 5 +++++ .../netwerkprog/game/{ => util}/FrameRate.java | 2 +- .../{ => util}/GameApplicationConfiguration.java | 3 +-- .../game/desktop/DesktopLauncher.java | 2 +- 12 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 core/src/netwerkprog/game/client/controllers/GrapicsController.java create mode 100644 core/src/netwerkprog/game/client/controllers/SessionController.java create mode 100644 core/src/netwerkprog/game/server/controllers/SessionController.java create mode 100644 core/src/netwerkprog/game/server/controllers/game/CharacterController.java create mode 100644 core/src/netwerkprog/game/server/controllers/game/GameController.java create mode 100644 core/src/netwerkprog/game/server/controllers/game/ObjectController.java create mode 100644 core/src/netwerkprog/game/server/controllers/game/ScoreController.java create mode 100644 core/src/netwerkprog/game/util/Controller.java rename core/src/netwerkprog/game/{ => util}/FrameRate.java (98%) rename core/src/netwerkprog/game/{ => util}/GameApplicationConfiguration.java (95%) diff --git a/core/src/netwerkprog/game/MainGame.java b/core/src/netwerkprog/game/MainGame.java index 5a215bd..f21c24d 100644 --- a/core/src/netwerkprog/game/MainGame.java +++ b/core/src/netwerkprog/game/MainGame.java @@ -4,13 +4,12 @@ import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Files; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.audio.Music; -import com.badlogic.gdx.backends.lwjgl.audio.Mp3; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import netwerkprog.game.client.Client; import netwerkprog.game.server.Server; +import netwerkprog.game.util.FrameRate; public class MainGame extends ApplicationAdapter { SpriteBatch batch; diff --git a/core/src/netwerkprog/game/client/controllers/GrapicsController.java b/core/src/netwerkprog/game/client/controllers/GrapicsController.java new file mode 100644 index 0000000..6f690b0 --- /dev/null +++ b/core/src/netwerkprog/game/client/controllers/GrapicsController.java @@ -0,0 +1,6 @@ +package netwerkprog.game.client.controllers; + +import netwerkprog.game.util.Controller; + +public class GrapicsController extends Controller { +} diff --git a/core/src/netwerkprog/game/client/controllers/SessionController.java b/core/src/netwerkprog/game/client/controllers/SessionController.java new file mode 100644 index 0000000..7852ae9 --- /dev/null +++ b/core/src/netwerkprog/game/client/controllers/SessionController.java @@ -0,0 +1,6 @@ +package netwerkprog.game.client.controllers; + +import netwerkprog.game.util.Controller; + +public class SessionController extends Controller { +} diff --git a/core/src/netwerkprog/game/server/controllers/SessionController.java b/core/src/netwerkprog/game/server/controllers/SessionController.java new file mode 100644 index 0000000..1cfaeff --- /dev/null +++ b/core/src/netwerkprog/game/server/controllers/SessionController.java @@ -0,0 +1,6 @@ +package netwerkprog.game.server.controllers; + +import netwerkprog.game.util.Controller; + +public class SessionController extends Controller { +} diff --git a/core/src/netwerkprog/game/server/controllers/game/CharacterController.java b/core/src/netwerkprog/game/server/controllers/game/CharacterController.java new file mode 100644 index 0000000..0fbc74f --- /dev/null +++ b/core/src/netwerkprog/game/server/controllers/game/CharacterController.java @@ -0,0 +1,6 @@ +package netwerkprog.game.server.controllers.game; + +import netwerkprog.game.util.Controller; + +public class CharacterController extends Controller { +} diff --git a/core/src/netwerkprog/game/server/controllers/game/GameController.java b/core/src/netwerkprog/game/server/controllers/game/GameController.java new file mode 100644 index 0000000..1d2094b --- /dev/null +++ b/core/src/netwerkprog/game/server/controllers/game/GameController.java @@ -0,0 +1,16 @@ +package netwerkprog.game.server.controllers.game; + +import netwerkprog.game.util.Controller; + +public class GameController extends Controller { + private final CharacterController characterController; + private final ObjectController objectController; + private final ScoreController scoreController; + + public GameController() { + this.characterController = new CharacterController(); + this.objectController = new ObjectController(); + this.scoreController = new ScoreController(); + } + +} diff --git a/core/src/netwerkprog/game/server/controllers/game/ObjectController.java b/core/src/netwerkprog/game/server/controllers/game/ObjectController.java new file mode 100644 index 0000000..341bb94 --- /dev/null +++ b/core/src/netwerkprog/game/server/controllers/game/ObjectController.java @@ -0,0 +1,6 @@ +package netwerkprog.game.server.controllers.game; + +import netwerkprog.game.util.Controller; + +public class ObjectController extends Controller { +} diff --git a/core/src/netwerkprog/game/server/controllers/game/ScoreController.java b/core/src/netwerkprog/game/server/controllers/game/ScoreController.java new file mode 100644 index 0000000..a10af5e --- /dev/null +++ b/core/src/netwerkprog/game/server/controllers/game/ScoreController.java @@ -0,0 +1,6 @@ +package netwerkprog.game.server.controllers.game; + +import netwerkprog.game.util.Controller; + +public class ScoreController extends Controller { +} diff --git a/core/src/netwerkprog/game/util/Controller.java b/core/src/netwerkprog/game/util/Controller.java new file mode 100644 index 0000000..b47b2ec --- /dev/null +++ b/core/src/netwerkprog/game/util/Controller.java @@ -0,0 +1,5 @@ +package netwerkprog.game.util; + +public abstract class Controller { + +} diff --git a/core/src/netwerkprog/game/FrameRate.java b/core/src/netwerkprog/game/util/FrameRate.java similarity index 98% rename from core/src/netwerkprog/game/FrameRate.java rename to core/src/netwerkprog/game/util/FrameRate.java index 085bd84..45ddb4e 100644 --- a/core/src/netwerkprog/game/FrameRate.java +++ b/core/src/netwerkprog/game/util/FrameRate.java @@ -1,4 +1,4 @@ -package netwerkprog.game; +package netwerkprog.game.util; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.OrthographicCamera; diff --git a/core/src/netwerkprog/game/GameApplicationConfiguration.java b/core/src/netwerkprog/game/util/GameApplicationConfiguration.java similarity index 95% rename from core/src/netwerkprog/game/GameApplicationConfiguration.java rename to core/src/netwerkprog/game/util/GameApplicationConfiguration.java index fb37fdb..639cb52 100644 --- a/core/src/netwerkprog/game/GameApplicationConfiguration.java +++ b/core/src/netwerkprog/game/util/GameApplicationConfiguration.java @@ -1,7 +1,6 @@ -package netwerkprog.game; +package netwerkprog.game.util; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; /** * custom application config class for the game diff --git a/desktop/src/netwerkprog/game/desktop/DesktopLauncher.java b/desktop/src/netwerkprog/game/desktop/DesktopLauncher.java index 9f91943..3ad936d 100644 --- a/desktop/src/netwerkprog/game/desktop/DesktopLauncher.java +++ b/desktop/src/netwerkprog/game/desktop/DesktopLauncher.java @@ -2,7 +2,7 @@ package netwerkprog.game.desktop; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import netwerkprog.game.MainGame; -import netwerkprog.game.GameApplicationConfiguration; +import netwerkprog.game.util.GameApplicationConfiguration; public class DesktopLauncher { public static void main (String[] arg) {