diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java index 6246eef3..67a18a4b 100644 --- a/src/main/java/seng302/visualiser/GameClient.java +++ b/src/main/java/seng302/visualiser/GameClient.java @@ -174,7 +174,6 @@ public class GameClient { break; case BOAT_XML: - System.out.println("GOT SUM BOATS YAY :)"); allBoatsMap = XMLParser.parseBoats( StreamParser.extractXmlMessage(packet) ); diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java index f984186a..920939c2 100644 --- a/src/main/java/seng302/visualiser/GameView.java +++ b/src/main/java/seng302/visualiser/GameView.java @@ -119,18 +119,14 @@ public class GameView extends Pane { this.setLayoutX(0); this.setLayoutY(0); } - System.out.println("boatObjects = " + boatObjects.get(playerYacht).getBoatLayoutX()); - System.out.println("boatObjects = " + boatObjects.get(playerYacht).getBoatLayoutY()); +// System.out.println("boatObjects = " + boatObjects.get(playerYacht).getBoatLayoutX()); +// System.out.println("boatObjects = " + boatObjects.get(playerYacht).getBoatLayoutY()); } public GameView () { gameObjects = this.getChildren(); // create image view for map, bind panel size to image gameObjects.add(mapImage); - fpsDisplay.setLayoutX(5); - fpsDisplay.setLayoutY(20); - fpsDisplay.setStrokeWidth(2); - gameObjects.add(fpsDisplay); gameObjects.add(raceBorder); gameObjects.add(markers); initializeTimer(); @@ -631,4 +627,9 @@ public class GameView extends Pane { }); } + + public void setFrameRateFXText(Text fpsDisplay) { + this.fpsDisplay = null; + this.fpsDisplay = fpsDisplay; + } } diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java index 4130f536..1a3f572c 100644 --- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java +++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java @@ -71,6 +71,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel private Button selectAnnotationBtn; @FXML private ComboBox yachtSelectionComboBox; + @FXML + private Text fpsDisplay; //Race Data private Map participants; @@ -115,6 +117,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel initialiseSparkLine(); gameView = new GameView(); + gameView.setFrameRateFXText(fpsDisplay); Platform.runLater(() -> contentAnchorPane.getChildren().add(0, gameView)); gameView.setBoats(new ArrayList<>(participants.values())); gameView.updateBorder(raceData.getCourseLimit()); diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml index 0d004b90..d00f0099 100644 --- a/src/main/resources/views/RaceView.fxml +++ b/src/main/resources/views/RaceView.fxml @@ -26,7 +26,34 @@ - + + + + + + + + + + + + + + + + + +