From c84afdb2d19f3b3219675bd62be8aec28dd51e93 Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Sun, 25 Apr 2021 15:17:07 +0200
Subject: [PATCH] Renamed Client and Server-file to SpaceCheckers
---
.../src/com/mygdx/game/AndroidLauncher.java | 2 +-
...rsClient.java => SpaceCheckersClient.java} | 21 ++++++-------------
.../mygdx/game/desktop/DesktopLauncher.java | 4 ++--
.../src/com/mygdx/game/AndroidLauncher.java | 2 +-
...rsServer.java => SpaceCheckersServer.java} | 2 +-
.../mygdx/game/desktop/DesktopLauncher.java | 4 ++--
6 files changed, 13 insertions(+), 22 deletions(-)
rename CheckersClient/core/src/com/mygdx/game/{UniCheckersClient.java => SpaceCheckersClient.java} (73%)
rename CheckersServer/core/src/com/mygdx/game/{UniCheckersServer.java => SpaceCheckersServer.java} (92%)
diff --git a/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java b/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java
index 5c6fb76..c7bcd12 100644
--- a/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java
+++ b/CheckersClient/android/src/com/mygdx/game/AndroidLauncher.java
@@ -10,6 +10,6 @@ public class AndroidLauncher extends AndroidApplication {
protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
- initialize(new UniCheckersClient(), config);
+ initialize(new SpaceCheckersClient(), config);
}
}
diff --git a/CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java b/CheckersClient/core/src/com/mygdx/game/SpaceCheckersClient.java
similarity index 73%
rename from CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java
rename to CheckersClient/core/src/com/mygdx/game/SpaceCheckersClient.java
index a63bb6f..32896e7 100644
--- a/CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java
+++ b/CheckersClient/core/src/com/mygdx/game/SpaceCheckersClient.java
@@ -16,27 +16,18 @@ import com.mygdx.game.views.GameViewManager;
import com.mygdx.game.views.LoadingView;
import java.util.ArrayList;
-public class UniCheckersClient extends ApplicationAdapter {
+public class SpaceCheckersClient extends ApplicationAdapter {
PlayerController playerController;
private GameViewManager gvm;
- private SpriteBatch sb;
- private AssetManager assetManager;
- private Stage stage;
- private Viewport viewport;
- private Skin skin;
-
-
- ArrayList<PlayerController> playerControllers = new ArrayList<>();
- NetworkController networkController;
@Override
public void create () {
Gdx.gl.glClearColor(0, 0, 1, 1);
- viewport = new FitViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
- stage = new Stage(viewport);
+ Viewport viewport = new FitViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+ Stage stage = new Stage(viewport);
Gdx.input.setInputProcessor(stage);
// Initialize controllers..
@@ -44,10 +35,10 @@ public class UniCheckersClient extends ApplicationAdapter {
playerController = new PlayerController(networkController);
// Initialize Views..
- sb = new SpriteBatch();
- assetManager = new AssetManager(new InternalFileHandleResolver());
+ SpriteBatch sb = new SpriteBatch();
+ AssetManager assetManager = new AssetManager(new InternalFileHandleResolver());
- skin = new Skin(Gdx.files.internal("UISkins/glassy/skin/glassy-ui.json"));
+ Skin skin = new Skin(Gdx.files.internal("UISkins/glassy/skin/glassy-ui.json"));
skin.getFont("font").getData().setScale(1.4F);
gvm = new GameViewManager();
diff --git a/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java b/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
index 0c464fc..a601869 100644
--- a/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
+++ b/CheckersClient/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
@@ -2,7 +2,7 @@ package com.mygdx.game.desktop;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-import com.mygdx.game.UniCheckersClient;
+import com.mygdx.game.SpaceCheckersClient;
import java.io.IOException;
@@ -11,7 +11,7 @@ public class DesktopLauncher {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
config.width = 2160;
config.height = 1080;
- new LwjglApplication(new UniCheckersClient(), config);
+ new LwjglApplication(new SpaceCheckersClient(), config);
}
diff --git a/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java b/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java
index bc2e09d..4ad8505 100644
--- a/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java
+++ b/CheckersServer/android/src/com/mygdx/game/AndroidLauncher.java
@@ -10,6 +10,6 @@ public class AndroidLauncher extends AndroidApplication {
protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
- initialize(new UniCheckersServer(), config);
+ initialize(new SpaceCheckersServer(), config);
}
}
diff --git a/CheckersServer/core/src/com/mygdx/game/UniCheckersServer.java b/CheckersServer/core/src/com/mygdx/game/SpaceCheckersServer.java
similarity index 92%
rename from CheckersServer/core/src/com/mygdx/game/UniCheckersServer.java
rename to CheckersServer/core/src/com/mygdx/game/SpaceCheckersServer.java
index d7f9232..ed2d17f 100644
--- a/CheckersServer/core/src/com/mygdx/game/UniCheckersServer.java
+++ b/CheckersServer/core/src/com/mygdx/game/SpaceCheckersServer.java
@@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.mygdx.game.controller.ServerController;
-public class UniCheckersServer extends ApplicationAdapter {
+public class SpaceCheckersServer extends ApplicationAdapter {
SpriteBatch batch;
Texture img;
diff --git a/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java b/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
index 6c7d6df..d783d39 100644
--- a/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
+++ b/CheckersServer/desktop/src/com/mygdx/game/desktop/DesktopLauncher.java
@@ -2,13 +2,13 @@ package com.mygdx.game.desktop;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-import com.mygdx.game.UniCheckersServer;
+import com.mygdx.game.SpaceCheckersServer;
import java.io.IOException;
public class DesktopLauncher {
public static void main (String[] arg) throws IOException {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
- new LwjglApplication(new UniCheckersServer(), config);
+ new LwjglApplication(new SpaceCheckersServer(), config);
}
}
\ No newline at end of file
--
GitLab