Split off marker classes.

src/main/java/seng302/visualiser/fxObjects/assets_3D/Marker3D.java

@@ -0,0 +1,99 @@
+package seng302.visualiser.fxObjects.assets_3D;
+
+import java.util.ArrayList;
+import java.util.List;
+import javafx.application.Platform;
+import javafx.scene.Group;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.transform.Scale;
+import seng302.visualiser.fxObjects.assets_2D.MarkArrowFactory;
+import seng302.visualiser.fxObjects.assets_2D.MarkArrowFactory.RoundingSide;
+
+/**
+ * Visual object for a mark. Contains a coloured circle and any specified arrows.
+ */
+public class Marker3D extends Group {
+
+    private Group mark = ModelFactory.importModel(ModelType.PLAIN_MARKER).getAssets();
+    private Paint colour = Color.BLACK;
+    private List<Group> enterArrows = new ArrayList<>();
+    private List<Group> exitArrows = new ArrayList<>();
+    private int enterArrowIndex = 0;
+    private int exitArrowIndex = 0;
+
+    /**
+     * Creates a new Marker containing only a circle. The default colour is black.
+     */
+    public Marker3D() {
+//        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.
+    }
+
+    /**
+     * Creates a new Marker containing only a circle of the given colour.
+     * @param colour the desired colour for the marker.
+     */
+    public Marker3D(Paint colour) {
+        this();
+        this.colour = 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(RoundingSide roundingSide, double entryAngle,
+                          double exitAngle) {
+        //Change Color.GRAY to this.colour to revert all gray arrows.
+        enterArrows.add(
+            MarkArrowFactory.constructEntryArrow(roundingSide, entryAngle, exitAngle, Color.GRAY)
+        );
+        exitArrows.add(
+            MarkArrowFactory.constructExitArrow(roundingSide, exitAngle, Color.GRAY)
+        );
+    }
+
+    /**
+     * Shows the next EnterArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
+     */
+    public void showNextEnterArrow() {
+        showArrow(enterArrows, enterArrowIndex);
+        enterArrowIndex++;
+    }
+
+    /**
+     * Shows the next ExitArrow. Does nothing if there are no more enter arrows. Other arrows become hidden.
+     */
+    public void showNextExitArrow() {
+        showArrow(exitArrows, exitArrowIndex);
+        exitArrowIndex++;
+    }
+
+    private void showArrow(List<Group> arrowList, int arrowListIndex) {
+        if (arrowListIndex < arrowList.size()) {
+            if (arrowListIndex == 1) {;
+            }
+            Platform.runLater(() -> {
+                this.getChildren().remove(1);
+                this.getChildren().add(arrowList.get(arrowListIndex));
+            });
+        }
+    }
+
+    /**
+     * Hides all arrows.
+     */
+    public void hideAllArrows() {
+        Platform.runLater(() -> this.getChildren().setAll(mark, new Group()));
+    }
+}

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -2,6 +2,7 @@ package seng302.visualiser.fxObjects.assets_3D;
 
 import com.interactivemesh.jfx.importer.col.ColModelImporter;
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import java.util.Random;
 import javafx.animation.AnimationTimer;
 import javafx.geometry.Point3D;
 import javafx.scene.AmbientLight;
@@ -22,12 +23,29 @@ public class ModelFactory {
     public static BoatModel boatIconView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().addAll(
-            new Scale(20, 20, 20),
-            new Rotate(90, new Point3D(0,0,1)),
-            new Rotate(90, new Point3D(0, 1, 0))
+            new Scale(10, 10, 10),
+            new Rotate(45, new Point3D(0,0,1)),
+            new Rotate(90, new Point3D(0, 1, 0)),
+            new Rotate(270, new Point3D(1, 0, 0)),
+            new Translate(12, 14, 0)
         );
+
+        BoatModel bo = new BoatModel(boatAssets, null, boatType);
+        bo.showSail();
+        bo.rotateSail(45);
+        bo.setAnimation(new AnimationTimer() {
+            Group group = bo.getAssets();
+            double boatAngle = 0;
+            int id = new Random().nextInt();
+
+            @Override
+            public void handle(long now) {
+                ((Rotate) group.getTransforms().get(3)).setAngle(boatAngle++);
+                System.out.println("animating a thingy " + id);
+            }
+        });
         boatAssets.getChildren().add(new AmbientLight(new Color(1, 1, 1, 0.01)));
-        return new BoatModel(boatAssets, null, boatType);
+        return bo;
     }
 
     public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) {