Removed dead code from fxObjects and GameView 3D

#chore

src/main/java/seng302/visualiser/GameView3D.java

@@ -161,7 +161,7 @@ public class GameView3D {
             }
         }
 
-        createMarkArrows(sequence);
+        createMarkArrows();
 
         //Scale race to markers if there is no border.
         if (borderPoints == null) {
@@ -228,11 +228,9 @@ public class GameView3D {
     /**
      * Calculates all the data needed for to create mark arrows. Requires that a course has been
      * added to the gameview.
-     * @param sequence The order in which marks are traversed.
      */
-    private void createMarkArrows (List<Corner> sequence) {
+    private void createMarkArrows () {
-        for (int i=1; i < sequence.size()-1; i++) { //General case.
+        for (int i=1; i < course.size()-1; i++) { //General case.
-            // TODO: 16/08/17 This comparison doesn't need to exist but ehhh....
             for (Mark mark : course.get(i).getMarks()) {
                 markerObjects.get(mark).addArrows(
                     mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
@@ -247,6 +245,11 @@ public class GameView3D {
 
     private void createStartLineArrows () {
         for (Mark mark : course.get(0).getMarks()) {
+            System.out.println(
+                "GeoUtility.getBearing(mark, course.get(1).getMidPoint()) = " + GeoUtility
+                    .getBearing(mark, course.get(1).getMidPoint()));
+            System.out.println("mark = " + mark);
+            System.out.println("course.get(1) = " + course.get(1));
             markerObjects.get(mark).addArrows(
                 mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
                 0d, //90

src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java

@@ -42,8 +42,8 @@ public class FinishScreenViewController implements Initializable {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         finishScreenGridPane.getStylesheets()
-            .add(getClass().getResource("/css/master.css").toString());
+            .add(getClass().getResource("/css/Master.css").toString());
-        finishOrderTable.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+        finishOrderTable.getStylesheets().add(getClass().getResource("/css/Master.css").toString());
 
         // set up data for table
         finishOrderTable.setItems(data);

src/main/java/seng302/visualiser/fxObjects/MarkArrowFactory.java

@@ -6,6 +6,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Arc;
 import javafx.scene.shape.ArcType;
+import javafx.scene.shape.Circle;
 import javafx.scene.shape.Polygon;
 import javafx.scene.shape.Polyline;
 import javafx.scene.shape.StrokeLineCap;
@@ -53,15 +54,18 @@ public class MarkArrowFactory {
     public static Model constructExitArrow3D (
         RoundingSide roundingSide, double angle, ModelType type) {
         Model exitArrow = ModelFactory.importModel(type);
+//        angle = Math.toRadians(angle-65);
         angle = Math.toRadians(angle);
         int multiplier = roundingSide == RoundingSide.STARBOARD ? 1 : -1;
-        double xStart = multiplier * 5 * Math.sin(angle + Math.PI / 2);
+        double xStart = multiplier * 6 * Math.sin(angle + Math.PI / 2);
-        double yStart = multiplier * 5 * Math.cos(angle + Math.PI / 2);
+        double yStart = multiplier * 6 * Math.cos(angle + Math.PI / 2);
-        exitArrow.getAssets().getTransforms().addAll(
+//        exitArrow.getAssets().getTransforms().addAll(
-            new Translate(xStart, yStart, 0),
+//            new Translate(xStart, yStart, 0),
-            new Rotate(Math.toDegrees(angle), new Point3D(0,0,1))
+//            new Rotate(Math.toDegrees(Math.toDegrees(angle)), new Point3D(0,0,1))
-        );
+//        );
-        return exitArrow;
+        Circle c = new Circle(xStart, yStart, 1, Color.RED);
+        c.setStroke(Color.TRANSPARENT);
+        return new Model(new Group(c), null);
     }
 
 

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

@@ -228,8 +228,7 @@ public class ModelFactory {
 
     private static Model makeArrow(Group assets) {
         assets.getTransforms().addAll(
-            new Rotate(90, new Point3D(1,0,0)),
+            new Rotate(90, new Point3D(1,0,0))
-            new Scale(0.1, 0.1, 0.1)
         );
         return new Model(new Group(assets), null);
     }

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

@@ -21,8 +21,8 @@ public enum ModelType {
     TRAIL_SEGMENT ("trail_segment.dae"),
     PLAYER_IDENTIFIER ("player_identifier.dae"),
     PLAIN_ARROW ("arrow.dae"),
-    START_ARROW ("finish_arrow.dae"),
+    START_ARROW ("start_arrow.dae"),
-    FINISH_ARROW ("start_arrow.dae");
+    FINISH_ARROW ("finish_arrow.dae");
 
     final String filename;