Merge branch 'story1273_minimap' into develop

src/main/java/seng302/gameServer/GameState.java

@@ -238,7 +238,7 @@ public class GameState implements Runnable {
                 if (System.currentTimeMillis() > startTime) {
                     startSpawningTokens();
                     startUpdatingWind();
-                    GameState.setCurrentStage(GameStages.RACING);
+                    GameState.currentStage = GameStages.RACING;
                 }
             }
             if (currentStage == GameStages.RACING) {
@@ -299,8 +299,8 @@ public class GameState implements Runnable {
             windSpeed += random.nextInt(500);
         }
 
-        GameState.setWindSpeed(Double.valueOf(windSpeed));
+        GameState.windSpeed = Double.valueOf(windSpeed);
-        GameState.setWindDirection(direction.doubleValue());
+        GameState.windDirection = direction.doubleValue();
     }
 
 

src/main/java/seng302/visualiser/GameClient.java

@@ -49,12 +49,6 @@ import seng302.visualiser.controllers.RaceViewController;
 import seng302.visualiser.controllers.ViewManager;
 import seng302.visualiser.controllers.dialogs.PopupDialogController;
 
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.*;
-
 /**
  * This class is a client side instance of a yacht racing game in JavaFX. The game is instantiated
  * with a JavaFX Pane to insert itself into.
@@ -314,6 +308,7 @@ public class GameClient {
                     formatAndSendChatMessage(raceView.readChatInput());
                 }
             });
+            gameKeyBind.toggleTurningMode();
             sendToggleTurningModePacket(); // notify the server about player's steering mode
         }
     }

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

@@ -51,7 +51,7 @@ import seng302.visualiser.fxObjects.assets_3D.ModelType;
  * Collection of animated3D assets that displays a race.
  */
 
