From 91c442e46554f7bb3c7e03bda32e08a03eb3b4c0 Mon Sep 17 00:00:00 2001
From: Joseph <jjg64@uclive.ac.nz>
Date: Thu, 21 Sep 2017 22:25:39 +1200
Subject: [PATCH 01/16] Set up architecture for next mark arrow and did a 2d
 template when the camera is zoomed out. #story[1299]

---
 .../Controllers/NextMarkController.java       | 67 +++++++++++++++++
 .../Controllers/RaceViewController.java       | 74 +++++++++----------
 .../visualiser/scenes/newRaceView.fxml        |  9 ++-
 .../resources/visualiser/scenes/nextMark.fxml | 45 +++++++++++
 4 files changed, 155 insertions(+), 40 deletions(-)
 create mode 100644 racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
 create mode 100644 racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
new file mode 100644
index 00000000..001a1a60
--- /dev/null
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -0,0 +1,67 @@
+package visualiser.Controllers;
+
+import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.animation.AnimationTimer;
+import javafx.fxml.FXML;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Cylinder;
+import javafx.scene.shape.MeshView;
+import shared.model.Bearing;
+import shared.model.CompoundMark;
+import shared.model.GPSCoordinate;
+import visualiser.model.VisualiserBoat;
+
+import java.net.URL;
+import java.util.Observable;
+import java.util.Observer;
+
+public class NextMarkController {
+    private @FXML StackPane arrowStackPane2d;
+    private @FXML Pane pane2d;
+    private @FXML Pane pane3d;
+
+    private VisualiserBoat boat;
+
+    public void initialiseArrowView(VisualiserBoat boat) {
+        this.boat = boat;
+        pane2d.setVisible(true);
+        pane3d.setVisible(false);
+        initialise2dArrowView();
+        initialise3dArrowView();
+    }
+
+    private void initialise2dArrowView() {
+        AnimationTimer arrow2d = new AnimationTimer() {
+            @Override
+            public void handle(long now) {
+                CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
+                Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
+                arrowStackPane2d.setRotate(headingToMark.degrees());
+            }
+        };
+        arrow2d.start();
+    }
+
+    private void initialise3dArrowView() {
+        URL asset = this.getClass().getClassLoader().getResource("assets/arrow V1.0.4.stl");
+        StlMeshImporter importer = new StlMeshImporter();
+        importer.read(asset);
+
+        MeshView arrow = new MeshView(importer.getImport());
+        PhongMaterial arrowMat = new PhongMaterial(Color.RED);
+        arrow.setMaterial(arrowMat);
+    }
+
+    public void show2d() {
+        pane3d.setVisible(false);
+        pane2d.setVisible(true);
+    }
+
+    public void show3d() {
+        pane2d.setVisible(false);
+        pane3d.setVisible(true);
+    }
+}
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index c2153c1f..80ca9fa7 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -16,10 +16,12 @@ import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Material;
 import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Cylinder;
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.Shape3D;
 import javafx.scene.transform.Translate;
