Merge branch 'NewUI_merge' into story1266_3d_model_factory

# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java

src/main/java/seng302/visualiser/fxObjects/assets_2D/BoatObject.java

@@ -1,7 +1,5 @@
 package seng302.visualiser.fxObjects.assets_2D;
 
-import java.util.ArrayList;
-import java.util.List;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -25,6 +23,9 @@ import seng302.visualiser.fxObjects.assets_3D.BoatModel;
 import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
 import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * BoatGroup is a javafx group that by default contains a graphical objects for representing a 2
  * dimensional boat. It contains a single polygon for the boat, a group of lines to show it's path,
@@ -189,6 +190,7 @@ public class BoatObject extends Group {
      * @param rotation The rotation by which the boat moves
      * @param velocity The velocity the boat is moving
      * @param sailIn Boolean to toggle sail state.
+     * @param windDir .
      */
     public void moveTo(double x, double y, double rotation, double velocity, Boolean sailIn, double windDir) {
         Double dx = Math.abs(boatAssets.getAssets().getLayoutX() - x);

src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java

@@ -7,16 +7,13 @@ import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Circle;
-import javafx.scene.transform.Scale;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
 /**
  * Visual object for a mark. Contains a coloured circle and any specified arrows.
  */
-public class Marker extends Group {
+public class Marker2D extends Group {
 
-    private Group mark = ModelFactory.importModel(ModelType.PLAIN_MARKER).getAssets();
+    private Circle mark = new Circle();
     private Paint colour = Color.BLACK;
     private List<Group> enterArrows = new ArrayList<>();
     private List<Group> exitArrows = new ArrayList<>();
@@ -26,35 +23,35 @@ public class Marker extends Group {
     /**
      * Creates a new Marker containing only a circle. The default colour is black.
      */
-    public Marker() {
-//        mark.setRadius(5);
-//        mark.setCenterX(0);
-//        mark.setCenterY(0);
-        Platform.runLater(() -> {
-            mark.getTransforms().add(new Scale(5,5,5));
-            this.getChildren().addAll(mark, new Group());
-        }); //Empty group placeholder or arrows.
+    public Marker2D() {
+        mark.setRadius(5);
+        mark.setCenterX(0);
+        mark.setCenterY(0);
+        Platform.runLater(() -> this.getChildren()
+            .addAll(mark, new Group())); //Empty group placeholder or arrows.
     }
 
     /**
      * Creates a new Marker containing only a circle of the given colour.
+     *
      * @param colour the desired colour for the marker.
      */
-    public Marker(Paint colour) {
+    public Marker2D(Paint colour) {
         this();
         this.colour = colour;
-//        mark.setFill(colour);
+        mark.setFill(colour);
     }
 
     /**
      * Adds an exit and entry arrow pair to the mark. Arrows are hidden and shown in the order they
      * are created by calling showNextEnterArrow() or showNextExitArrow()
+     *
      * @param roundingSide the side the marker will be from the perspective of the arrow.
      * @param entryAngle The angle the arrow will point towards a marker
      * @param exitAngle The angle the arrow wil point from the marker.
      */
     public void addArrows(MarkArrowFactory.RoundingSide roundingSide, double entryAngle,
-                          double exitAngle) {
+        double exitAngle) {
         //Change Color.GRAY to this.colour to revert all gray arrows.
         enterArrows.add(
             MarkArrowFactory.constructEntryArrow(roundingSide, entryAngle, exitAngle, Color.GRAY)
@@ -65,7 +62,8 @@ public class Marker extends Group {
     }
 
     /**
-     * Shows the next EnterArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
+     * Shows the next EnterArrow. Does nothing if there are no more enter arrows. Other arrows
+     * become hidden.
      */
     public void showNextEnterArrow() {
         showArrow(enterArrows, enterArrowIndex);
@@ -73,7 +71,8 @@ public class Marker extends Group {
     }
 
     /**
-     * Shows the next ExitArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
+     * Shows the next ExitArrow. Does nothing if there are no more enter arrows. Other arrows become
+     * hidden.
      */
     public void showNextExitArrow() {
         showArrow(exitArrows, exitArrowIndex);
@@ -82,7 +81,8 @@ public class Marker extends Group {
 
     private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
-            if (arrowListIndex == 1) {;
+            if (arrowListIndex == 1) {
+                ;
             }
             Platform.runLater(() -> {
                 this.getChildren().remove(1);