-public class GameView3D extends GameView{
+public class GameView3D extends GameView {
 
     private final double FOV = 60;
     private final double DEFAULT_CAMERA_X = 0;

src/main/java/seng302/visualiser/MapPreview.java

@@ -29,7 +29,7 @@ import seng302.visualiser.fxObjects.assets_2D.Marker2D;
 public class MapPreview extends GameView {
 
     private Polygon raceBorder = new CourseBoundary();
-    private Map<Mark, Marker2D> markerObjects;
+    protected Map<Mark, Marker2D> markerObjects;
 
     public MapPreview(List<CompoundMark> marks, List<Corner> course, List<Limit> border) {
         this.compoundMarks = marks;

src/main/java/seng302/visualiser/MiniMap.java

@@ -0,0 +1,86 @@
+package seng302.visualiser;
+
+import java.util.HashMap;
+import java.util.List;
+import javafx.application.Platform;
+import javafx.geometry.Point2D;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Polygon;
+import javafx.scene.transform.Rotate;
+import seng302.model.ClientYacht;
+import seng302.model.Limit;
+import seng302.model.mark.CompoundMark;
+import seng302.model.mark.Corner;
+import seng302.model.mark.Mark;
+import seng302.utilities.Sounds;
+
+/**
+ * Class converts a map preview to a minimap by adding boats.
+ */
+public class MiniMap extends MapPreview {
+
+    private HashMap<ClientYacht, Polygon> boatIcons = new HashMap<>();
+    private Polygon playerBoat;
+    private double playerRotation;
+    private List<ClientYacht> boats;
+    private ClientYacht player;
+
+    public MiniMap (List<CompoundMark> marks, List<Corner> course, List<Limit> border, List<ClientYacht> boats, ClientYacht player) {
+        super(marks, course, border);
+        this.boats = boats;
+        this.player = player;
+        setBoats(boats);
+        player.addMarkRoundingListener(this::updateMarkArrows);
+    }
+
+    public void setBoats(List<ClientYacht> yachts) {
+        for (ClientYacht yacht : yachts) {
+            Polygon boatIcon = new Polygon(0, -3.5, 3.5, 3.5, -3.5, 3.5);
+            boatIcon.setStroke(Color.BLACK);
+            boatIcon.setFill(Color.GRAY);
+            boatIcon.setFill(yacht.getColour());
+            boatIcon.setFill(yacht.getColour());
+            boatIcons.put(yacht, boatIcon);
+            boatIcon.getTransforms().add(new Rotate(0));
+            yacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
+                Platform.runLater(() -> {
+                    Polygon bi = boatIcons.get(boat);
+                    Point2D p2d = scaledPoint.findScaledXY(lat, lon);
+                    bi.setLayoutX(p2d.getX());
+                    bi.setLayoutY(p2d.getY());
+                    ((Rotate) bi.getTransforms().get(0)).setAngle(heading);
+                });
+            });
+        }
+        Platform.runLater(() -> {
+            gameObjects.getChildren().addAll(boatIcons.values());
+        });
+    }
+
+    private void updateMarkArrows (ClientYacht yacht, int legNumber) {
+        CompoundMark compoundMark;
+        if (legNumber - 1 >= 0) {
+            Sounds.playMarkRoundingSound();
+            compoundMark = course.get(legNumber-1);
+            for (Mark mark : compoundMark.getMarks()) {
+                markerObjects.get(mark).showNextExitArrow();
+            }
+        }
+        CompoundMark nextMark = null;
+        if (legNumber < course.size() - 1) {
+            Sounds.playMarkRoundingSound();
+            nextMark = course.get(legNumber);
+            for (Mark mark : nextMark.getMarks()) {
+                markerObjects.get(mark).showNextEnterArrow();
+            }
+        }
+        if (legNumber - 2 >= 0) {
+            CompoundMark lastMark = course.get(Math.max(0, legNumber - 2));
+            if (lastMark != nextMark) {
+                for (Mark mark : lastMark.getMarks()) {
+                    markerObjects.get(mark).hideAllArrows();
+                }
+            }
+        }
+    }
+}

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

@@ -4,67 +4,38 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.TimeUnit;
 import javafx.animation.RotateTransition;
-import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.geometry.Point2D;
-import javafx.scene.Scene;
 import javafx.scene.SubScene;
-import javafx.scene.chart.LineChart;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.chart.XYChart.Series;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
-import javafx.scene.control.Slider;
 import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
-import javafx.scene.shape.Line;
-import javafx.scene.shape.Polyline;
-import javafx.scene.text.Text;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import seng302.model.ClientYacht;
 import seng302.model.RaceState;
-import seng302.model.mark.CompoundMark;
-import seng302.model.mark.Mark;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.token.TokenType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameView3D;
-import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
+import seng302.visualiser.MiniMap;
-import seng302.visualiser.controllers.annotations.ImportantAnnotationDelegate;
-import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
 import seng302.visualiser.controllers.dialogs.FinishDialogController;
 import seng302.visualiser.fxObjects.ChatHistory;
-import seng302.visualiser.fxObjects.assets_2D.WindArrow;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 /**
  * Controller class that manages the display of a race
  */
-public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
+public class RaceViewController extends Thread {
 
     private final int CHAT_LIMIT = 128;
     private static final Double ICON_BLINK_TIMEOUT_RATIO = 0.6;
@@ -75,39 +46,17 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     @FXML
     private ImageView loadingScreen;
     @FXML
-    private Pane basePane;
-    @FXML
     private JFXButton chatSend;
     @FXML
     private Pane chatHistoryHolder;
     @FXML
     private TextField chatInput;
     @FXML
-    private LineChart<String, Double> raceSparkLine;
-    @FXML
-    private NumberAxis sparklineYAxis;
-    @FXML
-    private VBox positionVbox;
-    @FXML
-    private CheckBox toggleFps;
-    @FXML
     private Label timerLabel;
     @FXML
     private StackPane contentStackPane;
-
-    private GridPane contentGridPane;
     @FXML
-    private AnchorPane rvAnchorPane;
+    private Pane miniMapPane;
-    @FXML
-    private AnchorPane windArrowHolder;
-    @FXML
-    private Slider annotationSlider;
-    @FXML
-    private Button selectAnnotationBtn;
-    @FXML
-    private ComboBox<ClientYacht> yachtSelectionComboBox;
-    @FXML
-    private Text fpsDisplay;
     @FXML
     private ImageView windImageView;
     @FXML
@@ -118,33 +67,24 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Label positionLabel, boatSpeedLabel, boatHeadingLabel;
     @FXML
     private ImageView velocityIcon, handlingIcon, windWalkerIcon, bumperIcon, badRandomIcon;
+    @FXML
+    private JFXButton miniMapButton;
 
-    //Race Data
-    private Map<Integer, ClientYacht> participants;
-    private Map<Integer, CompoundMark> markers;
-    private RaceXMLData courseData;
     private GameView3D gameView;
     private RaceState raceState;
-
     private ChatHistory chatHistory;
-
+        private Timer timer = new Timer();
-    private Timeline timerTimeline;
-    private Timer timer = new Timer();
-    private List<Series<String, Double>> sparkLineData = new ArrayList<>();
-    private ImportantAnnotationsState importantAnnotations;
-    private Polyline windArrow = new WindArrow(Color.LIGHTGRAY);
-    private ObservableList<ClientYacht> selectionComboBoxList = FXCollections.observableArrayList();
     private ClientYacht player;
     private JFXDialog finishScreenDialog;
     private FinishDialogController finishDialogController;
-
-    //Icon stuff
     private Timer blinkingTimer = new Timer();
     private ImageView iconToDisplay;
-
     private Double lastWindDirection;
+    private MiniMap miniMap;
 
     public void initialize() {
+        miniMapPane.setVisible(false);
+        miniMapButton.setVisible(false);
         contentStackPane.setVisible(false);
         Image loadingImage = new Image("PP.png");
         loadingScreen.setImage(loadingImage);
@@ -204,7 +144,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     public void showView(){
         loadingScreenPane.setVisible(false);
         contentStackPane.setVisible(true);
-
+        miniMapPane.setVisible(true);
+        miniMapButton.setVisible(true);
         Platform.runLater(new Runnable() {
             @Override
             public void run() {
@@ -238,31 +179,36 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Map<Integer, ClientYacht> participants, RaceXMLData raceData, RaceState raceState,
         ClientYacht player) {
 
-        this.participants = participants;
-        this.courseData = raceData;
-        this.markers = raceData.getCompoundMarks();
         this.raceState = raceState;
         this.player = player;
 
-        raceState.getPlayerPositions().addListener((ListChangeListener<ClientYacht>) c -> {
-            while (c.next()) {
-                if (c.wasPermutated()) {
-                    updateOrder(raceState.getPlayerPositions());
-                }
-            }
-        });
-
         player.addPowerUpListener(this::displayPowerUpIcon);
         player.addPowerDownListener(this::removeIcon);
 
-        updateOrder(raceState.getPlayerPositions());
         gameView = new GameView3D();
+        miniMap = new MiniMap(
+            new ArrayList<>(raceData.getCompoundMarks().values()),
+            raceData.getMarkSequence(), raceData.getCourseLimit(),
+            new ArrayList<>(participants.values()), player
+        );
+
+        miniMapButton.setOnMouseClicked((event) -> {
+            if (miniMapPane.visibleProperty().get()) {
+                miniMapPane.setVisible(false);
+                miniMapButton.setText("✓");
+            } else {
+                miniMapPane.setVisible(true);
+                miniMapButton.setText("✕");
+            }
+        });
+
         Platform.runLater(() -> {
             contentStackPane.getChildren().add(0, gameView.getAssets());
             ((SubScene) gameView.getAssets()).widthProperty()
                 .bind(ViewManager.getInstance().getStage().widthProperty());
             ((SubScene) gameView.getAssets()).heightProperty()
                 .bind(ViewManager.getInstance().getStage().heightProperty());
+            miniMapPane.getChildren().add(miniMap.getAssets());
         });
         gameView.setBoats(new ArrayList<>(participants.values()));
         gameView.updateBorder(raceData.getCourseLimit());
@@ -350,45 +296,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
-
-    /**
-     * The important annotations have been changed, update this view
-     *
-     * @param importantAnnotationsState The current state of the selected annotations
-     */
-    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
-        this.importantAnnotations = importantAnnotationsState;
-        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
-    }
-
-
-    /**
-     * Loads the "select annotations" view in a new window
-     */
-    private void loadSelectAnnotationView() {
-        try {
-            FXMLLoader fxmlLoader = new FXMLLoader();
-            Stage stage = new Stage();
-            // Set controller
-            ImportantAnnotationController controller = new ImportantAnnotationController(
-                this, stage
-            );
-            fxmlLoader.setController(controller);
-            // Load FXML and set CSS
-            fxmlLoader.setLocation(
-                getClass().getResource("/views/importantAnnotationSelectView.fxml")
-            );
-            Scene scene = new Scene(fxmlLoader.load(), 469, 298);
-            scene.getStylesheets().add(getClass().getResource("/css/master.css").toString());
-            stage.initStyle(StageStyle.UNDECORATED);
-            stage.setScene(scene);
-            stage.show();
-            controller.loadState(importantAnnotations);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * Initialises a timer which updates elements of the RaceView such as wind direction, yacht
      * orderings etc.. which are dependent on the info from the stream parser constantly.
@@ -406,35 +313,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }, 0, 1000);
     }
 
-    /**
-     * Iterates over all corners until ones SeqID matches with the yachts current leg number.
-     * Then it gets the compoundMarkID of that corner and uses it to fetch the appropriate mark
-     * Returns null if no next mark found.
-     * @param bg The BoatGroup to find the next mark of
-     * @return The next Mark or null if none found
-     */
-    private Mark getNextMark(BoatObject bg) {
-        // TODO: 1/08/17 Move to GameView
-//
-//        Integer legNumber = bg.getClientYacht().getLegNumber();
-//        List<Corner> markSequence = courseData.getMarkSequence();
-//
-//        if (legNumber == 0) {
-//            return null;
-//        } else if (legNumber == markSequence.size() - 1) {
-//            return null;
-//        }
-//
-//        for (Corner corner : markSequence) {
-//            if (legNumber + 2 == corner.getSeqID()) {
-//                return courseData.getCompoundMarks().get(corner.getCompoundMarkID());
-//            }
-//        }
-//        return null;
-        return null;
-    }
-
-
     /**
      * Updates the wind direction arrow and text as from info from the StreamParser
      * @param direction the from north angle of the wind.
@@ -516,226 +394,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         boatHeadingLabel.setText(String.format("Boat Heading:\n%.1f°", player.getHeading()));
     }
 
-    /**
-     * Updates the order of the yachts as from the StreamParser and sets them in the yacht order
-     * section
-     */
-    private void updateOrder(ObservableList<ClientYacht> yachts) {
-//        List<Text> vboxEntries = new ArrayList<>();
-//
-//        for (int i = 0; i < yachts.size(); i++) {
-////            System.out.println("yacht == null  " + String.valueOf(yacht == null));
-//            if (yachts.get(i).getBoatStatus() == BoatStatus.FINISHED
-//                .getCode()) {  // 3 is finish status
-//                Text textToAdd = new Text(i + 1 + ". " +
-//                    yachts.get(i).getShortName() + " (Finished)");
-//                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
-//                vboxEntries.add(textToAdd);
-//
-//            } else {
-//                Text textToAdd = new Text(i + 1 + ". " +
-//                    yachts.get(i).getShortName() + " ");
-//                textToAdd.setFill(Paint.valueOf("#d3d3d3"));
-//                textToAdd.setStyle("");
-//                vboxEntries.add(textToAdd);
-//            }
-//        }
-//        Platform.runLater(() ->
-//            positionVbox.getChildren().setAll(vboxEntries)
-//        );
-    }
-
-
-    private void updateLaylines(BoatObject bg) {
-        // TODO: 1/08/17 move to GameView
-//
-//        Mark nextMark = getNextMark(bg);
-//        Boolean isUpwind = null;
-//        // Can only calc leg direction if there is a next mark and it is a gate mark
-//        if (nextMark != null) {
-//            if (nextMark instanceof GateMark) {
-//                if (bg.isUpwindLeg(gameViewController, nextMark)) {
-//                    isUpwind = true;
-//                } else {
-//                    isUpwind = false;
-//                }
-//
-//                for(MarkObject mg : gameViewController.getMarkGroups()) {
-//
-//                    mg.removeLaylines();
-//
-//                    if (mg.getMainMark().getId() == nextMark.getId()) {
-//
-//                        SingleMark singleMark1 = ((GateMark) nextMark).getSingleMark1();
-//                        SingleMark singleMark2 = ((GateMark) nextMark).getSingleMark2();
-//                        Point2D markPoint1 = gameViewController
-//                            .findScaledXY(singleMark1.getLatitude(), singleMark1.getLongitude());
-//                        Point2D markPoint2 = gameViewController
-//                            .findScaledXY(singleMark2.getLatitude(), singleMark2.getLongitude());
-//                        HashMap<Double, Double> angleAndSpeed;
-//                        if (isUpwind) {
-//                            angleAndSpeed = PolarTable.getOptimalUpwindVMG(StreamParser.getWindSpeed());
-//                        } else {
-//                            angleAndSpeed = PolarTable.getOptimalDownwindVMG(StreamParser.getWindSpeed());
-//                        }
-//
-//                        Double resultingAngle = angleAndSpeed.keySet().iterator().next();
-//
-//
-//                        Point2D yachtCurrentPos = new Point2D(bg.getBoatLayoutX(), bg.getBoatLayoutY());
-//                        Point2D gateMidPoint = markPoint1.midpoint(markPoint2);
-//                        Integer lineFuncResult = GeoUtility.lineFunction(yachtCurrentPos, gateMidPoint, markPoint2);
-//                        Line rightLayline = new Line();
-//                        Line leftLayline = new Line();
-//                        if (lineFuncResult == 1) {
-//                            rightLayline = makeRightLayline(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
-//                            leftLayline = makeLeftLayline(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
-//                        } else if (lineFuncResult == -1) {
-//                            rightLayline = makeRightLayline(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
-//                            leftLayline = makeLeftLayline(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
-//                        }
-//
-//                        leftLayline.setStrokeWidth(0.5);
-//                        leftLayline.setStroke(bg.getBoat().getColour());
-//
-//                        rightLayline.setStrokeWidth(0.5);
-//                        rightLayline.setStroke(bg.getBoat().getColour());
-//
-//                        bg.setLaylines(leftLayline, rightLayline);
-//                        mg.addLaylines(leftLayline, rightLayline);
-//
-//                    }
-//                }
-//            }
-//        }
-    }
-
-
-    private Point2D getPointRotation(Point2D ref, Double distance, Double angle) {
-        Double newX = ref.getX() + (ref.getX() + distance - ref.getX()) * Math.cos(angle)
-            - (ref.getY() + distance - ref.getY()) * Math.sin(angle);
-        Double newY = ref.getY() + (ref.getX() + distance - ref.getX()) * Math.sin(angle)
-            + (ref.getY() + distance - ref.getY()) * Math.cos(angle);
-
-        return new Point2D(newX, newY);
-    }
-
-
-    public Line  makeLeftLayline(Point2D startPoint, Double layLineAngle, Double baseAngle) {
-        Point2D ep = getPointRotation(startPoint, 50.0, baseAngle + layLineAngle);
-        Line line = new Line(startPoint.getX(), startPoint.getY(), ep.getX(), ep.getY());
-        return line;
-
-    }
-
-
-    public Line makeRightLayline(Point2D startPoint, Double layLineAngle, Double baseAngle) {
-
-        Point2D ep = getPointRotation(startPoint, 50.0, baseAngle - layLineAngle);
-        Line line = new Line(startPoint.getX(), startPoint.getY(), ep.getX(), ep.getY());
-        return line;
-
-    }
-
-
-    /**
-     * Initialised the combo box with any yachts currently in the race and adds the required listener
-     * for the combobox to take action upon selection
-     */
-    private void initialiseBoatSelectionComboBox() {
-//        yachtSelectionComboBox.setItems(
-//            FXCollections.observableArrayList(participants.values())
-//        );
-//        //Null check is if the listener is fired but nothing selected
-//        yachtSelectionComboBox.valueProperty().addListener((obs, lastSelection, selectedBoat) -> {
-//            if (selectedBoat != null) {
-//                gameView.selectBoat(selectedBoat);
-//            }
-//        });
-
-        //TODO uncomment out
-//        selectionComboBoxList.setAll(participants.values());
-//        yachtSelectionComboBox.setItems(selectionComboBoxList);
-//        yachtSelectionComboBox.valueProperty().addListener((obs, lastSelection, selectedBoat) -> {
-//            if (selectedBoat != null) {
-//                gameView.selectBoat(selectedBoat);
-//            }
-//        });
-    }
-
-    /**
-     * Display the list of yachts in the order they finished the race
-     */
-    private void loadRaceResultView() {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/views/FinishView.fxml"));
-
-        try {
-            contentGridPane.getChildren().removeAll();
-            contentGridPane.getChildren().clear();
-            contentGridPane.getChildren().addAll((Pane) loader.load());
-
-        } catch (javafx.fxml.LoadException e) {
-            System.err.println(e.getCause().toString());
-        } catch (IOException e) {
-            System.err.println(e.toString());
-        }
-    }
-
-    private String getMillisToFormattedTime(long milliseconds) {
-        return String.format("%02d:%02d:%02d",
-            TimeUnit.MILLISECONDS.toHours(milliseconds),
-            TimeUnit.MILLISECONDS.toMinutes(milliseconds) % 60, //Modulus 60 minutes per hour
-            TimeUnit.MILLISECONDS.toSeconds(milliseconds) % 60  //Modulus 60 seconds per minute
-        );
-    }
-
-    private void setAnnotations(Integer annotationLevel) {
-//        switch (annotationLevel) {
-//            // No Annotations
-//            case 0:
-//                gameView.setAnnotationVisibilities(
-//                    false, false, false, false, false, false
-//                );
-//                break;
-//            // Important Annotations
-//            case 1:
-//                gameView.setAnnotationVisibilities(
-//                    importantAnnotations.getAnnotationState(Annotation.NAME),
-//                    importantAnnotations.getAnnotationState(Annotation.SPEED),
-//                    importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK),
-//                    importantAnnotations.getAnnotationState(Annotation.LEGTIME),
-//                    importantAnnotations.getAnnotationState(Annotation.TRACK),
-//                    importantAnnotations.getAnnotationState(Annotation.WAKE)
-//                );
-//                break;
-//            // All Annotations
-//            case 2:
-//                gameView.setAnnotationVisibilities(
-//                    true, true, true, true, true, true
-//                );
-//                break;
-//        }
-    }
-
-
-    /**
-     * Sets all the annotations of the selected yacht to be visible and all others to be hidden
-     *
-     * @param yacht The yacht for which we want to view all annotations
-     */
-    private void setSelectedBoat(ClientYacht yacht) {
-//        for (BoatObject bg : gameViewController.getBoatGroups()) {
-//            //We need to iterate over all race groups to get the matching yacht group belonging to this yacht if we
-//            //are to toggle its annotations, there is no other backwards knowledge of a yacht to its yachtgroup.
-//            if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
-////                updateLaylines(bg);
-//                bg.setIsSelected(true);
-////                selectedBoat = yacht;
-//            } else {
-//                bg.setIsSelected(false);
-//            }
-//        }
-    }
 
     public void updateTokens(RaceXMLData raceData) {
         gameView.updateTokens(raceData.getTokens());

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

@@ -404,7 +404,9 @@ public class ViewManager {
                 .add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm());
 
         JFXSnackbar bar = new JFXSnackbar(decorator);
-        bar.enqueue(new JFXSnackbar.SnackbarEvent(msg));
+        Platform.runLater(() -> {
+            bar.enqueue(new JFXSnackbar.SnackbarEvent(msg));
+        });
     }
 
     public Stage getStage() {

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

@@ -29,11 +29,11 @@ public class MarkArrowFactory {
         STARBOARD,
     }
 
-    public static final double MARK_ARROW_SEPARATION = 15;
+    public static final double MARK_ARROW_SEPARATION = 8;
-    public static final double ARROW_LENGTH = 75;
+    public static final double ARROW_LENGTH = 20;
-    public static final double ARROW_HEAD_DEPTH = 10;
+    public static final double ARROW_HEAD_DEPTH = 5;
-    public static final double ARROW_HEAD_WIDTH = 6;
+    public static final double ARROW_HEAD_WIDTH = 3;
-    public static final double STROKE_WIDTH = 3;
+    public static final double STROKE_WIDTH = 1;
 
     public static Model constructEntryArrow3D (
         RoundingSide roundingSide, double angle, ModelType type) {
@@ -106,7 +106,7 @@ public class MarkArrowFactory {
         Arc roundSection = new Arc(
             0, 0, MARK_ARROW_SEPARATION, MARK_ARROW_SEPARATION,
             //Where to start drawing arc from
-            (roundingSide == RoundingSide.PORT ? 0 : angleOfEntry),
+            (roundingSide == RoundingSide.PORT ? 180 + angleOfEntry : angleOfEntry),
             //Which way to go around the mark. (clockwise vs anticlockwise)
             roundingSide == RoundingSide.PORT ? Math.abs(angleOfExit - angleOfEntry) : -Math.abs(angleOfEntry - angleOfExit)
         );

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

@@ -28,8 +28,7 @@ public class Marker2D extends Group {
         mark.setRadius(5);
         mark.setCenterX(0);
         mark.setCenterY(0);
-        Platform.runLater(() -> this.getChildren()
+        Platform.runLater(() -> this.getChildren().add(mark));
-            .addAll(mark, new Group())); //Empty group placeholder or arrows.
     }
 
     /**
@@ -82,13 +81,9 @@ public class Marker2D extends Group {
 
     private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
-            if (arrowListIndex == 1) {
+            Platform.runLater(() ->
-                ;
+                this.getChildren().setAll(mark, arrowList.get(arrowListIndex))
-            }
+            );
-            Platform.runLater(() -> {
-                this.getChildren().remove(1);
-                this.getChildren().add(arrowList.get(arrowListIndex));
-            });
         }
     }
 

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

@@ -60,7 +60,9 @@ public class BoatModel extends Model {
      */
     public void changeColour(Color newColour) {
         changeColourChild(HULL_INDEX, newColour);
-        changeColourChild(MAST_INDEX, newColour);
+        if (meshType != BoatMeshType.PARROT) {
+            changeColourChild(MAST_INDEX, newColour);
+        }
     }
 
     private void changeColourChild(int index, Color newColour) {

src/main/resources/views/RaceView.fxml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.*?>
-<?import javafx.scene.shape.*?>
 <?import com.jfoenix.controls.*?>
 <?import java.lang.*?>
 <?import javafx.geometry.*?>
@@ -294,13 +292,26 @@
                     </GridPane>
                 </children>
             </StackPane>
+            <Pane fx:id="miniMapPane" maxHeight="200.0" maxWidth="200.0" minHeight="200.0" minWidth="200.0" prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: white; -fx-opacity: 0.45; -fx-background-radius: 10;" StackPane.alignment="TOP_RIGHT">
+                <StackPane.margin>
+                    <Insets right="15.0" top="15.0" />
+                </StackPane.margin>
+            </Pane>
+            <JFXButton fx:id="miniMapButton" style="-fx-background-color: white; -fx-opacity: 0.45; -fx-background-radius: 10;" text="✕" StackPane.alignment="TOP_RIGHT">
+                <font>
+                    <Font size="15.0" />
+                </font>
+                <StackPane.margin>
+                    <Insets right="15.0" top="15.0" />
+                </StackPane.margin>
+            </JFXButton>
             <AnchorPane fx:id="loadingScreenPane">
             <ImageView fx:id="loadingScreen" fitHeight="672.0" fitWidth="1200.0" pickOnBounds="true" preserveRatio="true" />
             <JFXSpinner layoutX="566.0" layoutY="692.0" radius="30.0" />
             </AnchorPane>
         </children>
     <stylesheets>
-        <String fx:value="/css/Master.css"/>
+        <String fx:value="/css/Master.css" />
-        <String fx:value="/css/RaceView.css"/>
+        <String fx:value="/css/RaceView.css" />
     </stylesheets>
 </StackPane>

src/main/resources/views/dialogs/TokenInfoDialog.fxml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import com.jfoenix.controls.*?>
+<?import java.lang.*?>
+<?import java.net.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXDialogLayout?>
+<?import java.net.URL?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+  minWidth="-Infinity" prefHeight="273.0" prefWidth="436.0" xmlns="http://javafx.com/javafx/8"
+  xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="seng302.visualiser.controllers.dialogs.TokenInfoDialogController">
+    <children>
+        <GridPane>
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints maxHeight="40.0" minHeight="30.0" prefHeight="40.0"
+                  vgrow="SOMETIMES"/>
+                <RowConstraints maxHeight="1.7976931348623157E308" minHeight="80.0"
+                  prefHeight="115.0" vgrow="SOMETIMES"/>
+                <RowConstraints maxHeight="141.0" minHeight="34.0" prefHeight="73.0"
+                  vgrow="SOMETIMES"/>
+            </rowConstraints>
+            <children>
+                <JFXButton fx:id="optionButton" buttonType="RAISED" prefHeight="55.0"
+                  prefWidth="150.0" text="Ok" GridPane.halignment="CENTER" GridPane.rowIndex="2"
+                  GridPane.valignment="CENTER">
+                    <GridPane.margin>
+                        <Insets/>
+                    </GridPane.margin>
+                </JFXButton>
+                <Label fx:id="headerLabel" text="Popup header" GridPane.halignment="CENTER">
+                    <font>
+                        <Font size="15.0"/>
+                    </font>
+                </Label>
+                <GridPane GridPane.rowIndex="1">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="270.0" minWidth="10.0"
+                          prefWidth="270.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="225.0" minWidth="-Infinity"
+                          prefWidth="138.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="100.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                    <children>
+                        <Pane fx:id="tokenPane" prefHeight="200.0" prefWidth="200.0"
+                          GridPane.columnIndex="1"/>
+                        <TextArea fx:id="contentText" nodeOrientation="RIGHT_TO_LEFT"
+                          prefHeight="200.0" prefWidth="200.0" promptText="This is some text"
+                          stylesheets="@../../css/TokenInfoDialog.css" wrapText="true">
+                            <font>
+                                <Font size="16.0"/>
+                            </font>
+                        </TextArea>
+                    </children>
+                </GridPane>
+            </children>
+        </GridPane>
+    </children>
+    <stylesheets>
+        <URL value="@../../css/dialogs/Popup.css"/>
+        <URL value="@../../css/Master.css"/>
+    </stylesheets>
+</JFXDialogLayout>