michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solved the fps counter zoom together with canvas problem. Workaround used was changing fps counter on game view to race view.

Browse Source 
#story[1117] #pair[ptg19, zyt10]
This commit is contained in:
Zhi You Tan
2017-08-13 18:52:42 +12:00
parent 8ec6490627
commit 0b978593d4
4 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
-1
View File
@@ -174,7 +174,6 @@ public class GameClient {
break;
case BOAT_XML:
System.out.println("GOT SUM BOATS YAY :)");
allBoatsMap = XMLParser.parseBoats(
StreamParser.extractXmlMessage(packet)
);
src/main/java/seng302/visualiser/GameView.java
+7 -6
View File
@@ -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;
}
}
src/main/java/seng302/visualiser/controllers/RaceViewController.java
+3
View File
@@ -71,6 +71,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
private Button selectAnnotationBtn;
@FXML
private ComboBox<Yacht> yachtSelectionComboBox;
@FXML
private Text fpsDisplay;
//Race Data
private Map<Integer, Yacht> 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());