Updated lobby controller to pass the player ID through, and the lobby view to have a customize button.

tags: #story[1142]
This commit is contained in:
Alistair McIntyre
2017-08-15 16:48:23 +12:00
parent 1f09005147
commit 9cb5956f3c
3 changed files with 22 additions and 4 deletions
@@ -72,7 +72,6 @@ public class GameClient {
socketThread.addStreamObserver(this::parsePackets);
LobbyController lobbyController = loadLobby();
lobbyController.setPlayerListSource(clientLobbyList);
lobbyController.disableReadyButton();
lobbyController.setTitle("Connected to host - IP : " + ipAddress + " Port : " + portNumber);
lobbyController.addCloseListener((exitCause) -> this.loadStartScreen());
@@ -93,7 +92,6 @@ public class GameClient {
}
socketThread.addStreamObserver(this::parsePackets);
LobbyController lobbyController = loadLobby();
lobbyController.setPlayerListSource(clientLobbyList);
lobbyController.setTitle("Hosting Lobby - IP : " + ipAddress + " Port : " + portNumber);
lobbyController.addCloseListener(exitCause -> {
if (exitCause == CloseStatus.READY) {
@@ -133,7 +131,11 @@ public class GameClient {
} catch (IOException e) {
e.printStackTrace();
}
return fxmlLoader.getController();
LobbyController lobbyController = fxmlLoader.getController();
lobbyController.setPlayerListSource(clientLobbyList);
lobbyController.setPlayerID(socketThread.getClientId());
return lobbyController;
}
private void loadRaceView() {
@@ -14,6 +14,7 @@ import javafx.scene.image.ImageView;
import javafx.scene.text.Text;
import seng302.gameServer.GameStages;
import seng302.gameServer.GameState;
import seng302.visualiser.GameView;
/**
* A class describing the actions of the lobby screen
@@ -72,6 +73,7 @@ public class LobbyController {
private List<TextArea> listViews = new ArrayList<>();
private int MAX_NUM_PLAYERS = 8;
private Integer playerID;
private List<LobbyCloseListener> lobbyListeners = new ArrayList<>();
private ObservableList<String> players;
@@ -98,6 +100,9 @@ public class LobbyController {
//Update players if one added.
for (int i = 0; i < players.size(); i++) {
listViews.get(i).setText(players.get(i));
if (playerID == (i + 1)) {
listViews.get(i).setText(listViews.get(i).getText() + " (YOU)");
}
imageViews.get(i).setVisible(true);
}
//Update empty text fields if player left.
@@ -122,6 +127,11 @@ public class LobbyController {
}
}
@FXML
public void customize() {
System.out.println(playerID);
}
@FXML
public void leaveLobbyButtonPressed() {
// TODO: 10/07/17 wmu16 - Finish function!
@@ -154,6 +164,10 @@ public class LobbyController {
Platform.runLater(this::updatePlayers);
}
public void setPlayerID(Integer id) {
playerID = id;
}
public void disableReadyButton () {
readyButton.setDisable(true);
readyButton.setVisible(false);