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

Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge

Browse Source
This commit is contained in:
William Muir
2017-09-12 16:08:39 +12:00
parent bd31bae586 2f973deacc
commit 5046ca6ffa
32 changed files with 166 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/RaceViewController.java
+4
View File
@@ -30,6 +30,7 @@ import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.Slider;
import javafx.scene.control.TextField;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
@@ -100,6 +101,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
private Text fpsDisplay;
@FXML
private Text windSpeedText;
@FXML
private ImageView windImageView;
//Race Data
private Map<Integer, ClientYacht> participants;
@@ -120,6 +123,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
public void initialize() {
Sounds.stopMusic();
Sounds.playRaceMusic();
// Load a default important annotation state
//importantAnnotations = new ImportantAnnotationsState();