@@ -77,9 +79,11 @@ public class RaceViewController extends Controller {
 
     // note: it says it's not used but it is! do not remove :)
     private @FXML ArrowController arrowController;
+    private @FXML NextMarkController nextMarkController;
     private @FXML GridPane canvasBase;
     private @FXML SplitPane racePane;
     private @FXML StackPane arrowPane;
+    private @FXML Pane nextMarkPane;
     private @FXML Label timer;
     private @FXML Label FPS;
     private @FXML Label timeZone;
@@ -204,25 +208,13 @@ public class RaceViewController extends Controller {
      * Initialises the various UI components to listen to the {@link #visualiserRace}.
      */
     private void initialiseRaceVisuals() {
-
-        // Import arrow mesh
-        URL asset = this.getClass().getClassLoader().getResource("assets/arrow V1.0.4.stl");
-        StlMeshImporter importer = new StlMeshImporter();
-        importer.read(asset);
-
-        MeshView arrow = new MeshView(importer.getImport());
-        PhongMaterial arrowMat = new PhongMaterial(Color.RED);
-        arrow.setMaterial(arrowMat);
-
-        this.nextMarkArrow = new Annotation3D(arrow);
-        this.nextMarkArrow.setScale(0.1);
-
         // initialise displays
         initialiseFps();
         initialiseInfoTable();
         initialiseView3D(this.visualiserRace);
         initialiseRaceClock();
         raceTimer();    // start the timer
+        nextMarkPane.toFront();
         new Sparkline(this.raceState, this.sparklineChart);
         timeZone.setText(this.raceState.getRaceClock().getTimeZone());
         arrowController.setWindProperty(this.raceState.windProperty());
@@ -231,6 +223,13 @@ public class RaceViewController extends Controller {
     private void initialiseView3D(VisualiserRaceEvent race) {
         viewSubjects = FXCollections.observableArrayList();
 
+        try {
+            nextMarkController.initialiseArrowView(race.getVisualiserRaceState().getBoat(race.getVisualiserRaceState().getPlayerBoatID()));
+            System.out.println("hi");
+        } catch (BoatNotFoundException e) {
+            e.printStackTrace();
+        }
+
         AmbientLight ambientLight = new AmbientLight(Color.web("#CCCCFF"));
         ambientLight.setTranslateX(250);
         ambientLight.setTranslateZ(210);
@@ -417,35 +416,32 @@ public class RaceViewController extends Controller {
     }
 
     private void addThirdPersonAnnotations(Subject3D subject3D) {
-        viewSubjects.add(nextMarkArrow);
-        final VisualiserBoat boat;
-        try {
-            boat = visualiserRace.getVisualiserRaceState().getBoat(subject3D.getSourceID());
-        } catch (BoatNotFoundException e) {
-            e.printStackTrace();
-            return;
-        }
-        arrowToNextMark = new AnimationTimer() {
-            @Override
-            public void handle(long now) {
-                CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
-                Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
-
-                nextMarkArrow.setX(view3D.getPivot().getX());
-                nextMarkArrow.setY(view3D.getPivot().getY());
-                nextMarkArrow.setZ(view3D.getPivot().getZ() + 15);
-                nextMarkArrow.setHeading(headingToMark.degrees());
-            }
-        };
-        arrowToNextMark.start();
+        nextMarkController.show3d();
+//        viewSubjects.add(nextMarkArrow);
+//        final VisualiserBoat boat;
+//        try {
+//            boat = visualiserRace.getVisualiserRaceState().getBoat(subject3D.getSourceID());
+//        } catch (BoatNotFoundException e) {
+//            e.printStackTrace();
+//            return;
+//        }
+//        arrowToNextMark = new AnimationTimer() {
+//            @Override
+//            public void handle(long now) {
+//                CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
+//                Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
+//
+//                nextMarkArrow.setX(view3D.getPivot().getX());
+//                nextMarkArrow.setY(view3D.getPivot().getY());
+//                nextMarkArrow.setZ(view3D.getPivot().getZ() + 15);
+//                nextMarkArrow.setHeading(headingToMark.degrees());
+//            }
+//        };
+//        arrowToNextMark.start();
     }
 
     private void removeThirdPersonAnnotations() {
-        viewSubjects.remove(nextMarkArrow);
-        if (arrowToNextMark != null) {
-            arrowToNextMark.stop();
-        }
-
+        nextMarkController.show2d();
     }
 
     /**
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index 76195416..0f044a14 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -22,7 +22,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.0.65" 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>
@@ -35,6 +35,13 @@
                             <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>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
new file mode 100644
index 00000000..d9971567
--- /dev/null
+++ b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.shape.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.image.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane fx:id="arrowGridPane" alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8" 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="125.0" prefWidth="125.0">
+         <children>
+            <StackPane fx:id="arrowStackPane2d" prefHeight="125.0" prefWidth="125.0">
+               <children>
+                  <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0">
+                     <image>
+                        <Image url="@../images/arrow.png" />
+                     </image>
+                  </ImageView>
+               </children>
+            </StackPane>
+            <Circle fx:id="circle" fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" />
+         </children>
+      </Pane>
+      <Label text="Next Mark" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="1">
+         <font>
+            <Font name="System Bold" size="16.0" />
+         </font>
+         <GridPane.margin>
+            <Insets />
+         </GridPane.margin>
+      </Label>
+      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0" />
+   </children>
+   <columnConstraints>
+      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+   </columnConstraints>
+   <rowConstraints>
+      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+   </rowConstraints>
+</GridPane>

From bf6282c69706a4500cd7f3bf6d70abc20775b58e Mon Sep 17 00:00:00 2001
From: Joseph <jjg64@uclive.ac.nz>
Date: Sun, 24 Sep 2017 17:28:13 +1300
Subject: [PATCH 02/16] 3D arrow added for zoomed view. Shows relative
 direction to mark. #story[1299]

---
 .../Controllers/NextMarkController.java       | 57 ++++++++++++++++++-
 .../Controllers/RaceViewController.java       |  1 -
 .../resources/visualiser/scenes/nextMark.fxml | 31 ++++++----
 3 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
index 001a1a60..fdff5046 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -2,16 +2,25 @@ package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
 import javafx.animation.AnimationTimer;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.geometry.Point3D;
+import javafx.scene.AmbientLight;
+import javafx.scene.control.Label;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Cylinder;
 import javafx.scene.shape.MeshView;
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
 import shared.model.Bearing;
 import shared.model.CompoundMark;
 import shared.model.GPSCoordinate;
+import visualiser.layout.Subject3D;
+import visualiser.layout.View3D;
 import visualiser.model.VisualiserBoat;
 
 import java.net.URL;
@@ -20,13 +29,16 @@ import java.util.Observer;
 
 public class NextMarkController {
     private @FXML StackPane arrowStackPane2d;
+    private @FXML StackPane arrowStackPane3d;
     private @FXML Pane pane2d;
     private @FXML Pane pane3d;
+    private @FXML Label nextMarkLabel;
 
     private VisualiserBoat boat;
 
     public void initialiseArrowView(VisualiserBoat boat) {
         this.boat = boat;
+        this.nextMarkLabel.setVisible(false);
         pane2d.setVisible(true);
         pane3d.setVisible(false);
         initialise2dArrowView();
@@ -46,13 +58,36 @@ public class NextMarkController {
     }
 
     private void initialise3dArrowView() {
+        ObservableList<Subject3D> viewSubjects = FXCollections.observableArrayList();
         URL asset = this.getClass().getClassLoader().getResource("assets/arrow V1.0.4.stl");
         StlMeshImporter importer = new StlMeshImporter();
         importer.read(asset);
 
         MeshView arrow = new MeshView(importer.getImport());
-        PhongMaterial arrowMat = new PhongMaterial(Color.RED);
+        PhongMaterial arrowMat = new PhongMaterial(Color.GREEN);
         arrow.setMaterial(arrowMat);
+
+        AmbientLight ambientLight = new AmbientLight(Color.web("#777777"));
+        ambientLight.setLightOn(true);
+
+        arrow.setScaleX(50);
+        arrow.setScaleY(50);
+        arrow.setScaleZ(300);
+        arrow.setRotationAxis(new Point3D(1,0,0));
+
+        arrowStackPane3d.getChildren().add(arrow);
+        arrowStackPane3d.getChildren().add(ambientLight);
+
+        AnimationTimer arrow3d = new AnimationTimer() {
+            @Override
+            public void handle(long now) {
+                arrow.getTransforms().clear();
+                double zRotation = calculateZRotate();
+                arrow.setRotate(calculateXRotate(zRotation));
+                arrow.getTransforms().add(new Rotate(zRotation, new Point3D(0, 0, 1)));
+            }
+        };
+        arrow3d.start();
     }
 
     public void show2d() {
@@ -64,4 +99,24 @@ public class NextMarkController {
         pane2d.setVisible(false);
         pane3d.setVisible(true);
     }
+
+    private double calculateZRotate() {
+        CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
+        Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
+        return -headingToMark.degrees() + boat.getBearing().degrees();
+    }
+
+    private double calculateXRotate(double zRotation) {
+        if (zRotation > 360) {
+            zRotation -=360;
+        } else if (zRotation < 0) {
+            zRotation += 360;
+        }
+
+        if (zRotation > 180) {
+            zRotation = 360 - zRotation;
+        }
+
+        return 90 - 20 * Math.cos(Math.toRadians(zRotation));
+    }
 }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 29a5bf89..94c169e4 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -229,7 +229,6 @@ public class RaceViewController extends Controller {
 
         try {
             nextMarkController.initialiseArrowView(race.getVisualiserRaceState().getBoat(race.getVisualiserRaceState().getPlayerBoatID()));
-            System.out.println("hi");
         } catch (BoatNotFoundException e) {
             e.printStackTrace();
         }
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
index d9971567..d26e20f7 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.image.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.shape.Circle?>
+<?import javafx.scene.text.Font?>
 
-<GridPane fx:id="arrowGridPane" alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.NextMarkController">
+<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="125.0" prefWidth="125.0">
          <children>
@@ -22,10 +25,10 @@
                   </ImageView>
                </children>
             </StackPane>
-            <Circle fx:id="circle" fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" />
+            <Circle fx:id="circle" fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" visible="false" />
          </children>
       </Pane>
-      <Label text="Next Mark" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="1">
+      <Label fx:id="nextMarkLabel" text="Next Mark" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="1">
          <font>
             <Font name="System Bold" size="16.0" />
          </font>
@@ -33,7 +36,11 @@
             <Insets />
          </GridPane.margin>
       </Label>
-      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0" />
+      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0">
+         <children>
+            <StackPane fx:id="arrowStackPane3d" prefHeight="125.0" prefWidth="125.0" />
+         </children>
+      </Pane>
    </children>
    <columnConstraints>
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />

From 819cdc49abd0e3fe67b5d8ea921bba3f02bad20a Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Sun, 24 Sep 2017 17:59:36 +1300
Subject: [PATCH 03/16] Created a slider on the Host Game screen.

- slider has min and max minutes
- a label is updated as the slider is moved
- the value of the slider selection is saved
- slider resizes appropriately with the window

#story[1323]
---
 .../Controllers/HostGameController.java       | 29 +++++++++++++++++++
 .../resources/visualiser/scenes/hostGame.fxml | 28 +++++++++++++-----
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
index 33583a38..e6b27a29 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
@@ -4,6 +4,8 @@ import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.Slider;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import mock.app.Event;
@@ -28,8 +30,12 @@ import java.util.logging.Logger;
  */
 public class HostGameController extends Controller {
     private @FXML ImageView mapImage;
+    private @FXML Slider sliderLength;
+    private @FXML Label lblLength;
     private ArrayList<Image> listOfMaps;
     private int currentMapIndex = 0;
+    private int selectedRaceLength; // in minutes
+    private final int MAX_RACE_LENGTH = 30; // in minutes
     private DatagramSocket udpSocket;
     private MatchBrowserInterface matchBrowserInterface;
 
@@ -37,8 +43,31 @@ public class HostGameController extends Controller {
         loadMaps();
         this.udpSocket = MatchBrowserSingleton.getInstance().getUdpSocket();
         this.matchBrowserInterface = MatchBrowserSingleton.getInstance().getMatchBrowserInterface();
+        setRaceLengthSlider();
     }
 
+    /**
+     * Sets up the values and display for a slider object which allows a user
+     * to select how many minutes long they would like their race to be.
+     */
+    private void setRaceLengthSlider(){
+        // set the listener to update the label
+        sliderLength.valueProperty().addListener((ov, old_val, new_val) -> {
+            selectedRaceLength = new_val.intValue();
+            if (selectedRaceLength == 1){
+                lblLength.setText(selectedRaceLength + " minute.");
+            } else {
+                lblLength.setText(selectedRaceLength + " minutes.");
+            }
+        });
+
+        // set values and marks to be displayed
+        sliderLength.setMin(1);
+        sliderLength.setMax(MAX_RACE_LENGTH);
+        sliderLength.setShowTickLabels(true);
+        sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);
+        sliderLength.setBlockIncrement(1);
+    }
 
 
     /**
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
index cf82c285..3218c802 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
@@ -3,6 +3,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -12,19 +13,20 @@
 
 <AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostGameController">
     <children>
-        <GridPane layoutY="14.0" AnchorPane.bottomAnchor="-14.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="14.0">
+        <GridPane layoutY="14.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="170.0" minWidth="10.0" prefWidth="170.0" />
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="170.0" minWidth="10.0" prefWidth="170.0" />
+                <ColumnConstraints hgrow="NEVER" prefWidth="170.0" />
+                <ColumnConstraints hgrow="NEVER" prefWidth="100.0" />
+                <ColumnConstraints hgrow="NEVER" prefWidth="170.0" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="435.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
+                <RowConstraints prefHeight="50.0" vgrow="NEVER" />
+                <RowConstraints prefHeight="419.5" vgrow="NEVER" />
+            <RowConstraints prefHeight="50.0" vgrow="NEVER" />
+                <RowConstraints prefHeight="80.0" vgrow="NEVER" />
             </rowConstraints>
             <children>
-                <Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                <Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
                     <font>
                         <Font size="20.0" />
                     </font>
@@ -50,6 +52,16 @@
                 <ImageView fx:id="mapImage" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" GridPane.valignment="CENTER" GridPane.vgrow="ALWAYS" />
                 <Button fx:id="previousButton" maxHeight="80.0" maxWidth="80.0" mnemonicParsing="false" onAction="#previousImage" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
                 <Button fx:id="nextButton" maxHeight="80.0" maxWidth="80.0" mnemonicParsing="false" onAction="#nextImage" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
+            <Slider fx:id="sliderLength" prefHeight="14.0" prefWidth="100.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
+               <GridPane.margin>
+                  <Insets left="50.0" right="50.0" />
+               </GridPane.margin>
+            </Slider>
+            <Label fx:id="lblLength" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+               <GridPane.margin>
+                  <Insets />
+               </GridPane.margin>
+            </Label>
             </children>
         </GridPane>
     </children>

From f1c1fc706326b864bd03f43dc671c36b9b77baf5 Mon Sep 17 00:00:00 2001
From: Jessica Syder <jam339@uclive.ac.nz>
Date: Sun, 24 Sep 2017 22:56:14 +1300
Subject: [PATCH 04/16] Race length is affected by slider value.

- modified constructor of a race event to take in a scale value
- race is scaled according to minutes selected on the slider
- applied minimal css styling
- playing around with more styling options
- bug exists with 1 minute races, to be fixed

#story[1323]
---
 dedicatedServer/src/main/java/app/App.java    |  2 +-
 .../src/main/java/mock/app/Event.java         | 27 ++++++-------------
 .../Controllers/HostGameController.java       |  5 +++-
 .../src/main/resources/css/slider.css         | 16 +++++++++++
 4 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/css/slider.css

diff --git a/dedicatedServer/src/main/java/app/App.java b/dedicatedServer/src/main/java/app/App.java
index 3b36c43e..b2228131 100644
--- a/dedicatedServer/src/main/java/app/App.java
+++ b/dedicatedServer/src/main/java/app/App.java
@@ -21,7 +21,7 @@ public class App extends Application {
     public void start(Stage primaryStage) {
         try {
             //TODO should read a configuration file to configure server?
-            Event raceEvent = new Event(false, 0);
+            Event raceEvent = new Event(false, 0, 5);
 
 
         } catch (Exception e) {
diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 1e1b8966..b50e33d5 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -40,46 +40,33 @@ public class Event {
     private String raceXML;
     private String regattaXML;
     private String boatXML;
-
     private XMLFileType xmlFileType;
-
     private Polars boatPolars;
-
     /**
      * Data sources containing data from the xml files.
      */
-    RaceDataSource raceDataSource;
-    BoatDataSource boatDataSource;
-    RegattaDataSource regattaDataSource;
-
-
+    private RaceDataSource raceDataSource;
+    private BoatDataSource boatDataSource;
+    private RegattaDataSource regattaDataSource;
     private ConnectionAcceptor connectionAcceptor;
     private LatestMessages latestMessages;
-
     private CompositeCommand compositeCommand;
-
     /**
      * This is used to allocate source IDs.
      */
     private SourceIdAllocator sourceIdAllocator;
-
     private Thread raceThread;
-
     private Thread connectionThread;
-
     private int mapIndex;
 
-
-
-
-
     /**
      * Constructs an event, using various XML files.
      * @param singlePlayer Whether or not to create a single player event.
      * @param mapIndex Specifies which map to use.
      * @throws EventConstructionException Thrown if we cannot create an Event for any reason.
      */
-    public Event(boolean singlePlayer, int mapIndex) throws EventConstructionException {
+    public Event(boolean singlePlayer, int mapIndex, int raceLength) throws
+            EventConstructionException {
         PolarParser.parseNewPolars("mock/polars/acc_polars.csv");
         this.mapIndex = mapIndex;
         String raceXMLFile;
@@ -121,7 +108,9 @@ public class Event {
                 this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1, true);
             } else {
                 this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle, false);
-                this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML, windSpeed, 15 * 60 * 1000);
+                this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML,
+                        windSpeed, raceLength);
+                System.out.println(raceLength);
             }
 
             this.boatXML = XMLReader.readXMLFileToString(boatsXMLFile, StandardCharsets.UTF_8);
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
index e6b27a29..23dc33c3 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
@@ -67,6 +67,8 @@ public class HostGameController extends Controller {
         sliderLength.setShowTickLabels(true);
         sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);
         sliderLength.setBlockIncrement(1);
+
+        sliderLength.getStylesheets().add("/css/slider.css");
     }
 
 
@@ -93,7 +95,8 @@ public class HostGameController extends Controller {
      */
     public void hostGamePressed() {
         try {
-            App.game = new Event(false, currentMapIndex);
+            App.game = new Event(false, currentMapIndex,
+                    selectedRaceLength*60*1000);
             App.gameType = currentMapIndex;
 
             HttpMatchBrowserHost matchBrowserHost = new HttpMatchBrowserHost();
diff --git a/racevisionGame/src/main/resources/css/slider.css b/racevisionGame/src/main/resources/css/slider.css
new file mode 100644
index 00000000..2cb9832d
--- /dev/null
+++ b/racevisionGame/src/main/resources/css/slider.css
@@ -0,0 +1,16 @@
+.slider .thumb {
+    -fx-background-image: url("/visualiser/images/sun.png");
+    -fx-background-size: 25px;
+    -fx-pref-height: 25px;
+    -fx-pref-width: 25px;
+    -fx-background-position: top;
+    -fx-background-repeat: no-repeat;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+.slider .track {
+    -fx-control-inner-background: dodgerblue;
+    -fx-border-color: rgba(30, 144, 255, 0.44);
+    -fx-border-radius: 0.25em, 0.25em, 0.166667em;
+}
\ No newline at end of file

From f9f5cfef7de79b944ab3c22dc87dad25b2c4dcac Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Mon, 25 Sep 2017 13:11:09 +1300
Subject: [PATCH 05/16] Chanegd next mark arrow to fit with new UI.
 #story[1299]

---
 .../Controllers/NextMarkController.java       | 10 ++++-----
 .../resources/visualiser/scenes/nextMark.fxml | 22 ++++---------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
index fdff5046..20ee5926 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -32,13 +32,11 @@ public class NextMarkController {
     private @FXML StackPane arrowStackPane3d;
     private @FXML Pane pane2d;
     private @FXML Pane pane3d;
-    private @FXML Label nextMarkLabel;
 
     private VisualiserBoat boat;
 
     public void initialiseArrowView(VisualiserBoat boat) {
         this.boat = boat;
-        this.nextMarkLabel.setVisible(false);
         pane2d.setVisible(true);
         pane3d.setVisible(false);
         initialise2dArrowView();
@@ -70,13 +68,13 @@ public class NextMarkController {
         AmbientLight ambientLight = new AmbientLight(Color.web("#777777"));
         ambientLight.setLightOn(true);
 
-        arrow.setScaleX(50);
-        arrow.setScaleY(50);
-        arrow.setScaleZ(300);
+        arrow.setScaleX(25);
+        arrow.setScaleY(25);
+        arrow.setScaleZ(200);
         arrow.setRotationAxis(new Point3D(1,0,0));
 
         arrowStackPane3d.getChildren().add(arrow);
-        arrowStackPane3d.getChildren().add(ambientLight);
+        //arrowStackPane3d.getChildren().add(ambientLight);
 
         AnimationTimer arrow3d = new AnimationTimer() {
             @Override
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
index d26e20f7..358d4afe 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -9,14 +7,12 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.shape.Circle?>
-<?import javafx.scene.text.Font?>
 
 <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="125.0" prefWidth="125.0">
+      <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
          <children>
-            <StackPane fx:id="arrowStackPane2d" prefHeight="125.0" prefWidth="125.0">
+            <StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0">
                <children>
                   <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0">
                      <image>
@@ -25,20 +21,11 @@
                   </ImageView>
                </children>
             </StackPane>
-            <Circle fx:id="circle" fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" visible="false" />
          </children>
       </Pane>
-      <Label fx:id="nextMarkLabel" text="Next Mark" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="1">
-         <font>
-            <Font name="System Bold" size="16.0" />
-         </font>
-         <GridPane.margin>
-            <Insets />
-         </GridPane.margin>
-      </Label>
-      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0">
+      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
          <children>
-            <StackPane fx:id="arrowStackPane3d" prefHeight="125.0" prefWidth="125.0" />
+            <StackPane fx:id="arrowStackPane3d" prefHeight="112.0" prefWidth="112.0" />
          </children>
       </Pane>
    </children>
@@ -47,6 +34,5 @@
    </columnConstraints>
    <rowConstraints>
       <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
    </rowConstraints>
 </GridPane>

From 44268cc30b96c3cb542e2177c6dfe30fc2eb4d94 Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Mon, 25 Sep 2017 15:30:49 +1300
Subject: [PATCH 06/16] Fixed not being able to add custom connections. Still
 need to test if it works with the http match browser (can't test it atm.
 #story[1352]

---
 .../main/java/visualiser/Controllers/LobbyController.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
index 38816a0e..dae4c850 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
@@ -40,7 +40,6 @@ public class LobbyController extends Controller {
     private @FXML TextField addressFld;
     private @FXML TextField portFld;
 
-    private ObservableList<RaceConnection> connections;
     private ObservableList<RaceConnection> customConnections;
 
     private AudioClip sound;
@@ -83,7 +82,7 @@ public class LobbyController extends Controller {
         sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm());
         sound.play();
         addServerGames();
-        for(RaceConnection connection: connections) {
+        for(RaceConnection connection: httpMatchBrowserClient.connections) {
             connection.check();
         }
         try {
@@ -144,9 +143,9 @@ public class LobbyController extends Controller {
         try {
             int port = Integer.parseInt(portString);
             customConnections.add(new RaceConnection(hostName, port, "Boat Game"));
-            connections.addAll(customConnections);
             addressFld.clear();
             portFld.clear();
+            refreshBtnPressed();
         } catch (NumberFormatException e) {
             System.err.println("Port number entered is not a number");
         }
@@ -174,6 +173,7 @@ public class LobbyController extends Controller {
      */
     private void addServerGames() {
         httpMatchBrowserClient.connections.addAll(customConnections);
+        customConnections.clear();
         httpMatchBrowserClient.connections.addListener(new ListChangeListener<RaceConnection>() {
             @Override
             public void onChanged(Change<? extends RaceConnection> c) {

From 3f04485b78cc2ad131ad53c6ec13018424c00feb Mon Sep 17 00:00:00 2001
From: Joseph <jjg64@uclive.ac.nz>
Date: Tue, 26 Sep 2017 13:16:09 +1300
Subject: [PATCH 07/16] Added manual connections works while also receiving
 available games from the server. #story[1352]

---
 .../Controllers/LobbyController.java          | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
index dae4c850..5953bf92 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
@@ -40,6 +40,7 @@ public class LobbyController extends Controller {
     private @FXML TextField addressFld;
     private @FXML TextField portFld;
 
+    private ObservableList<RaceConnection> allConnections;
     private ObservableList<RaceConnection> customConnections;
 
     private AudioClip sound;
@@ -50,12 +51,20 @@ public class LobbyController extends Controller {
 
     public void initialize() {
         httpMatchBrowserClient = new HttpMatchBrowserClient();
+        httpMatchBrowserClient.connections.addListener(new ListChangeListener<RaceConnection>() {
+            @Override
+            public void onChanged(Change<? extends RaceConnection> c) {
+                refreshTable();
+            }
+        });
+
         new Thread(httpMatchBrowserClient, "Match Client").start();
         // set up the connection table
         customConnections = FXCollections.observableArrayList();
+        allConnections = FXCollections.observableArrayList();
         //connections.add(new RaceConnection("localhost", 4942, "Local Game"));
 
-        lobbyTable.setItems(httpMatchBrowserClient.connections);
+        lobbyTable.setItems(allConnections);
         gameNameColumn.setCellValueFactory(cellData -> cellData.getValue().gamenameProperty());
         hostNameColumn.setCellValueFactory(cellData -> cellData.getValue().hostnameProperty());
         statusColumn.setCellValueFactory(cellData -> cellData.getValue().statusProperty());
@@ -81,8 +90,14 @@ public class LobbyController extends Controller {
     public void refreshBtnPressed(){
         sound = new AudioClip(this.getClass().getResource("/visualiser/sounds/buttonpress.wav").toExternalForm());
         sound.play();
+        refreshTable();
+    }
+
+    private void refreshTable() {
+        allConnections.clear();
+        addCustomGames();
         addServerGames();
-        for(RaceConnection connection: httpMatchBrowserClient.connections) {
+        for(RaceConnection connection: allConnections) {
             connection.check();
         }
         try {
@@ -145,7 +160,7 @@ public class LobbyController extends Controller {
             customConnections.add(new RaceConnection(hostName, port, "Boat Game"));
             addressFld.clear();
             portFld.clear();
-            refreshBtnPressed();
+            refreshTable();
         } catch (NumberFormatException e) {
             System.err.println("Port number entered is not a number");
         }
@@ -172,18 +187,14 @@ public class LobbyController extends Controller {
      * Adds the games received from the server
      */
     private void addServerGames() {
-        httpMatchBrowserClient.connections.addAll(customConnections);
-        customConnections.clear();
-        httpMatchBrowserClient.connections.addListener(new ListChangeListener<RaceConnection>() {
-            @Override
-            public void onChanged(Change<? extends RaceConnection> c) {
-                refreshBtnPressed();
-            }
-        });
-
+        allConnections.addAll(httpMatchBrowserClient.connections);
         /*
         for (HostGame game : matchBrowserLobbyInterface.getGames()) {
             connections.add(new RaceConnection(game.getIp(), 4942, "Boat Game"));
         }*/
     }
+
+    private void addCustomGames() {
+        allConnections.addAll(customConnections);
+    }
 }

From a33583d67d277a6ef45311856d150e81be8e8df2 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 26 Sep 2017 16:38:03 +1300
Subject: [PATCH 08/16] Fixed racescaling a mark twice and removed println
 statements #story[1323]

---
 racevisionGame/src/main/java/mock/app/Event.java       |  1 -
 .../src/main/java/mock/xml/RaceXMLCreator.java         | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index b50e33d5..052ea051 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -110,7 +110,6 @@ public class Event {
                 this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle, false);
                 this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML,
                         windSpeed, raceLength);
-                System.out.println(raceLength);
             }
 
             this.boatXML = XMLReader.readXMLFileToString(boatsXMLFile, StandardCharsets.UTF_8);
diff --git a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
index 2c15e57f..a35693fe 100644
--- a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
+++ b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
@@ -21,6 +21,8 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Helper Class for creating a Race XML
@@ -218,12 +220,16 @@ public class RaceXMLCreator {
         double averageSpeed = (bestDownWindSpeed + bestUpWindSpeed) / 2;
         double raceApproximateTime = getRaceLength(race, averageSpeed);
         double scale = milliseconds / raceApproximateTime;
+        Map<XMLCompoundMark, Boolean> hasBeenScaled = new HashMap<>();
         for (XMLCorner cm: race.getCompoundMarkSequence().getCorner()){
             int index = cm.getCompoundMarkID() - 1;
             XMLCompoundMark mark = race.getCourse().getCompoundMark().get(index);
-            for (XMLMark m: mark.getMark()){
-                scalePoint(m, center, scale);
+            if (!hasBeenScaled.containsKey(mark)) {
+                for (XMLMark m : mark.getMark()) {
+                    scalePoint(m, center, scale);
+                }
             }
+            hasBeenScaled.put(mark, true);
         }
         for (XMLLimit limit: race.getCourseLimit().getLimit()){
             scalePoint(limit, center, scale);

From d6884a698193c5b53fcc8ae1023820aab7cd0835 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 26 Sep 2017 16:41:31 +1300
Subject: [PATCH 09/16] Deprecated a method that shouldn't be used but is still
 being used, and merged in most recent master #story[1323]

---
 .../src/main/java/mock/xml/RaceXMLCreator.java           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
index 1aea5555..502e6ab6 100644
--- a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
+++ b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
@@ -325,8 +325,13 @@ public class RaceXMLCreator {
     }
 
 
-
-
+    /**
+     * sets the current race time of the xml
+     * @param raceXML race xml to alter
+     * @param racePrestartTime prestart time
+     * @param racePreparatoryTime preparatory time
+     * @deprecated this should be used from the RaceXMLCreator not from this function
+     */
     public static void setRaceXMLAtCurrentTimeToNow(XMLRace raceXML, long racePrestartTime, long racePreparatoryTime){
         //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
         long millisecondsToAdd = racePrestartTime + racePreparatoryTime;

From 1ca276ec62a1fc821ea703645b1f31537d5437b0 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Tue, 26 Sep 2017 16:48:23 +1300
Subject: [PATCH 10/16] Fixed some issue after merge as well as set the minimum
 race time to 2 minutes. #story[1323]

---
 racevisionGame/src/main/java/mock/app/Event.java               | 3 ++-
 .../main/java/visualiser/Controllers/HostGameController.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 51fab380..1a70b65c 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -111,7 +111,8 @@ public class Event {
                 this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1);
 
             } else {
-                this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle, false);
+                this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8));
+                this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle);
                 this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML,
                         windSpeed, raceLength);
             }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
index 23dc33c3..dac62be0 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
@@ -62,7 +62,7 @@ public class HostGameController extends Controller {
         });
 
         // set values and marks to be displayed
-        sliderLength.setMin(1);
+        sliderLength.setMin(2);
         sliderLength.setMax(MAX_RACE_LENGTH);
         sliderLength.setShowTickLabels(true);
         sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);

From 699df2e775b0ba8ab8a48927a9f370b351251ed1 Mon Sep 17 00:00:00 2001
From: Joseph <jjg64@uclive.ac.nz>
Date: Tue, 26 Sep 2017 18:30:29 +1300
Subject: [PATCH 11/16] Using new arrow / arrow textures. Made sails not
 clickable.

---
 .../Controllers/NextMarkController.java       |  21 +++---
 .../Controllers/RaceViewController.java       |   1 +
 .../main/java/visualiser/layout/Assets3D.java |   2 +-
 .../src/main/resources/assets/mark_arrow.x3d  |  62 ++++++++++++++++++
 .../textures/Material Diffuse Color.002       | Bin 0 -> 38559 bytes
 5 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/assets/mark_arrow.x3d
 create mode 100644 racevisionGame/src/main/resources/assets/textures/Material Diffuse Color.002

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
index 20ee5926..4f4d3f9c 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -19,6 +19,8 @@ import javafx.scene.transform.Rotate;
 import shared.model.Bearing;
 import shared.model.CompoundMark;
 import shared.model.GPSCoordinate;
+import visualiser.layout.Annotation3D;
+import visualiser.layout.Assets3D;
 import visualiser.layout.Subject3D;
 import visualiser.layout.View3D;
 import visualiser.model.VisualiserBoat;
@@ -57,24 +59,16 @@ public class NextMarkController {
 
     private void initialise3dArrowView() {
         ObservableList<Subject3D> viewSubjects = FXCollections.observableArrayList();
-        URL asset = this.getClass().getClassLoader().getResource("assets/arrow V1.0.4.stl");
-        StlMeshImporter importer = new StlMeshImporter();
-        importer.read(asset);
+        String arrowPath = "assets/mark_arrow.x3d";
 
-        MeshView arrow = new MeshView(importer.getImport());
-        PhongMaterial arrowMat = new PhongMaterial(Color.GREEN);
-        arrow.setMaterial(arrowMat);
-
-        AmbientLight ambientLight = new AmbientLight(Color.web("#777777"));
-        ambientLight.setLightOn(true);
+        Shape3D arrow = Assets3D.loadX3d(arrowPath);
 
         arrow.setScaleX(25);
         arrow.setScaleY(25);
-        arrow.setScaleZ(200);
+        arrow.setScaleZ(100);
         arrow.setRotationAxis(new Point3D(1,0,0));
 
         arrowStackPane3d.getChildren().add(arrow);
-        //arrowStackPane3d.getChildren().add(ambientLight);
 
         AnimationTimer arrow3d = new AnimationTimer() {
             @Override
@@ -101,7 +95,7 @@ public class NextMarkController {
     private double calculateZRotate() {
         CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
         Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
-        return -headingToMark.degrees() + boat.getBearing().degrees();
+        return -headingToMark.degrees() + boat.getBearing().degrees() + 180;
     }
 
     private double calculateXRotate(double zRotation) {
@@ -115,6 +109,7 @@ public class NextMarkController {
             zRotation = 360 - zRotation;
         }
 
-        return 90 - 20 * Math.cos(Math.toRadians(zRotation));
+        return 110;
+//        return 90 - 20 * Math.cos(Math.toRadians(zRotation));
     }
 }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 117475a6..746d25d3 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -420,6 +420,7 @@ public class RaceViewController extends Controller {
             //add sail
             Sails3D sails3D = new Sails3D();
             Subject3D sailsSubject = new Subject3D(sails3D, 0);
+            sails3D.setMouseTransparent(true);
             sails3D.setMaterial(boatColorMat);
             sailsSubject.setXRot(0d);
             sailsSubject.setHeading(visualiserRace.getVisualiserRaceState().getWindDirection().degrees());
diff --git a/racevisionGame/src/main/java/visualiser/layout/Assets3D.java b/racevisionGame/src/main/java/visualiser/layout/Assets3D.java
index 756d5a9e..28bb3497 100644
--- a/racevisionGame/src/main/java/visualiser/layout/Assets3D.java
+++ b/racevisionGame/src/main/java/visualiser/layout/Assets3D.java
@@ -52,7 +52,7 @@ public class Assets3D {
         windArrow = new Annotation3D(loadX3d(arrowPath));
     }
 
-    private static Shape3D loadX3d(String path){
+    public static Shape3D loadX3d(String path){
         X3dModelImporter x3dModelImporter = new X3dModelImporter();
         URL asset = Assets3D.class.getClassLoader().getResource(path);
         x3dModelImporter.read(asset);
diff --git a/racevisionGame/src/main/resources/assets/mark_arrow.x3d b/racevisionGame/src/main/resources/assets/mark_arrow.x3d
new file mode 100644
index 00000000..1b41caec
--- /dev/null
+++ b/racevisionGame/src/main/resources/assets/mark_arrow.x3d
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "http://www.web3d.org/specifications/x3d-3.0.dtd">
+<X3D version="3.0" profile="Immersive" xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance" xsd:noNamespaceSchemaLocation="http://www.web3d.org/specifications/x3d-3.0.xsd">
+	<head>
+		<meta name="filename" content="Mark Arrow V1.3.x3d" />
+		<meta name="generator" content="Blender 2.77 (sub 0)" />
+	</head>
+	<Scene>
+		<NavigationInfo headlight="true"
+		                visibilityLimit="0.0"
+		                type='"EXAMINE", "ANY"'
+		                avatarSize="0.25, 1.75, 0.75"
+		                />
+		<Background DEF="WO_World"
+		            groundColor="0.051 0.051 0.051"
+		            skyColor="0.051 0.051 0.051"
+		            />
+		<Transform DEF="Cube_TRANSFORM"
+		           translation="0.000000 0.000000 0.000000"
+		           scale="1.000000 1.000000 1.000000"
+		           rotation="0.000000 0.707107 0.707107 3.141593"
+		           >
+			<Transform DEF="Cube_ifs_TRANSFORM"
+			           translation="0.000000 0.000000 0.000000"
+			           scale="1.000000 1.000000 1.000000"
+			           rotation="1.000000 0.000000 0.000000 0.000000"
+			           >
+				<Group DEF="group_ME_Cube">
+					<Shape>
+						<Appearance>
+							<ImageTexture DEF="IM_Material_Diffuse_Color_002"
+							              url='"textures/Material Diffuse Color.002" "Material Diffuse Color.002" "D:/Storage/3D Models/Misc/SENG302/Mark Arrow/textures/Material Diffuse Color.002"'
+							              />
+							<TextureTransform 
+							                  translation="0.000000 0.000000"
+							                  scale="1.000000 1.000000"
+							                  rotation="0.000000"
+							                  />
+							<Material DEF="MA_Material"
+							          diffuseColor="0.800 0.800 0.800"
+							          specularColor="0.401 0.401 0.401"
+							          emissiveColor="0.000 0.000 0.000"
+							          ambientIntensity="0.333"
+							          shininess="0.098"
+							          transparency="0.0"
+							          />
+						</Appearance>
+						<IndexedFaceSet solid="true"
+						                texCoordIndex="0 1 2 -1 3 4 5 -1 6 7 8 9 -1 10 11 12 -1 13 14 15 -1 16 17 18 19 -1 20 21 22 -1 23 24 25 -1 26 27 28 29 -1 30 31 32 -1 33 34 35 -1 36 37 38 39 -1 "
+						                coordIndex="4 1 7 -1 2 0 8 -1 1 0 2 3 -1 1 3 7 -1 8 0 9 -1 0 1 4 9 -1 4 7 6 -1 2 8 5 -1 6 3 2 5 -1 6 7 3 -1 8 9 5 -1 4 6 5 9 -1 "
+						                >
+							<Coordinate DEF="coords_ME_Cube"
+							            point="1.000000 -0.000000 -0.100000 1.000000 -0.000001 0.100000 0.000000 2.000000 -0.100000 0.000000 2.000000 0.100000 0.000000 -2.000000 0.100000 -1.000000 -0.000000 -0.100000 -1.000000 -0.000001 0.100000 0.000000 -0.000000 0.100000 0.000000 0.000000 -0.100000 0.000000 -2.000000 -0.100000 "
+							            />
+							<TextureCoordinate point="0.9999 0.0001 0.7826 0.0001 0.8260 0.0870 0.6522 0.1934 0.7826 0.3673 0.8260 0.2803 0.4348 0.1740 0.4348 0.1934 0.6522 0.1934 0.6522 0.1740 0.7826 0.0001 0.6522 0.1740 0.8260 0.0870 0.8260 0.2803 0.7826 0.3673 0.9999 0.3673 0.4348 0.1934 0.4348 0.1740 0.2174 0.1740 0.2174 0.1934 0.9999 0.0001 0.8260 0.0870 0.8695 0.1740 0.6522 0.1934 0.8260 0.2803 0.8695 0.1934 0.8695 0.1740 0.6522 0.1740 0.6522 0.1934 0.8695 0.1934 0.8695 0.1740 0.8260 0.0870 0.6522 0.1740 0.8260 0.2803 0.9999 0.3673 0.8695 0.1934 0.2174 0.1740 0.0001 0.1740 0.0001 0.1934 0.2174 0.1934 " />
+						</IndexedFaceSet>
+					</Shape>
+				</Group>
+			</Transform>
+		</Transform>
+	</Scene>
+</X3D>
\ No newline at end of file
diff --git a/racevisionGame/src/main/resources/assets/textures/Material Diffuse Color.002 b/racevisionGame/src/main/resources/assets/textures/Material Diffuse Color.002
new file mode 100644
index 0000000000000000000000000000000000000000..0c5dbaeb72c2960fcd502b6a0b3e680347d0f1bb
GIT binary patch
literal 38559
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

literal 0
HcmV?d00001


From 569204b771bffb4fe0c28636521ae6df2d601c5a Mon Sep 17 00:00:00 2001
From: Joseph <jjg64@uclive.ac.nz>
Date: Wed, 27 Sep 2017 00:36:05 +1300
Subject: [PATCH 12/16] New skin for 2d next mark arrow. #story[1299]

---
 .../main/resources/images/nextMarkArrow2d.png    | Bin 0 -> 8085 bytes
 .../resources/visualiser/scenes/nextMark.fxml    |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 racevisionGame/src/main/resources/images/nextMarkArrow2d.png

diff --git a/racevisionGame/src/main/resources/images/nextMarkArrow2d.png b/racevisionGame/src/main/resources/images/nextMarkArrow2d.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed9506c46990627f53d0716063e8cc7762846aa8
GIT binary patch
literal 8085
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

literal 0
HcmV?d00001

diff --git a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
index 358d4afe..a2e15c37 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
@@ -14,9 +14,9 @@
          <children>
             <StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0">
                <children>
-                  <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0">
+                  <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="25.0">
                      <image>
-                        <Image url="@../images/arrow.png" />
+                        <Image url="@../../images/nextMarkArrow2d.png" />
                      </image>
                   </ImageView>
                </children>

From 26e2035ea2477d0d4f57cf1c121034240bfa00ba Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Wed, 27 Sep 2017 11:39:12 +1300
Subject: [PATCH 13/16] Changed 3d arrow to point downwards #story[1299]

---
 .../Controllers/NextMarkController.java       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
index 4f4d3f9c..7370246f 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -99,17 +99,17 @@ public class NextMarkController {
     }
 
     private double calculateXRotate(double zRotation) {
-        if (zRotation > 360) {
-            zRotation -=360;
-        } else if (zRotation < 0) {
-            zRotation += 360;
-        }
-
-        if (zRotation > 180) {
-            zRotation = 360 - zRotation;
-        }
-
-        return 110;
-//        return 90 - 20 * Math.cos(Math.toRadians(zRotation));
+//        if (zRotation > 360) {
+//            zRotation -=360;
+//        } else if (zRotation < 0) {
+//            zRotation += 360;
+//        }
+//
+//        if (zRotation > 180) {
+//            zRotation = 360 - zRotation;
+//        }
+
+        return 70;
+        //return 90 - 20 * Math.cos(Math.toRadians(zRotation));
     }
 }

From d6b0fec6d3a77511073785a838e001b3e16ad04c Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 27 Sep 2017 12:02:56 +1300
Subject: [PATCH 14/16] Start race in third person by default - Third person
 zoom limit has been lowered - Next mark highlighting and arrow only follows
 player boat

---
 .../Controllers/RaceViewController.java       | 54 ++++++++++---------
 .../main/java/visualiser/layout/View3D.java   |  2 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index d1ef843e..64bca8b4 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -387,11 +387,27 @@ public class RaceViewController extends Controller {
             viewSubjects.add(markModel);
         }
 
-        for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
+        // Position and add each boat to view
+        for(VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
+            Shape3D mesh = Assets3D.getBoat();
+
+            PhongMaterial boatColorMat = new PhongMaterial(boat.getColor());
+            //mesh.setMaterial(boatColorMat);
+            Subject3D boatModel = new Subject3D(mesh, boat.getSourceID());
+
+            // Configure visualiser for client's boat
             if (boat.isClientBoat()) {
+                // Add player boat highlight
                 Shockwave boatHighlight = new Shockwave(10);
                 boatHighlight.getMesh().setMaterial(new PhongMaterial(new Color(1, 1, 0, 0.1)));
                 viewSubjects.add(boatHighlight);
+
+                // Track player boat with camera
+                viewSubjects.add(boatModel);
+                view3D.trackSubject(boatModel);
+                view3D.setThirdPerson();
+
+                // Track player boat with highlight
                 AnimationTimer highlightTrack = new AnimationTimer() {
                     @Override
                     public void handle(long now) {
@@ -400,24 +416,18 @@ public class RaceViewController extends Controller {
                     }
                 };
                 highlightTrack.start();
-            }
-        }
 
-        // Position and add each boat to view
-        for(VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
-//            MeshView mesh;
-//            if(boat.getSourceID() == race.getVisualiserRaceState().getPlayerBoatID()) {
-//                mesh = new MeshView(importer.getImport());
-//            } else {
-//                mesh = new MeshView(importerBurgerBoat.getImport());
-//            }
-            Shape3D mesh = Assets3D.getBoat();
-
-            PhongMaterial boatColorMat = new PhongMaterial(boat.getColor());
-            //mesh.setMaterial(boatColorMat);
-            Subject3D boatModel = new Subject3D(mesh, boat.getSourceID());
-
-            viewSubjects.add(boatModel);
+                // Highlight next mark only for player boat
+                Material markColor = new PhongMaterial(new Color(0.15,0.9,0.2,1));
+                CompoundMark nextMark = boat.getCurrentLeg().getEndCompoundMark();
+                view3D.getShape(nextMark.getMark1().getSourceID()).getMesh().setMaterial(markColor);
+                if(nextMark.getMark2() != null) {
+                    view3D.getShape(nextMark.getMark2().getSourceID()).getMesh().setMaterial(markColor);
+                }
+                boat.legProperty().addListener((o, prev, curr) -> Platform.runLater(() -> swapColours(curr)));
+            } else {
+                viewSubjects.add(boatModel);
+            }
 
             //add sail
             Sails3D sails3D = new Sails3D();
@@ -502,17 +512,9 @@ public class RaceViewController extends Controller {
             };
             trackBoat.start();
 
-            Material markColor = new PhongMaterial(new Color(0.15,0.9,0.2,1));
-            CompoundMark nextMark = boat.getCurrentLeg().getEndCompoundMark();
-            view3D.getShape(nextMark.getMark1().getSourceID()).getMesh().setMaterial(markColor);
-            if(nextMark.getMark2() != null) {
-                view3D.getShape(nextMark.getMark2().getSourceID()).getMesh().setMaterial(markColor);
-            }
             Subject3D shockwave = new Shockwave(10);
-
             viewSubjects.add(shockwave);
 
-            boat.legProperty().addListener((o, prev, curr) -> Platform.runLater(() -> swapColours(curr)));
             boat.hasCollidedProperty().addListener((o, prev, curr) -> Platform.runLater(() -> showCollision(boat, shockwave)));
         }
         // Fix initial bird's-eye position
diff --git a/racevisionGame/src/main/java/visualiser/layout/View3D.java b/racevisionGame/src/main/java/visualiser/layout/View3D.java
index 7277ac5f..8501cdaa 100644
--- a/racevisionGame/src/main/java/visualiser/layout/View3D.java
+++ b/racevisionGame/src/main/java/visualiser/layout/View3D.java
@@ -81,7 +81,7 @@ public class View3D extends Pane {
     /**
      * Distance to stop zoom
      */
-    private final double ZOOM_IN_LIMIT = 30;
+    private final double ZOOM_IN_LIMIT = 3;
     private final double ZOOM_OUT_LIMIT = 700;
     private final double MAX_ZOOM_LIMIT = 1500;
     private final double MAX_PITCH = 60;    // birds eye view

From 73bffb35e3246d8039db9a4e86cb7188b0e99779 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Wed, 27 Sep 2017 12:15:13 +1300
Subject: [PATCH 15/16] Removed stutter

---
 .../java/visualiser/Controllers/RaceViewController.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 64bca8b4..38239899 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -404,8 +404,10 @@ public class RaceViewController extends Controller {
 
                 // Track player boat with camera
                 viewSubjects.add(boatModel);
-                view3D.trackSubject(boatModel);
-                view3D.setThirdPerson();
+                Platform.runLater(() -> {
+                    view3D.trackSubject(boatModel);
+                    view3D.setThirdPerson();
+                });
 
                 // Track player boat with highlight
                 AnimationTimer highlightTrack = new AnimationTimer() {

From 7ac181f33dcca0b2b3ef9d6a57747d1a4c009853 Mon Sep 17 00:00:00 2001
From: Joseph Gardner <jjg64@uclive.ac.nz>
Date: Wed, 27 Sep 2017 13:08:29 +1300
Subject: [PATCH 16/16] Fixed null pointer when race finishes #story[1299]

---
 .../Controllers/NextMarkController.java       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
index 7370246f..20da6f3c 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
@@ -49,9 +49,13 @@ public class NextMarkController {
         AnimationTimer arrow2d = new AnimationTimer() {
             @Override
             public void handle(long now) {
-                CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
-                Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
-                arrowStackPane2d.setRotate(headingToMark.degrees());
+                if (boat.getCurrentLeg().getEndCompoundMark() != null) {
+                    CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
+                    Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
+                    arrowStackPane2d.setRotate(headingToMark.degrees());
+                } else {
+                    stop();
+                }
             }
         };
         arrow2d.start();
@@ -73,10 +77,14 @@ public class NextMarkController {
         AnimationTimer arrow3d = new AnimationTimer() {
             @Override
             public void handle(long now) {
-                arrow.getTransforms().clear();
-                double zRotation = calculateZRotate();
-                arrow.setRotate(calculateXRotate(zRotation));
-                arrow.getTransforms().add(new Rotate(zRotation, new Point3D(0, 0, 1)));
+                if (boat.getCurrentLeg().getEndCompoundMark() != null) {
+                    arrow.getTransforms().clear();
+                    double zRotation = calculateZRotate();
+                    arrow.setRotate(calculateXRotate(zRotation));
+                    arrow.getTransforms().add(new Rotate(zRotation, new Point3D(0, 0, 1)));
+                } else {
+                    stop();
+                }
             }
         };
         arrow3d.start();