Changed lobby player profile to a lower risk pictures
#story[1055]
@@ -80,7 +80,7 @@ public class LobbyController implements Initializable, Observer{
|
|||||||
private static ObservableList<String> seventhCompetitor = FXCollections.observableArrayList();
|
private static ObservableList<String> seventhCompetitor = FXCollections.observableArrayList();
|
||||||
private static ObservableList<String> eighthCompetitor = FXCollections.observableArrayList();
|
private static ObservableList<String> eighthCompetitor = FXCollections.observableArrayList();
|
||||||
private ClientStateQueryingRunnable clientStateQueryingRunnable;
|
private ClientStateQueryingRunnable clientStateQueryingRunnable;
|
||||||
private static List<ImageView> gifImageViews;
|
private static List<ImageView> imageViews;
|
||||||
private static List<ListView> listViews;
|
private static List<ListView> listViews;
|
||||||
|
|
||||||
private int MAX_NUM_PLAYERS = 8;
|
private int MAX_NUM_PLAYERS = 8;
|
||||||
@@ -114,8 +114,8 @@ public class LobbyController implements Initializable, Observer{
|
|||||||
readyButton.setDisable(true);
|
readyButton.setDisable(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
gifImageViews = new ArrayList<>();
|
imageViews = new ArrayList<>();
|
||||||
Collections.addAll(gifImageViews, firstImageView, secondImageView, thirdImageView, fourthImageView,
|
Collections.addAll(imageViews, firstImageView, secondImageView, thirdImageView, fourthImageView,
|
||||||
fifthImageView, sixthImageView, seventhImageView, eighthImageView);
|
fifthImageView, sixthImageView, seventhImageView, eighthImageView);
|
||||||
listViews = new ArrayList<>();
|
listViews = new ArrayList<>();
|
||||||
Collections.addAll(listViews, firstListView, secondListView, thirdListView, fourthListView, fifthListView,
|
Collections.addAll(listViews, firstListView, secondListView, thirdListView, fourthListView, fifthListView,
|
||||||
@@ -153,49 +153,37 @@ public class LobbyController implements Initializable, Observer{
|
|||||||
|
|
||||||
private void initialiseListView() {
|
private void initialiseListView() {
|
||||||
listViews.forEach(listView -> listView.getItems().clear());
|
listViews.forEach(listView -> listView.getItems().clear());
|
||||||
gifImageViews.forEach(gif -> gif.setVisible(false));
|
imageViews.forEach(gif -> gif.setVisible(false));
|
||||||
competitors.forEach(ol -> ol.removeAll());
|
competitors.forEach(ol -> ol.removeAll());
|
||||||
|
|
||||||
List<Integer> ids = new ArrayList<>(ClientState.getBoats().keySet());
|
List<Integer> ids = new ArrayList<>(ClientState.getBoats().keySet());
|
||||||
for (int i = 0; i < ids.size(); i++) {
|
for (int i = 0; i < ids.size(); i++) {
|
||||||
competitors.get(i).add(String.format("Player ID: %d", ids.get(i)));
|
competitors.get(i).add(String.format("Player ID: %d", ids.get(i)));
|
||||||
listViews.get(i).setItems(competitors.get(i));
|
listViews.get(i).setItems(competitors.get(i));
|
||||||
gifImageViews.get(i).setVisible(true);
|
imageViews.get(i).setVisible(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initialiseLobbyControllerThread() {
|
|
||||||
Thread thread = new Thread(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
Platform.runLater(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
thread.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void initialiseImageView() {
|
private void initialiseImageView() {
|
||||||
Image image1 = new Image(getClass().getResourceAsStream("/ParrotGif/alistair.gif"));
|
for (int i = 0; i < MAX_NUM_PLAYERS; i++) {
|
||||||
firstImageView.setImage(image1);
|
imageViews.get(i).setImage(new Image(getClass().getResourceAsStream("/pics/sail.png")));
|
||||||
Image image2 = new Image(getClass().getResourceAsStream("/ParrotGif/calum.gif"));
|
}
|
||||||
secondImageView.setImage(image2);
|
// Image image1 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
Image image3 = new Image(getClass().getResourceAsStream("/ParrotGif/haoming.gif"));
|
// firstImageView.setImage(image1);
|
||||||
thirdImageView.setImage(image3);
|
// Image image2 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
Image image4 = new Image(getClass().getResourceAsStream("/ParrotGif/kusal.gif"));
|
// secondImageView.setImage(image2);
|
||||||
fourthImageView.setImage(image4);
|
// Image image3 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
Image image5 = new Image(getClass().getResourceAsStream("/ParrotGif/michael.gif"));
|
// thirdImageView.setImage(image3);
|
||||||
fifthImageView.setImage(image5);
|
// Image image4 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
Image image6 = new Image(getClass().getResourceAsStream("/ParrotGif/peter.gif"));
|
// fourthImageView.setImage(image4);
|
||||||
sixthImageView.setImage(image6);
|
// Image image5 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
Image image7 = new Image(getClass().getResourceAsStream("/ParrotGif/ryan.gif"));
|
// fifthImageView.setImage(image5);
|
||||||
seventhImageView.setImage(image7);
|
// Image image6 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
Image image8 = new Image(getClass().getResourceAsStream("/ParrotGif/will.gif"));
|
// sixthImageView.setImage(image6);
|
||||||
eighthImageView.setImage(image8);
|
// Image image7 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
|
// seventhImageView.setImage(image7);
|
||||||
|
// Image image8 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
|
||||||
|
// eighthImageView.setImage(image8);
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |