From 16da9e009b7a2681d58cb8f662e215285d134f25 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Fri, 22 Sep 2017 00:21:56 +1200
Subject: [PATCH] Cherry-picked FXML changes from Development

#story[1291]
---
 .../visualiser/scenes/newRaceView.fxml        | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index dd277c8a..35987e4d 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -20,13 +20,14 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
     <items>
         <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
             <children>
-                <AnchorPane focusTraversable="true">
+                <AnchorPane fx:id="raceAnchorPane" focusTraversable="true">
                     <children>
                         <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <columnConstraints>
@@ -35,16 +36,6 @@
                             <rowConstraints>
                                 <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                             </rowConstraints>
-                     <children>
-                              <Label fx:id="FPS" mouseTransparent="true" text="FPS: 0">
-                                  <font>
-                                      <Font name="System Bold" size="15.0" />
-                                  </font>
-                           <padding>
-                              <Insets top="20.0" />
-                           </padding>
-                              </Label>
-                     </children>
                         </GridPane>
                         <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
                             <children>
@@ -89,7 +80,7 @@
                                 </Accordion>
                             </children>
                         </Pane>
-                  <GridPane fx:id="playerHealthContainer" prefHeight="40.0" prefWidth="46.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+                  <GridPane fx:id="playerHealthContainer" prefHeight="75.0" prefWidth="75.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <columnConstraints>
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                     </columnConstraints>
@@ -100,6 +91,29 @@
                         <Insets left="10.0" top="10.0" />
                      </padding>
                   </GridPane>
+                  <VBox alignment="CENTER" prefHeight="54.0" prefWidth="608.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                     <children>
+
+                                    <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" text="0:0">
+                                  <font>
+                                      <Font name="System Bold" size="15.0" />
+                                  </font>
+                              </Label>
+                              <Label fx:id="timeZone" text="Label">
+                                  <font>
+                                      <Font name="System Bold" size="15.0" />
+                                  </font>
+                              </Label>
+                     </children>
+                  </VBox>
+                        <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
+                            <font>
+                                <Font name="System Bold" size="15.0" />
+                            </font>
+                            <padding>
+                                <Insets bottom="200.0" />
+                            </padding>
+                        </Label>
                         <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <children>
                                 <fx:include fx:id="arrow" source="arrow.fxml" />