From 4e8f1a2b19df1e48f3ee4db77511192bfe53f915 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Wed, 27 Sep 2017 13:39:27 +1300
Subject: [PATCH] Placed the waypoint arrow in the HUD #story[1306]

---
 .../Controllers/NextMarkController.java       |  4 ++--
 .../visualiser/scenes/newRaceView.fxml        | 24 +++++++------------
 .../resources/visualiser/scenes/nextMark.fxml | 10 ++++----
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
index 20da6f3c..a51e519d 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -67,9 +67,9 @@ public class NextMarkController {
 
         Shape3D arrow = Assets3D.loadX3d(arrowPath);
 
-        arrow.setScaleX(25);
+        arrow.setScaleX(15);
         arrow.setScaleY(25);
-        arrow.setScaleZ(100);
+        arrow.setScaleZ(50);
         arrow.setRotationAxis(new Point3D(1,0,0));
 
         arrowStackPane3d.getChildren().add(arrow);
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index 5804406d..dbd9fa84 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.LineChart?>
 <?import javafx.scene.chart.NumberAxis?>
@@ -31,7 +24,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?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" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
+<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.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
     <items>
         <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
             <children>
@@ -44,13 +37,6 @@
                             <rowConstraints>
                                 <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                             </rowConstraints>
-                     <children>
-                              <StackPane fx:id="nextMarkPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
-                                  <children>
-                                      <fx:include fx:id="nextMark" source="nextMark.fxml" />
-                                  </children>
-                              </StackPane>
-                     </children>
                         </GridPane>
                         <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
                             <children>
@@ -235,6 +221,14 @@
                <StackPane.margin>
                   <Insets bottom="25.0" left="2.0" />
                </StackPane.margin>
+            </StackPane>
+            <StackPane fx:id="nextMarkPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
+                <children>
+                    <fx:include fx:id="nextMark" source="nextMark.fxml" />
+                </children>
+               <StackPane.margin>
+                  <Insets top="4.0" />
+               </StackPane.margin>
             </StackPane>
                   <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" mouseTransparent="true" text="0:0" StackPane.alignment="TOP_CENTER">
                       <font>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
index a2e15c37..e8207bdf 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
@@ -10,11 +10,11 @@
 
 <GridPane fx:id="arrowGridPane" alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.NextMarkController">
    <children>
-      <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
+      <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="100.0">
          <children>
-            <StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0">
+            <StackPane fx:id="arrowStackPane2d" prefHeight="100.0" prefWidth="100.0">
                <children>
-                  <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="25.0">
+                  <ImageView fx:id="arrowImage" fitHeight="70.0" fitWidth="25.0">
                      <image>
                         <Image url="@../../images/nextMarkArrow2d.png" />
                      </image>
@@ -23,9 +23,9 @@
             </StackPane>
          </children>
       </Pane>
-      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
+      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="100.0">
          <children>
-            <StackPane fx:id="arrowStackPane3d" prefHeight="112.0" prefWidth="112.0" />
+            <StackPane fx:id="arrowStackPane3d" prefHeight="100.0" prefWidth="100.0" />
          </children>
       </Pane>
    </children>