From 526c12127f25ac78ead70a170e88b6735713d09d Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Mon, 24 Jul 2017 15:26:51 +1200 Subject: [PATCH] Merging game lobby with game state broadcast. Merge conflicts resolved. Port numbers updated to 4942. --- src/main/java/seng302/controllers/LobbyController.java | 1 + src/main/java/seng302/controllers/RaceViewController.java | 4 ++-- src/main/java/seng302/controllers/StartScreenController.java | 3 ++- src/main/java/seng302/gameServer/GameServerThread.java | 2 +- src/main/java/seng302/gameServer/MainServerThread.java | 2 +- src/main/resources/views/StartScreenView.fxml | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java index 6aeee7b7..0cc50be9 100644 --- a/src/main/java/seng302/controllers/LobbyController.java +++ b/src/main/java/seng302/controllers/LobbyController.java @@ -220,6 +220,7 @@ public class LobbyController implements Initializable, Observer{ @FXML public void readyButtonPressed() { + setContentPane("/views/RaceView.fxml"); GameState.setCurrentStage(GameStages.RACING); } diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java index e2cadecd..e87618c2 100644 --- a/src/main/java/seng302/controllers/RaceViewController.java +++ b/src/main/java/seng302/controllers/RaceViewController.java @@ -96,12 +96,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel startingBoats = new ArrayList<>(ClientPacketParser.getBoats().values()); includedCanvasController.setup(this); -// includedCanvasController.initializeCanvas(); + includedCanvasController.initializeCanvas(); initializeUpdateTimer(); initialiseFPSCheckBox(); initialiseAnnotationSlider(); initialiseBoatSelectionComboBox(); -// includedCanvasController.timer.start(); + includedCanvasController.timer.start(); selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView()); } diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java index 0cf7f594..5cfceeca 100644 --- a/src/main/java/seng302/controllers/StartScreenController.java +++ b/src/main/java/seng302/controllers/StartScreenController.java @@ -75,7 +75,8 @@ public class StartScreenController { new MainServerThread(); ClientState.setHost(true); // host will connect and handshake to itself after setting up the server - ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4950); + // TODO: 24/07/17 wmu16 - Make port number some static global type constant? + ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4942); ClientState.setConnectedToHost(true); controller.setClientToServerThread(clientToServerThread); setContentPane("/views/LobbyView.fxml"); diff --git a/src/main/java/seng302/gameServer/GameServerThread.java b/src/main/java/seng302/gameServer/GameServerThread.java index 007f300d..3a208f36 100644 --- a/src/main/java/seng302/gameServer/GameServerThread.java +++ b/src/main/java/seng302/gameServer/GameServerThread.java @@ -18,7 +18,7 @@ import java.util.*; public class GameServerThread implements Runnable, Observer, ClientConnectionDelegate{ private static final Integer MAX_NUM_PLAYERS = 10; - public static final int PORT_NUMBER = 4950; + public static final int PORT_NUMBER = 4942; private Boolean hosting = true; diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java index 3294c9a2..80539881 100644 --- a/src/main/java/seng302/gameServer/MainServerThread.java +++ b/src/main/java/seng302/gameServer/MainServerThread.java @@ -17,7 +17,7 @@ import java.util.concurrent.PriorityBlockingQueue; */ public class MainServerThread implements Runnable, PacketBufferDelegate, ClientConnectionDelegate{ - private static final int PORT = 4950; + private static final int PORT = 4942; private static final Integer MAX_NUM_PLAYERS = 3; private static final int LOG_LEVEL = 1; diff --git a/src/main/resources/views/StartScreenView.fxml b/src/main/resources/views/StartScreenView.fxml index 67ec761f..bfbcf4ee 100644 --- a/src/main/resources/views/StartScreenView.fxml +++ b/src/main/resources/views/StartScreenView.fxml @@ -47,7 +47,7 @@ - +