[WIP] porting old fps counter to new gameview3D

#story[1245]

pom.xml

@@ -109,12 +109,6 @@
             <version>3.4.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.fxyz3d</groupId>
-            <artifactId>fxyz3d</artifactId>
-            <version>0.1.1</version>
-        </dependency>
-
     </dependencies>
 
     <build>

src/main/java/seng302/App.java

@@ -10,16 +10,11 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.DiscoveryServer;
 import seng302.visualiser.controllers.ViewManager;
 
-import java.util.Timer;
-import java.util.TimerTask;
-
 public class App extends Application {
 
     private static Logger logger = LoggerFactory.getLogger(App.class);
-    private static boolean isRunningAsCache = false;
 
     public static void parseArgs(String[] args) throws ParseException {
         Options options = new Options();
@@ -30,21 +25,9 @@ public class App extends Application {
             .getLogger(Logger.ROOT_LOGGER_NAME);
 
         options.addOption("debugLevel", true, "Set the application debug level");
-        options.addOption("runAsDiscoveryServer", false, "Run as a discovery server");
-        options.addOption("discoveryDevMode", false, "Use a local discovery server");
 
         cmd = parser.parse(options, args);
 
-        if (cmd.hasOption("runAsDiscoveryServer")){
-            isRunningAsCache = true;
-            rootLogger.setLevel(Level.ALL);
-            return;
-        }
-
-        if (cmd.hasOption("discoveryDevMode")) {
-            DiscoveryServer.DISCOVERY_SERVER = "localhost";
-        }
-
         if (cmd.hasOption("debugLevel")) {
 
             switch (cmd.getOptionValue("debugLevel")) {
@@ -80,45 +63,19 @@ public class App extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        ViewManager.getInstance().initialiseSplashScreen(primaryStage);
+        ViewManager.getInstance().initialStartView(primaryStage);
     }
 
-    private static void runDiscoveryServer() throws Exception {
-        while (true){
-            try {
-                new DiscoveryServer();
-            }
-            catch (Exception ignored){
-                ;
-            }
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        /*
-         * Do not trust Java to do garbage collection
-         */
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                System.gc();
-            }
-        }, 0, 1200);
-
 
+    public static void main(String[] args) {
         try {
             parseArgs(args);
         } catch (ParseException e) {
             logger.error("Could not parse command line arguments");
         }
 
-        if (!isRunningAsCache){
         launch(args);
     }
-        else{
-            runDiscoveryServer();
-        }
-    }
 }
 
 

src/main/java/seng302/discoveryServer/DiscoveryServer.java

@@ -1,170 +0,0 @@
-package seng302.discoveryServer;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.Message;
-import seng302.gameServer.messages.RoomCodeRequest;
-import seng302.gameServer.messages.ServerRegistrationMessage;
-import seng302.model.stream.packets.PacketType;
-import seng302.discoveryServer.util.ServerListing;
-import seng302.discoveryServer.util.ServerRepoStreamParser;
-import seng302.discoveryServer.util.ServerTable;
-import seng302.visualiser.ServerListener;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.Timer;
-
-public class DiscoveryServer {
-    public static final String ANSI_GREEN = "\u001B[32m";
-    public static final String ANSI_YELLOW = "\u001B[33m";
-    public static final String ANSI_BLUE = "\u001B[34m";
-    public static final String ANSI_RESET = "\u001B[0m";
-    private static final int MAX_SERVER_TRIES = 10;
-    public static String DISCOVERY_SERVER = "party.sydney.srv.michaelrausch.nz";
-
-    private ServerTable serverTable;
-    public static final Integer PORT_NUMBER = 9969;
-    private ServerSocket serverSocket;
-
-    private final Logger logger = LoggerFactory.getLogger(DiscoveryServer.class);
-
-    private void displayHeader(){
-        String selectedColor = Arrays.asList(ANSI_BLUE, ANSI_GREEN, ANSI_YELLOW).get(new Random().nextInt(2));
-        System.out.println(selectedColor);
-        System.out.println("                              .ccccc.             \n" +
-                "                         .cc;'coooxkl;.           \n" +
-                "                     .:c:::c:,,,,,;c;;,.'.        \n" +
-                "                   .clc,',:,..:xxocc;'..c;        \n" +
-                "                  .c:,';:ox:..:c,,,,,,...cd,      \n" +
-                "                .c:'.,oxxxxl::l:.,loll;..;ol.     \n" +
-                "                ;Oc..:xxxxxxxxx:.,llll,....oc     \n" +
-                "             .,;,',:loxxxxxxxxx:.,llll;.,,.'ld,   \n" +
-                "            .lo;..:xxxxxxxxxxxx:.'cllc,.:l:'cO;   \n" +
-                "           .:;...'cxxxxxxxxxxxxoc;,::,..cdl;;l'   \n" +
-                "         .cl;':,'';oxxxxxxdxxxxxx:....,cooc,cO;   \n" +
-                "     .,,,::;,lxoc:,,:lxxxxxxxxxxxo:,,;lxxl;'oNc   \n" +
-                "   .cdxo;':lxxxxxxc'';cccccoxxxxxxxxxxxxo,.;lc.  " + ANSI_YELLOW + "Party-Parrots-At-Sea Discovery Server v0.1 " + selectedColor +"\n" +
-                "  .loc'.'lxxxxxxxxocc;''''';ccoxxxxxxxxx:..oc     \n" +
-                "olc,..',:cccccccccccc:;;;;;;;;:ccccccccc,.'c,     \n" +
-                "Ol;......................................;l'  ");
-        System.out.println(ANSI_RESET);
-    }
-
-    public DiscoveryServer() throws Exception {
-        displayHeader();
-        serverTable = new ServerTable();
-
-        try{
-            serverSocket = new ServerSocket(PORT_NUMBER);
-        }
-        catch(java.net.BindException e){
-            logger.error("FATAL - Could not bind socket, are you sure there isn't already an instance running?");
-            System.exit(1);
-            return;
-        }
-
-        logger.info("Started successfully - Now accepting connections");
-
-        try{
-            while (true){
-                Socket clientSocket = serverSocket.accept();
-
-                parseRequest(clientSocket);
-
-                clientSocket.close();
-            }
-        }
-        catch (Exception e){
-            close();
-        }
-    }
-
-
-    private void parseRequest(Socket clientSocket) throws Exception {
-        ServerRepoStreamParser parser = new ServerRepoStreamParser(clientSocket.getInputStream());
-
-        if (clientSocket.isConnected() && !clientSocket.isClosed()){
-            PacketType parsePacketResult = parser.parse();
-
-            switch (parsePacketResult){
-                case SERVER_REGISTRATION:
-                    ServerListing listing = parser.getServerListing();
-
-                    if (!serverTable.getAllServers().contains(listing)){
-                        listing.setRoomCode(serverTable.getNextRoomCode().toString());
-                    }
-
-                    serverTable.addServer(listing);
-
-                    Message serverRegMessage = new RoomCodeRequest(listing.getRoomCode());
-                    clientSocket.getOutputStream().write(serverRegMessage.getBuffer());
-                    break;
-
-                case ROOM_CODE_REQUEST:
-                    String desiredRoomCode = parser.getRoomCode();
-                    ServerListing serverListing;
-
-                    if (desiredRoomCode.equals("0000")){
-                        serverListing = getRandomFreeServer();
-                    }
-                    else {
-                        serverListing = serverTable.getServerByRoomCode(desiredRoomCode);
-                    }
-
-                    Message response;
-
-                    if (serverListing != null){
-                        response = new ServerRegistrationMessage(serverListing.getServerName(), serverListing.getMapName(), serverListing.getAddress(), serverListing.getPortNumber(), 0, 0, desiredRoomCode);
-                    }
-                    else{
-                        response = ServerRegistrationMessage.getEmptyRegistration();
-                    }
-
-                    clientSocket.getOutputStream().write(response.getBuffer());
-                    break;
-            }
-        }
-    }
-
-    public ServerListing getRandomFreeServer() {
-        ServerListing serverToJoin;
-
-        List<ServerListing> servers = serverTable.getAllServers();
-
-        if (servers.size() <= 0){
-            return null;
-        }
-
-        if (servers.size() == 1){
-            return servers.get(0);
-        }
-
-        serverToJoin = servers.get(new Random().nextInt(servers.size()));
-
-        int tries = 0;
-
-        while (serverToJoin != null && serverToJoin.isMaxPlayersReached() && tries < MAX_SERVER_TRIES){
-            serverToJoin = servers.get(new Random().nextInt(servers.size()));
-            tries++;
-        }
-
-        if (serverToJoin != null && serverToJoin.isMaxPlayersReached()){
-            return null;
-        }
-
-        return serverToJoin;
-    }
-
-    public void close(){
-        try {
-            serverSocket.close();
-        } catch (IOException ignored) {
-            ;
-        }
-    }
-}

src/main/java/seng302/discoveryServer/DiscoveryServerClient.java

@@ -1,195 +0,0 @@
-package seng302.discoveryServer;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.util.ServerListing;
-import seng302.discoveryServer.util.ServerRepoStreamParser;
-import seng302.gameServer.messages.Message;
-import seng302.gameServer.messages.RoomCodeRequest;
-import seng302.gameServer.messages.ServerRegistrationMessage;
-import seng302.model.stream.packets.PacketType;
-import seng302.visualiser.controllers.ViewManager;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.Socket;
-import java.net.URL;
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class DiscoveryServerClient {
-    private final Integer UPDATE_INTERVAL_MS = 5000;
-
-    private static String roomCode = null;
-    private Timer serverListingUpdateTimer;
-    private Logger logger = LoggerFactory.getLogger(DiscoveryServerClient.class);
-    private String ip = "";
-    private Boolean isInInvalidState = false;
-
-    public DiscoveryServerClient() {
-        try {
-            ip = getInetIpAddr();
-        } catch (Exception e) {
-            failError();
-        }
-    }
-
-    public String getInetIp(){
-        return ip;
-    }
-
-    private void failError() {
-        isInInvalidState = true;
-        ViewManager.getInstance().showErrorSnackBar("You do not appear to be able to connect to the internet. Matchmaking will be unavailable.");
-    }
-
-    public boolean didFail(){
-        return isInInvalidState;
-    }
-
-    /**
-     * Register the server with the discovery server
-     * @param serverListing The listing to register
-     */
-    public void register(ServerListing serverListing){
-        if (isInInvalidState) return;
-
-        if (serverListingUpdateTimer != null){
-            serverListingUpdateTimer.cancel();
-            serverListingUpdateTimer = null;
-        }
-
-        serverListingUpdateTimer = new Timer();
-
-        serverListingUpdateTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                try {
-                    sendRegistrationUpdate(serverListing);
-                } catch (Exception e) {
-                    logger.debug("Could not update server listing");
-                }
-            }
-        }, 0, UPDATE_INTERVAL_MS);
-    }
-
-    /**
-     * Stop updating the server registration updates
-     */
-    public void unregister(){
-        if (serverListingUpdateTimer != null)
-            serverListingUpdateTimer.cancel();
-    }
-
-    /**
-     * Gets the connection information for a server given a room code
-     *
-     * @param roomCode The room code to search for
-     * @return The ServerListing, or null if there was an error
-     * @throws Exception .
-     */
-    public ServerListing getServerForRoomCode(String roomCode) throws Exception {
-        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
-        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
-
-        Message request = new RoomCodeRequest(roomCode); //roomCode);
-        socket.getOutputStream().write(request.getBuffer());
-
-        PacketType packetType = parser.parse();
-
-        if (packetType != PacketType.SERVER_REGISTRATION){
-            logger.debug("Wrong packet received in response to a room code request");
-            return null;
-        }
-
-        socket.close();
-
-        return parser.getServerListing();
-    }
-
-    public ServerListing getRandomServer() throws Exception {
-        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
-        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
-
-        Message request = new RoomCodeRequest("0000");
-        socket.getOutputStream().write(request.getBuffer());
-
-        PacketType packetType = parser.parse();
-
-        if (packetType != PacketType.SERVER_REGISTRATION){
-            logger.error("Incorrect packet type received");
-            return null;
-        }
-
-        socket.close();
-
-        ServerListing serverListing = parser.getServerListing();
-
-        if (serverListing == null || serverListing.equals(ServerRegistrationMessage.getEmptyRegistration())){
-            return null;
-        }
-
-        return serverListing;
-    }
-
-    /**
-     * Sends a registration update to the discovery server.
-     *
-     * @param serverListing The server listing to send
-     * @throws Exception IF there was an error sending the update
-     */
-    private void sendRegistrationUpdate(ServerListing serverListing) throws Exception {
-        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
-        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
-
-        Message req = new ServerRegistrationMessage(serverListing);
-
-        socket.getOutputStream().write(req.getBuffer());
-
-        PacketType packetType = parser.parse();
-
-        if (packetType != PacketType.ROOM_CODE_REQUEST){
-            socket.close();
-            return;
-        }
-
-        String roomCode = parser.getRoomCode();
-
-        if (roomCode.length() != 0){
-            DiscoveryServerClient.roomCode = roomCode;
-        }
-
-        socket.close();
-    }
-
-    /**
-     * @return The last room code received by the client
-     */
-    public static String getRoomCode(){
-        return roomCode;
-    }
-
-    public static String getInetIpAddr() throws Exception {
-        URL myIp = new URL("http://checkip.amazonaws.com");
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new InputStreamReader(
-                    myIp.openStream()));
-            String ip = in.readLine();
-            return ip;
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-
-
-}
-

src/main/java/seng302/discoveryServer/util/ReadableByteInputStream.java

@@ -1,50 +0,0 @@
-package seng302.discoveryServer.util;
-
-import java.io.InputStream;
-
-public class ReadableByteInputStream {
-    private InputStream is;
-
-    public ReadableByteInputStream(InputStream is){
-        this.is = is;
-    }
-
-    /**
-     * Get n bytes from the input stream
-     * @param n number of bytes
-     * @return the bytes read
-     * @throws Exception .
-     */
-    public byte[] getBytes(int n) throws Exception {
-        byte[] bytes = new byte[n];
-        for (int i = 0; i < n; i++) {
-            bytes[i] = (byte) readByte();
-        }
-        return bytes;
-    }
-
-    /**
-     * Skip n bytes
-     * @param n number of bytes to skip
-     * @throws Exception
-     */
-    public void skipBytes(long n) throws Exception {
-        for (int i = 0; i < n; i++) {
-            readByte();
-        }
-    }
-
-    /**
-     * Read the next byte from the stream
-     * @return The byte that was read
-     * @throws Exception .
-     */
-    public int readByte() throws Exception {
-        int currentByte = is.read();
-
-        if (currentByte == -1) {
-            throw new Exception();
-        }
-        return currentByte;
-    }
-}

src/main/java/seng302/discoveryServer/util/ServerListing.java

@@ -1,117 +0,0 @@
-package seng302.discoveryServer.util;
-
-public class ServerListing {
-    public final static int SERVER_TTL_DEFAULT = 10;
-
-    private String serverName = "";
-    private String mapName = "";
-    private String address = "";
-    private int portNumber = 0;
-    private int capacity = 0;
-    private int players = 0;
-    private String roomCode = "";
-    private int ttl = SERVER_TTL_DEFAULT;
-
-
-    public ServerListing(String serverName, String mapName, String address, int portNumber, int capacity){
-        this.serverName = serverName;
-        this.mapName = mapName;
-        this.address = address;
-        this.portNumber = portNumber;
-        this.capacity = capacity;
-    }
-
-    public ServerListing setNumberOfPlayers(int players){
-        this.players = players;
-        return this;
-    }
-
-    public ServerListing setRoomCode(String roomCode){
-        this.roomCode = roomCode;
-        return this;
-    }
-
-    public void refreshTtl(){
-        ttl = SERVER_TTL_DEFAULT;
-    }
-
-    public void decrementTtl(){
-        ttl--;
-    }
-
-    public boolean hasTtlExpired(){
-        return ttl < 0;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (!ServerListing.class.isAssignableFrom(obj.getClass())) {
-            return false;
-        }
-
-        final ServerListing other = (ServerListing) obj;
-
-        if (this.getPortNumber() != other.getPortNumber()){
-            return false;
-        }
-
-        if (!this.getMapName().equals(other.getMapName())){
-            return false;
-        }
-
-        if (!this.getServerName().equals(other.getServerName())){
-            return false;
-        }
-
-        if (this.getCapacity() != other.getCapacity()){
-            return false;
-        }
-
-        if (!this.getAddress().equals(other.getAddress())){
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return this.getServerName().hashCode() +
-                this.getAddress().hashCode() + this.getMapName().hashCode();
-    }
-
-    public String getRoomCode() {
-        return roomCode;
-    }
-
-    public int getPortNumber() {
-        return portNumber;
-    }
-
-    public String getMapName() {
-        return mapName;
-    }
-
-    public String getServerName() {
-        return serverName;
-    }
-
-    public int getCapacity() {
-        return capacity;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setTtl(Integer ttl){
-        this.ttl = ttl;
-    }
-
-    public boolean isMaxPlayersReached() {
-        return players >= capacity;
-    }
-}

src/main/java/seng302/discoveryServer/util/ServerRepoStreamParser.java

@@ -1,109 +0,0 @@
-package seng302.discoveryServer.util;
-
-
-import seng302.gameServer.messages.Message;
-import seng302.model.stream.packets.PacketType;
-
-import java.io.InputStream;
-import java.util.Arrays;
-
-public class ServerRepoStreamParser {
-    private ReadableByteInputStream inputStream;
-
-    private String roomCode;
-    private String mapName;
-    private ServerListing serverListing;
-
-    public ServerRepoStreamParser(InputStream is){
-        inputStream = new ReadableByteInputStream(is);
-    }
-
-    public PacketType parse() throws Exception {
-        int sync1 = inputStream.readByte();
-        int sync2 = inputStream.readByte();
-
-        PacketType packetType = null;
-
-        if (sync1 == 0x47 && sync2 == 0x83) {
-            int type = inputStream.readByte();
-            inputStream.skipBytes(10);
-            long payloadLength = Message.bytesToLong(inputStream.getBytes(2));
-            byte[] payload = inputStream.getBytes((int) payloadLength);
-            inputStream.skipBytes(4);
-
-            packetType = PacketType.assignPacketType(type, payload);
-
-            switch (packetType) {
-                case ROOM_CODE_REQUEST:
-                    roomCode = parseRoomCodeRequest(payload);
-                    break;
-
-                case LOBBY_REQUEST:
-                    mapName = parseLobbyRequest(payload);
-
-                case SERVER_REGISTRATION:
-                    serverListing = parseServerRegistration(payload);
-                    break;
-            }
-
-        }
-
-        return packetType;
-    }
-    private String parseLobbyRequest(byte[] payload) {
-        int mapNameLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 0 ,4));
-
-        return new String(Arrays.copyOfRange(payload, 4, 4+mapNameLength));
-    }
-
-    private String parseRoomCodeRequest(byte[] payload) {
-        int roomCodeLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 0 ,6));
-
-        return new String(Arrays.copyOfRange(payload, 6, 6+roomCodeLength));
-    }
-
-    public static ServerListing parseServerRegistration(byte[] payload) {
-        int nameLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 0, 6));
-        int mapNameLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 6, 12));
-        int addressLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 12, 18));
-        int roomCodeLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 18, 24));
-
-        int portNumber = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 24, 28));
-        int players = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 28, 32));
-        int capacity = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 32, 36));
-
-        int currentPos = 36;
-        int nextPos = currentPos + nameLength;
-        String serverName = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
-
-        currentPos = nextPos;
-        nextPos = currentPos + mapNameLength;
-        String mapName = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
-
-        currentPos = nextPos;
-        nextPos = currentPos + addressLength;
-        String address = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
-
-        currentPos = nextPos;
-        nextPos = currentPos + roomCodeLength;
-        String roomCode = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
-
-        ServerListing serverListing = new ServerListing(serverName, mapName, address, portNumber, capacity);
-        serverListing.setNumberOfPlayers(players);
-        serverListing.setRoomCode(roomCode);
-
-        return serverListing;
-    }
-
-    public String getRoomCode() {
-        return roomCode;
-    }
-
-    public String getMapName() {
-        return mapName;
-    }
-
-    public ServerListing getServerListing() {
-        return serverListing;
-    }
-}

src/main/java/seng302/discoveryServer/util/ServerTable.java

@@ -1,97 +0,0 @@
-package seng302.discoveryServer.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-public class ServerTable {
-    private List<ServerListing> servers;
-    private int lastRoomCode = 4020;
-    private Logger logger = LoggerFactory.getLogger(ServerTable.class);
-
-    public ServerTable(){
-        servers = new ArrayList<>();
-
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                updateServers();
-            }
-        }, 0, 1000);
-    }
-
-    /**
-     * Update the servers TTL values, and then remove expired servers
-     */
-    private void updateServers() {
-        List<ServerListing> serversToRemove = new ArrayList<>();
-
-        for (ServerListing server : servers){
-            server.decrementTtl();
-
-            if (server.hasTtlExpired()){
-                logger.debug("Removed expired server - " + server.getServerName());
-                serversToRemove.add(server);
-            }
-        }
-
-        servers.removeAll(serversToRemove);
-    }
-
-    /**
-     * Add a server to the table
-     * @param server The server to add
-     */
-    public void addServer(ServerListing server){
-        if (servers.contains(server)){
-           updateTtlForServer(server);
-           return;
-        }
-        logger.debug("Added new server - " + server.getServerName() + " at address: " + server.getAddress() + ":" + server.getPortNumber());
-        servers.add(server);
-    }
-
-    /**
-     * Update the TTL for a given server to the default TTL value
-     * @param server The server to update
-     */
-    private void updateTtlForServer(ServerListing server) {
-        for (ServerListing serverListing : servers){
-            if (server.equals(serverListing)){
-                serverListing.refreshTtl();
-            }
-        }
-    }
-
-    /**
-     * @return All the servers in the table
-     */
-    public List<ServerListing> getAllServers(){
-        return Collections.unmodifiableList(servers);
-    }
-
-    /**
-     * Get a server from the table given its room code
-     * @param roomCode The room code to search for
-     * @return The ServerListing of the found server, or null
-     *         the server wasn't found
-     */
-    public ServerListing getServerByRoomCode(String roomCode){
-        for (ServerListing serverListing : servers){
-            if (serverListing.getRoomCode().equals(roomCode)){
-                return serverListing;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return The next available room code
-     */
-    public Integer getNextRoomCode(){
-        lastRoomCode += 1;
-        return lastRoomCode;
-    }
-}

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

@@ -1,19 +1,20 @@
 package seng302.gameServer;
 
-import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
 import javafx.scene.paint.Color;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
 import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.BoatStatus;
 import seng302.gameServer.messages.ChatterMessage;
@@ -22,6 +23,8 @@ import seng302.gameServer.messages.MarkRoundingMessage;
 import seng302.gameServer.messages.MarkType;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RoundingBoatStatus;
+import seng302.gameServer.messages.YachtEventCodeMessage;
+import seng302.gameServer.messages.YachtEventType;
 import seng302.model.GeoPoint;
 import seng302.model.Limit;
 import seng302.model.Player;
@@ -30,12 +33,10 @@ import seng302.model.ServerYacht;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.mark.MarkOrder;
-import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.token.Token;
 import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
-import seng302.utilities.RandomSpawn;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.utilities.XMLParser;
 
 /**
  * A Static class to hold information about the current state of the game (model)
@@ -52,38 +53,24 @@ public class GameState implements Runnable {
     private static Logger logger = LoggerFactory.getLogger(GameState.class);
 
 
-    private static final Integer STATE_UPDATES_PER_SECOND = 60;
-
-    //Scheduling constants
     static final int WARNING_TIME = 10 * -1000;
     static final int PREPATORY_TIME = 5 * -1000;
     private static final int TIME_TILL_START = 10 * 1000;
 
-    //Wind Constants
-    private static final int MAX_WIND_SPEED = 12000;
-    private static final int MIN_WIND_SPEED = 8000;
+    private static final Long POWERUP_TIMEOUT_MS = 10_000L;
 
-    //Rounding Constants
-    private static final Double ROUNDING_DISTANCE = 50d; // TODO: 14/08/17 wmu16 - Look into this value further
-
-    //Collision constants
+    private static final Integer STATE_UPDATES_PER_SECOND = 60;
+    private static Double ROUNDING_DISTANCE = 50d; // TODO: 14/08/17 wmu16 - Look into this value further
     private static final Double MARK_COLLISION_DISTANCE = 15d;
     public static final Double YACHT_COLLISION_DISTANCE = 25.0;
     private static final Double BOUNCE_DISTANCE_MARK = 20.0;
     public static final Double BOUNCE_DISTANCE_YACHT = 30.0;
     private static final Double COLLISION_VELOCITY_PENALTY = 0.3;
 
-    //Powerup Constants
-    public static final Double VELOCITY_BOOST_MULTIPLIER = 2d;
-    public static final Integer HANDLING_BOOST_MULTIPLIER = 2;
-    private static final Double BAD_RANDOM_SPEED_PENALTY = 0.3;
-    public static final Long BUMPER_DISABLE_TIME = 5_000L;
-    private static final Long TOKEN_SPAWN_TIME = 30_000L;
-
     private static Long previousUpdateTime;
     public static Double windDirection;
     private static Double windSpeed;
-    private static Double serverSpeedMultiplier;
+    private static Double speedMultiplier = 1d;
 
     private static Boolean customizationFlag; // dirty flag to tell if a player has customized their boat.
     private static Boolean playerHasLeftFlag;
@@ -91,46 +78,85 @@ public class GameState implements Runnable {
     private static String hostIpAddress;
     private static List<Player> players;
     private static Map<Integer, ServerYacht> yachts;
+    private static Boolean isRaceStarted;
     private static GameStages currentStage;
     private static MarkOrder markOrder;
     private static long startTime;
-    private static Set<Mark> marks = new HashSet<>();
-    private static List<Limit> courseLimit = new ArrayList<>();
+    private static Set<Mark> marks;
+    private static List<Limit> courseLimit;
     private static Integer maxPlayers = 8;
 
+
+    private static List<Token> allTokens;
     private static List<Token> tokensInPlay;
-    private static RandomSpawn randomSpawn;
 
     private static List<NewMessageListener> newMessageListeners;
 
     private static Map<Player, String> playerStringMap = new HashMap<>();
-    private static boolean tokensEnabled = false;
 
-    public GameState() {
+    public GameState(String hostIpAddress) {
         windDirection = 180d;
         windSpeed = 10000d;
         yachts = new HashMap<>();
         tokensInPlay = new ArrayList<>();
+
         players = new ArrayList<>();
+        GameState.hostIpAddress = hostIpAddress;
         customizationFlag = false;
         playerHasLeftFlag = false;
-        serverSpeedMultiplier = 1.0;
+        speedMultiplier = 1.0;
         currentStage = GameStages.LOBBYING;
+        isRaceStarted = false;
+        //set this when game stage changes to prerace
         previousUpdateTime = System.currentTimeMillis();
+        markOrder = new MarkOrder(); //This could be instantiated at some point with a select map?
         newMessageListeners = new ArrayList<>();
+        allTokens = makeTokens();
 
         resetStartTime();
-        //setCourseLimit("/server_config/race.xml");
+
         new Thread(this, "GameState").start();   //Run the auto updates on the game state
+
+        marks = new MarkOrder().getAllMarks();
+        setCourseLimit("/server_config/race.xml");
     }
 
-    public static void setRace(RaceXMLData raceXMLData) {
-        markOrder = new MarkOrder(raceXMLData);
-        for (CompoundMark compoundMark : raceXMLData.getCompoundMarks().values()){
-            marks.addAll(compoundMark.getMarks());
+    private void setCourseLimit(String url) {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setNamespaceAware(true);
+        DocumentBuilder documentBuilder;
+        Document document = null;
+        try {
+            documentBuilder = documentBuilderFactory.newDocumentBuilder();
+            document = documentBuilder.parse(new InputSource(getClass().getResourceAsStream(url)));
+        } catch (Exception e) {
+            // sorry, we have to catch general one, otherwise we have to catch five different exceptions.
+            logger.trace("Failed to load course limit for boundary collision detection.", e);
         }
-        randomSpawn = new RandomSpawn(markOrder.getOrderedUniqueCompoundMarks());
-        courseLimit = raceXMLData.getCourseLimit();
+        courseLimit = XMLParser.parseRace(document).getCourseLimit();
+    }
+
+
+    /**
+     * Make a pre defined set of tokensInPlay. //TODO wmu16 - Should read from some file for each
+     * race ideally
+     *
+     * @return A list of possible tokensInPlay for this race
+     */
+    private ArrayList<Token> makeTokens() {
+        Token token1 = new Token(TokenType.BOOST, 57.66946, 11.83154);
+        Token token2 = new Token(TokenType.BOOST, 57.66877, 11.83382);
+        Token token3 = new Token(TokenType.BOOST, 57.66914, 11.83965);
+        Token token4 = new Token(TokenType.BOOST, 57.66684, 11.83214);
+        return new ArrayList<>(Arrays.asList(token1, token2, token3, token4));
+    }
+
+    public static String getHostIpAddress() {
+        return hostIpAddress;
+    }
+
+    public static Set<Mark> getMarks() {
+        return Collections.unmodifiableSet(marks);
     }
 
     public static List<Player> getPlayers() {
@@ -141,10 +167,6 @@ public class GameState implements Runnable {
         return tokensInPlay;
     }
 
-    public static Set<Mark> getMarks() {
-        return Collections.unmodifiableSet(marks);
-    }
-
     public static void addPlayer(Player player) {
         players.add(player);
         String playerText = player.getYacht().getSourceId() + " " + player.getYacht().getBoatName()
@@ -165,6 +187,10 @@ public class GameState implements Runnable {
         yachts.remove(yachtId);
     }
 
+    public static Boolean getIsRaceStarted() {
+        return isRaceStarted;
+    }
+
     public static GameStages getCurrentStage() {
         return currentStage;
     }
@@ -233,77 +259,16 @@ public class GameState implements Runnable {
             } catch (InterruptedException e) {
                 System.out.println("[GameState] interrupted exception");
             }
-            if (currentStage == GameStages.PRE_RACE) {
+            if (currentStage == GameStages.PRE_RACE || currentStage == GameStages.RACING) {
                 update();
-                if (System.currentTimeMillis() > startTime) {
-                    startSpawningTokens();
-                    startUpdatingWind();
-                    GameState.currentStage = GameStages.RACING;
-                }
             }
+
             if (currentStage == GameStages.RACING) {
                 update();
             }
         }
     }
 
-    /**
-     * Start spawning coins every 60s after the first minute
-     */
-    private void startSpawningTokens() {
-        Timer timer = new Timer("Token Spawning Timer");
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                if (tokensEnabled) {
-                    spawnNewToken();
-                    notifyMessageListeners(MessageFactory.getRaceXML());
-                }
-            }
-        }, 0, TOKEN_SPAWN_TIME);
-    }
-
-    // TODO: 29/08/17 wmu16 - This sort of update should be in game state
-    private static void startUpdatingWind() {
-        Timer timer = new Timer("Wind Updating Timer");
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                updateWind();
-            }
-        }, 0, 500);
-    }
-
-
-    private static void updateWind() {
-        Integer direction = GameState.getWindDirection().intValue();
-        Integer windSpeed = GameState.getWindSpeedMMS().intValue();
-
-        Random random = new Random();
-
-        if (Math.floorMod(random.nextInt(), 2) == 0) {
-            direction += random.nextInt(4);
-            windSpeed += random.nextInt(20) + 459;
-        } else {
-            direction -= random.nextInt(4);
-            windSpeed -= random.nextInt(20) + 459;
-        }
-
-        direction = Math.floorMod(direction, 360);
-
-        if (windSpeed > MAX_WIND_SPEED) {
-            windSpeed -= random.nextInt(500);
-        }
-
-        if (windSpeed <= MIN_WIND_SPEED) {
-            windSpeed += random.nextInt(500);
-        }
-
-        GameState.windSpeed = Double.valueOf(windSpeed);
-        GameState.windDirection = direction.doubleValue();
-    }
-
-
     public static void updateBoat(Integer sourceId, BoatAction actionType) {
         ServerYacht playerYacht = yachts.get(sourceId);
         switch (actionType) {
@@ -325,12 +290,6 @@ public class GameState implements Runnable {
             case DOWNWIND:
                 playerYacht.turnDownwind();
                 break;
-            case CONTINUOUSLY_TURNING:
-                playerYacht.setContinuouslyTurning(true);
-                break;
-            case DEFAULT_TURNING:
-                playerYacht.setContinuouslyTurning(false);
-                break;
         }
     }
 
@@ -338,13 +297,10 @@ public class GameState implements Runnable {
      * Randomly select a subset of tokensInPlay from a pre defined superset
      * Broadasts a new race status message to show this update
      */
-    private void spawnNewToken() {
+    public static void spawnNewToken() {
+        Random random = new Random();
         tokensInPlay.clear();
-        Token token = randomSpawn.getRandomToken();
-//        token.assignType(TokenType.WIND_WALKER);
-        logger.debug("Spawned token of type " + token.getTokenType());
-        tokensInPlay.add(token);
-        MessageFactory.updateTokens(tokensInPlay);
+        tokensInPlay.add(allTokens.get(random.nextInt(allTokens.size())));
     }
 
     /**
@@ -361,12 +317,14 @@ public class GameState implements Runnable {
 
         Double timeInterval = (System.currentTimeMillis() - previousUpdateTime) / 1000000.0;
         previousUpdateTime = System.currentTimeMillis();
-
+        if (System.currentTimeMillis() > startTime) {
+            GameState.setCurrentStage(GameStages.RACING);
+        }
         for (ServerYacht yacht : yachts.values()) {
             updateVelocity(yacht);
+            checkPowerUpTimeout(yacht);
             yacht.runAutoPilot();
             yacht.updateLocation(timeInterval);
-            preformTokenUpdates(yacht); //This update must be done before collision. Sorta hacky
             checkCollision(yacht);
             if (yacht.getBoatStatus() != BoatStatus.FINISHED) {
                 checkForLegProgression(yacht);
@@ -380,138 +338,16 @@ public class GameState implements Runnable {
     }
 
 
-    /**
-     * All token functionality entry points is taken care of here. So can be disabled and enabled
-     * easily
-     *
-     * @param yacht The yacht to perform token checks on
-     */
-    private void preformTokenUpdates(ServerYacht yacht) {
-        Token collidedToken = checkTokenPickUp(yacht);
-        if (collidedToken != null) {
-            tokensInPlay.remove(collidedToken);
-            powerUpYacht(yacht, collidedToken);
-            MessageFactory.updateTokens(tokensInPlay);
-            notifyMessageListeners(MessageFactory.getRaceXML());
-        }
-
-        checkPowerUpTimeout(yacht);
-        TokenType powerUp = yacht.getPowerUp();
-
-        if (powerUp != null) {
-            switch (powerUp) {
-                case WIND_WALKER:
-                    windWalk(yacht);
-                    break;
-                case BUMPER:
-                    ServerYacht collidedYacht = checkYachtCollision(yacht, true);
-                    if (collidedYacht != null) {
-                        yacht.powerDown();
-                        boatTempShutDown(collidedYacht);
-                        notifyMessageListeners(MessageFactory.makePowerDownMessage(yacht));
-                        notifyMessageListeners(
-                            MessageFactory.makeStatusEffectMessage(collidedYacht, powerUp));
-                    }
-                    break;
-                case RANDOM:
-                    yacht.setPowerUpSpeedMultiplier(BAD_RANDOM_SPEED_PENALTY);
-            }
-        }
-    }
-
-
-    /**
-     * Powers up a thisYacht with the given token type.
-     *
-     * @param thisYacht The yacht to be powered up
-     * @param collidedToken The token which this thisYacht collided with
-     */
-    private void powerUpYacht(ServerYacht thisYacht, Token collidedToken) {
-        //The random token has a 50% chance of becoming another token else becoming a speed detriment!
-        if (collidedToken.getTokenType() == TokenType.RANDOM && new Random().nextBoolean()) {
-            collidedToken.realiseRandom();
-        }
-
-        //If another yacht has the wind walker token, They should be powered down. Only one allowed!
-        else if (collidedToken.getTokenType() == TokenType.WIND_WALKER) {
-            for (ServerYacht otherYacht : yachts.values()) {
-                if (otherYacht != thisYacht && otherYacht.getPowerUp() == TokenType.WIND_WALKER) {
-                    powerDownYacht(otherYacht);
-                }
-            }
-        }
-
-        thisYacht.powerUp(collidedToken.getTokenType());
-        String logMessage =
-            thisYacht.getBoatName() + " has picked up a " + collidedToken.getTokenType().getName()
-                + " token";
-        notifyMessageListeners(
-            MessageFactory.makeChatterMessage(thisYacht.getSourceId(), logMessage));
-        notifyMessageListeners(MessageFactory.getRaceXML());
-        notifyMessageListeners(MessageFactory.makePickupMessage(thisYacht, collidedToken));
-        logger.debug(
-            "Yacht: " + thisYacht.getShortName() + " got powerup " + collidedToken.getTokenType());
-    }
-
-    private void powerDownYacht(ServerYacht yacht) {
-        String logMessage =
-            yacht.getBoatName() + "'s " + yacht.getPowerUp().getName() + "  expired";
-        notifyMessageListeners(
-            MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
-        notifyMessageListeners(MessageFactory.makePowerDownMessage(yacht));
-        logger.debug("Yacht: " + yacht.getShortName() + " powered down!");
-
-        yacht.powerDown();
-    }
-
-    // TODO: 23/09/17 wmu16 - This is a hacky way to have the boat power down. Need some sort of separation between token and status effect :/
-
-    /**
-     * Disables the given boat for BUMPER_DISABLE_TIME ms.
-     *
-     * @param yacht The yacht to disable
-     */
-    private void boatTempShutDown(ServerYacht yacht) {
-        yacht.setPowerUpSpeedMultiplier(0d);
-        Timer shutDownTimer = new Timer("Shutdown Timer");
-        shutDownTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                yacht.powerDown();  //Note this actually resets the boat to normal.
-            }
-        }, BUMPER_DISABLE_TIME);
-    }
-
-
-    /**
-     * Checks how long a powerup has been active for. If it has exceeded its timeout, it powers the
-     * yacht down.
-     *
-     * @param yacht The yacht to check to power down
-     */
     private void checkPowerUpTimeout(ServerYacht yacht) {
         if (yacht.getPowerUp() != null) {
-            if (System.currentTimeMillis() - yacht.getPowerUpStartTime() > yacht.getPowerUp()
-                .getTimeout()) {
-                powerDownYacht(yacht);
+            if (System.currentTimeMillis() - yacht.getPowerUpStartTime() > POWERUP_TIMEOUT_MS) {
+                yacht.powerDown();
+                logger.debug("Yacht: " + yacht.getShortName() + " powered down!");
             }
         }
     }
 
 
-    /**
-     * This function changes the wind to be at an angle that causes the yacht in question to be at
-     * its fastest velocity
-     *
-     * @param yacht The yacht to fix the wind for
-     */
-    private void windWalk(ServerYacht yacht) {
-        Double optimalAngle = PolarTable.getOptimalAngle();
-        Double heading = yacht.getHeading();
-        windDirection = (double) Math.floorMod(Math.round(heading + optimalAngle), 360L);
-    }
-
-
     /**
      * Check if the yacht has crossed the course limit
      *
@@ -525,7 +361,6 @@ public class GameState implements Runnable {
                 return true;
             }
         }
-
         if (GeoUtility.checkCrossedLine(courseLimit.get(courseLimit.size() - 1), courseLimit.get(0),
             yacht.getLastLocation(), yacht.getLocation()) != 0) {
             return true;
@@ -534,15 +369,13 @@ public class GameState implements Runnable {
     }
 
     /**
-     * Checks all tokensInPlay to see if a yacht has picked one up. If so, the yacht is powered up
-     * in the appropriate way
-     * @param yacht The yacht to check for collision with a token
-     *
-     * @return The token collided with
+     * Checks all tokensInPlay to see if a yacht has picked one up
+     * @return Token which was collided with
+     * @param serverYacht The yacht to check for collision with a token
      */
-    private Token checkTokenPickUp(ServerYacht yacht) {
+    private static Token checkTokenPickUp(ServerYacht serverYacht) {
         for (Token token : tokensInPlay) {
-            Double distance = GeoUtility.getDistance(token, yacht.getLocation());
+            Double distance = GeoUtility.getDistance(token, serverYacht.getLocation());
             if (distance < YACHT_COLLISION_DISTANCE) {
                 return token;
             }
@@ -565,7 +398,7 @@ public class GameState implements Runnable {
      */
     public static void checkCollision(ServerYacht serverYacht) {
         //Yacht Collision
-        ServerYacht collidedYacht = checkYachtCollision(serverYacht, false);
+        ServerYacht collidedYacht = checkYachtCollision(serverYacht);
         Mark collidedMark = checkMarkCollision(serverYacht);
 
         if (collidedYacht != null) {
@@ -582,7 +415,9 @@ public class GameState implements Runnable {
             collidedYacht.setCurrentVelocity(
                 collidedYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
             );
-            notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
+            notifyMessageListeners(
+                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION)
+            );
         }
 
         //Mark Collision
@@ -594,7 +429,9 @@ public class GameState implements Runnable {
             serverYacht.setCurrentVelocity(
                 serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
             );
-            notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
+            notifyMessageListeners(
+                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION)
+            );
         }
 
         //Boundary Collision
@@ -607,7 +444,21 @@ public class GameState implements Runnable {
             serverYacht.setCurrentVelocity(
                 serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
             );
-            notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
+            notifyMessageListeners(
+                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION)
+            );
+        }
+
+        //Token Collision
+        Token collidedToken = checkTokenPickUp(serverYacht);
+        if (collidedToken != null) {
+            tokensInPlay.remove(collidedToken);
+            serverYacht.powerUp(collidedToken.getTokenType());
+            logger.debug("Yacht: " + serverYacht.getShortName() + " got powerup " + collidedToken
+                .getTokenType());
+            notifyMessageListeners(MessageFactory.getRaceXML());
+            notifyMessageListeners(
+                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.TOKEN));
         }
     }
 
@@ -615,30 +466,29 @@ public class GameState implements Runnable {
     private void updateVelocity(ServerYacht yacht) {
         Double trueWindAngle = Math.abs(windDirection - yacht.getHeading());
         Double boatSpeedInKnots = PolarTable.getBoatSpeed(getWindSpeedKnots(), trueWindAngle);
-        Double maxBoatSpeed =
-            GeoUtility.knotsToMMS(boatSpeedInKnots) * serverSpeedMultiplier * yacht
-                .getPowerUpSpeedMultiplier() * yacht.getBoatTypeSpeedMultiplier();
+        Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots) * speedMultiplier;
+        if (yacht.getPowerUp() != null) {
+            if (yacht.getPowerUp().equals(TokenType.BOOST)) {
+                // TODO: 11/09/17 wmu16 CHANGE THIS TO MAGIC NUMBER
+                maxBoatSpeed *= 2;
+            }
+        }
 
         Double currentVelocity = yacht.getCurrentVelocity();
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (currentVelocity < maxBoatSpeed - 500) {
-                yacht.changeVelocity(
-                    (maxBoatSpeed / 100) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(maxBoatSpeed / 100);
             } else if (currentVelocity > maxBoatSpeed + 500) {
-                yacht.changeVelocity(
-                    (-currentVelocity / 200) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 200);
             } else {
-                yacht
-                    .setCurrentVelocity((maxBoatSpeed) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.setCurrentVelocity(maxBoatSpeed);
             }
         } else {
             if (currentVelocity > 3000) {
-                yacht.changeVelocity(
-                    (-currentVelocity / 200) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 200);
             } else if (currentVelocity > 100) {
-                yacht.changeVelocity(
-                    (-currentVelocity / 50) * yacht.getBoatTypeAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 50);
             } else if (currentVelocity <= 100) {
                 yacht.setCurrentVelocity(0d);
             }
@@ -700,12 +550,6 @@ public class GameState implements Runnable {
         }
 
         if (hasProgressed) {
-            if (currentMarkSeqID != 0 && !markOrder.isLastMark(currentMarkSeqID)) {
-
-                String logMessage = yacht.getBoatName() + " passed leg " + yacht.getLegNumber();
-                notifyMessageListeners(
-                    MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
-            }
             yacht.incrementLegNumber();
             sendMarkRoundingMessage(yacht);
             logMarkRounding(yacht);
@@ -725,10 +569,6 @@ public class GameState implements Runnable {
      * @param yacht The current yacht to check for
      */
     private Boolean checkStartLineCrossing(ServerYacht yacht) {
-        long timeTillStart = System.currentTimeMillis() - this.getStartTime();
-        if (timeTillStart < 0){
-            return false;
-        }
         Integer currentMarkSeqID = yacht.getCurrentMarkSeqID();
         CompoundMark currentMark = markOrder.getCurrentMark(currentMarkSeqID);
         GeoPoint lastLocation = yacht.getLastLocation();
@@ -744,9 +584,6 @@ public class GameState implements Runnable {
             if (crossedLine == 2 && isClockwiseCross || crossedLine == 1 && !isClockwiseCross) {
                 yacht.setClosestCurrentMark(mark1);
                 yacht.setBoatStatus(BoatStatus.RACING);
-                String logMessage = yacht.getBoatName() + " passed start line";
-                notifyMessageListeners(
-                    MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
                 return true;
             }
         }
@@ -850,10 +687,6 @@ public class GameState implements Runnable {
             if (crossedLine == 1 && isClockwiseCross || crossedLine == 2 && !isClockwiseCross) {
                 yacht.setClosestCurrentMark(mark1);
                 yacht.setBoatStatus(BoatStatus.FINISHED);
-
-                String logMessage = yacht.getBoatName() + " passed finish line";
-                notifyMessageListeners(
-                    MessageFactory.makeChatterMessage(yacht.getSourceId(), logMessage));
                 return true;
             }
         }
@@ -876,20 +709,16 @@ public class GameState implements Runnable {
             String name = new String(customizeData);
             playerYacht.setBoatName(name);
         } else if (requestType.equals(CustomizeRequestType.COLOR)) {
-            //This low level stuff shouldnt be here alistair! In fact no logic LIKE THIS should! - wmu16
             int red = customizeData[0] & 0xFF;
             int green = customizeData[1] & 0xFF;
             int blue = customizeData[2] & 0xFF;
             Color yachtColor = Color.rgb(red, green, blue);
             playerYacht.setBoatColor(yachtColor);
-        } else if (requestType.equals(CustomizeRequestType.SHAPE)) {
-            String type = new String(customizeData);
-            playerYacht.setBoatType(BoatMeshType.valueOf(type));
         }
     }
 
     private static Mark checkMarkCollision(ServerYacht yacht) {
-        Set<Mark> marksInRace = new HashSet<>(marks);
+        Set<Mark> marksInRace = GameState.getMarks();
         for (Mark mark : marksInRace) {
             if (GeoUtility.getDistance(yacht.getLocation(), mark)
                 <= MARK_COLLISION_DISTANCE) {
@@ -918,22 +747,15 @@ public class GameState implements Runnable {
      * Collision detection which iterates through all the yachts and check if any yacht collided
      * with this yacht. Return collided yacht or null if no collision.
      *
-     * UPDATE: HACK!!! wmu16 - forBumperCollision is (the goddamn dirtiest) dirty flag to fix a
-     * weird bug where the bumper collision would not be registerd but the knock back collision would.
-     * In other words, only set the 'forBumperCollision' flag true if used for the bumper power up.
-     *
      * @return yacht to compare to all other yachts.
      */
-    private static ServerYacht checkYachtCollision(ServerYacht yacht, Boolean forBumperCollision) {
-        Double collisionDistance =
-            (forBumperCollision) ? YACHT_COLLISION_DISTANCE + 2.5 : YACHT_COLLISION_DISTANCE;
+    private static ServerYacht checkYachtCollision(ServerYacht yacht) {
 
         for (ServerYacht otherYacht : GameState.getYachts().values()) {
             if (otherYacht != yacht) {
                 Double distance = GeoUtility
                     .getDistance(otherYacht.getLocation(), yacht.getLocation());
-                ;
-                if (distance < collisionDistance) {
+                if (distance < YACHT_COLLISION_DISTANCE) {
                     return otherYacht;
                 }
             }
@@ -969,26 +791,29 @@ public class GameState implements Runnable {
                 roundingMark.getSourceID()));
     }
 
+
     public static void processChatter(ChatterMessage chatterMessage, boolean isHost) {
         String chatterText = chatterMessage.getMessage();
         String[] words = chatterText.split("\\s+");
         if (words.length > 2 && isHost) {
             switch (words[2].trim()) {
-                case "/speed":
+                case ">speed":
                     try {
-                        serverSpeedMultiplier = Double.valueOf(words[3]);
-                        String logMessage = "Speed modifier set to x" + words[3];
-                        notifyMessageListeners(MessageFactory
-                            .makeChatterMessage(chatterMessage.getMessageType(), logMessage));
+                        setSpeedMultiplier(Double.valueOf(words[3]));
+                        notifyMessageListeners(new ChatterMessage(
+                            chatterMessage.getMessage_type(),
+                            "SERVER: Speed modifier set to x" + words[3]
+                        ));
                     } catch (Exception e) {
                         Logger logger = LoggerFactory.getLogger(GameState.class);
                         logger.error("cannot parse >speed value");
                     }
                     return;
-                case "/finish":
-                    String logMessage = "Game will now finish";
-                    notifyMessageListeners(MessageFactory
-                        .makeChatterMessage(chatterMessage.getMessageType(), logMessage));
+                case ">finish":
+                    notifyMessageListeners(new ChatterMessage(
+                        chatterMessage.getMessage_type(),
+                        "SERVER: Game will now finish"
+                    ));
                     endRace();
                     return;
             }
@@ -1038,12 +863,6 @@ public class GameState implements Runnable {
 
     public static void setMaxPlayers(Integer newMax){
         maxPlayers = newMax;
-
-        try {
-            ServerAdvertiser.getInstance().setCapacity(newMax);
-        } catch (IOException e) {
-            logger.warn("Couldn't update max players");
-        }
     }
 
     public static void endRace () {
@@ -1051,11 +870,11 @@ public class GameState implements Runnable {
         currentStage = GameStages.FINISHED;
     }
 
-    public static double getServerSpeedMultiplier() {
-        return serverSpeedMultiplier;
+    public static void setSpeedMultiplier (double multiplier) {
+        speedMultiplier = multiplier;
     }
 
-    public static void setTokensEnabled (boolean tokensEnabled) {
-        GameState.tokensEnabled = tokensEnabled;
+    public static double getSpeedMultiplier () {
+        return speedMultiplier;
     }
 }

src/main/java/seng302/gameServer/MainServerThread.java

@@ -1,30 +1,30 @@
 package seng302.gameServer;
 
 import java.io.IOException;
+import java.io.StringReader;
 import java.net.ServerSocket;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Random;
 import java.util.Timer;
 import java.util.TimerTask;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import seng302.gameServer.messages.Message;
 import seng302.model.GeoPoint;
 import seng302.model.Player;
 import seng302.model.PolarTable;
 import seng302.model.ServerYacht;
-import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.mark.CompoundMark;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.utilities.GeoUtility;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-import java.util.Random;
-import java.util.Timer;
-import java.util.TimerTask;
+import seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
 
 /**
  * A class describing the overall server, which creates and collects server threads for each client
@@ -37,19 +37,37 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     private static final int PORT = 4942;
     private static final Integer CLIENT_UPDATES_PER_SECOND = 60;
 
+    private static final int MAX_WIND_SPEED = 12000;
+    private static final int MIN_WIND_SPEED = 8000;
+
     private boolean terminated;
 
     private Thread thread;
-    private boolean hasStarted = false;
 
     private ServerSocket serverSocket = null;
-    private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
+    private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();;
     private static Integer capacity;
-    private RaceXMLData raceXMLData;
-    private RegattaXMLData regattaXMLData;
-    private boolean serverStarted = false;
 
     private void startAdvertisingServer() {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db;
+        Document doc;
+        XMLGenerator generator = new XMLGenerator();
+
+        try {
+            db = dbf.newDocumentBuilder();
+            String regatta = generator.getRegattaAsXml();
+            StringReader stringReader = new StringReader(regatta);
+            InputSource is = new InputSource(stringReader);
+            doc = db.parse(is);
+        } catch (ParserConfigurationException | IOException | SAXException e) {
+            logger.warn("Couldn't load race regatta");
+            return;
+        }
+
+        RegattaXMLData regattaXMLData = XMLParser.parseRegatta(doc);
+
+
         Integer capacity = GameState.getCapacity();
         Integer numPlayers = GameState.getNumberOfPlayers();
         Integer spacesLeft = capacity - numPlayers;
@@ -61,46 +79,39 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
         // Start advertising server
         try {
-            ServerAdvertiser.getInstance()
-                .setMapName(regattaXMLData.getCourseName())
-                .setCapacity(capacity)
-                .setNumberOfPlayers(numPlayers - 1)
-                .registerGame(PORT, regattaXMLData.getRegattaName());
+            ServerAdvertiser.getInstance().setMapName(regattaXMLData.getCourseName()).setCapacity(capacity).setNumberOfPlayers(numPlayers);
+            ServerAdvertiser.getInstance().registerGame(PORT, regattaXMLData.getRegattaName());
         } catch (IOException e) {
             logger.warn("Could not register server");
         }
     }
 
     public MainServerThread() {
-        new GameState();
+        new GameState("localhost");
         try {
             serverSocket = new ServerSocket(PORT);
         } catch (IOException e) {
             logger.trace("IO error in server thread handler upon trying to make new server socket",
                 0);
         }
+
+        startAdvertisingServer();
+
+        PolarTable.parsePolarFile(getClass().getResourceAsStream("/config/acc_polars.csv"));
+        GameState.addMessageEventListener(this::broadcastMessage);
         terminated = false;
         thread = new Thread(this, "MainServer");
+        startUpdatingWind();
+        startSpawningTokens();
         thread.start();
     }
 
-    private void startServer() {
-        PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
-        MessageFactory.updateXMLGenerator(raceXMLData, regattaXMLData);
-        GameState.setRace(raceXMLData);
-        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
-        startAdvertisingServer();
-        GameState.addMessageEventListener(this::broadcastMessage);
-        sendSetupMessages();
-    }
 
     public void run() {
 
         new HeartbeatThread(this);
         new ServerListenThread(serverSocket, this);
 
-        hasStarted = true;
-
         //You should handle interrupts in some way, so that the thread won't keep on forever if you exit the app.
         while (!terminated) {
             if (GameState.getPlayerHasLeftFlag()) {
@@ -122,8 +133,9 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             } catch (InterruptedException e) {
                 logger.trace("Interrupted exception in Main Server Thread thread sleep", 1);
             }
-            if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState.getCustomizationFlag()) {
-                MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+            if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState
+                .getCustomizationFlag()) {
+                // TODO: 16/08/17 ajm412: This can probably be done in a nicer way via those fancy functional interfaces.
                 sendSetupMessages();
                 GameState.resetCustomizationFlag();
             }
@@ -149,11 +161,9 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             }
         }
         try {
-            synchronized (this){
             for (ServerToClientThread serverToClientThread : serverToClientThreads) {
                 serverToClientThread.terminate();
             }
-            }
             serverSocket.close();
         } catch (IOException e) {
             System.out.println("IO error in server thread handler upon closing socket");
@@ -167,7 +177,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     }
 
     private void sendSetupMessages() {
-        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
         broadcastMessage(MessageFactory.getRaceXML());
         broadcastMessage(MessageFactory.getRegattaXML());
         broadcastMessage(MessageFactory.getBoatXML());
@@ -179,6 +188,63 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         }
     }
 
+    private static void updateWind(){
+        Integer direction = GameState.getWindDirection().intValue();
+        Integer windSpeed = GameState.getWindSpeedMMS().intValue();
+
+        Random random = new Random();
+
+        if (Math.floorMod(random.nextInt(), 2) == 0){
+            direction += random.nextInt(4);
+            windSpeed += random.nextInt(20) + 50;
+        }
+        else{
+            direction -= random.nextInt(4);
+            windSpeed -= random.nextInt(20) + 50;
+        }
+
+        direction = Math.floorMod(direction, 360);
+
+        if (windSpeed > MAX_WIND_SPEED){
+            windSpeed -= random.nextInt(1000);
+        }
+
+        if (windSpeed <= MIN_WIND_SPEED){
+            windSpeed += random.nextInt(1000);
+        }
+
+        GameState.setWindSpeed(Double.valueOf(windSpeed));
+        GameState.setWindDirection(direction.doubleValue());
+    }
+
+
+
+
+    // TODO: 29/08/17 wmu16 - This sort of update should be in game state
+    private static void startUpdatingWind(){
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                updateWind();
+            }
+        }, 0, 500);
+    }
+
+    /**
+     * Start spawning coins every 60s after the first minute
+     */
+    private void startSpawningTokens() {
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                GameState.spawnNewToken();
+                broadcastMessage(MessageFactory.getRaceXML());
+            }
+        }, 10000, 60000);
+    }
+
     /**
      * A client has tried to connect to the server
      *
@@ -189,43 +255,16 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         logger.debug("Player Connected From " + serverToClientThread.getThread().getName(), 0);
         if (serverToClientThreads.size() == 0) { //Sets first client as host.
             serverToClientThread.setAsHost();
-            serverToClientThread.raceXMLProperty().addListener((obs, oldVal, race) -> {
-                if (race != null) {
-                    raceXMLData = race;
-                }
-                if (regattaXMLData != null) {
-                    startServer();
-                }
-            });
-            serverToClientThread.regattaXMLProperty().addListener((obs, oldVal, regatta) -> {
-                if (regatta != null) {
-                    regattaXMLData = regatta;
-                }
-                if (raceXMLData != null) {
-                    startServer();
-                }
-            });
-        } else {
-            //serverToClientThread.addConnectionListener(this::sendSetupMessages);
         }
         serverToClientThreads.add(serverToClientThread);
+        serverToClientThread.addConnectionListener(this::sendSetupMessages);
+        serverToClientThread.addDisconnectListener(this::clientDisconnected);
 
         try {
             ServerAdvertiser.getInstance().setNumberOfPlayers(GameState.getNumberOfPlayers());
         } catch (IOException e) {
             logger.warn("Couldn't update advertisement");
         }
-
-        while (regattaXMLData == null && raceXMLData == null){
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-        }
-        serverToClientThread.addConnectionListener(this::sendSetupMessages);
-        serverToClientThread.addDisconnectListener(this::clientDisconnected);
     }
 
     /**
@@ -246,7 +285,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 serverToClientThread.sendSetupMessages();
             }
         }
-
         serverToClientThreads.remove(closedConnection);
 
         try {
@@ -280,9 +318,9 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         }, 0, 500);
 
 
-//        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
-//            sendSetupMessages();
-//        }
+        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+            sendSetupMessages();
+        }
     }
 
     public void terminate() {
@@ -293,170 +331,39 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
      * Initialise boats to specific spaced out geopoints behind starting line.
      */
     private void initialiseBoatPositions() {
-//        CompoundMark cm = GameState.getMarkOrder().getMarkOrder().get(0);
-//        GeoPoint startMark1 = cm.getSubMark(1);
-//        GeoPoint startMark2 = cm.getSubMark(2);
-//
-//        // Calculating midpoint
-//        Double perpendicularAngle = GeoUtility.getBearing(startMark1, startMark2);
-//        Double length = GeoUtility.getDistance(startMark1, startMark2);
-//        GeoPoint midpoint = GeoUtility.getGeoCoordinate(startMark1, perpendicularAngle, length / 2);
-//
-//        // Setting each boats position side by side
-//        final double SEPARATION = 50.0;  // distance apart in meters
-//
-//        int boatIndex = 0;
-//        for (ServerYacht yacht : GameState.getYachts().values()) {
-//            int distanceApart = boatIndex / 2;
-//
-//            if (boatIndex % 2 == 1 && boatIndex != 0) {
-//                distanceApart++;
-//                distanceApart *= -1;
-//            }
-//
-//            GeoPoint spawnMark = GeoUtility
-//                .getGeoCoordinate(midpoint, perpendicularAngle, distanceApart * SEPARATION);
-//
-//            if (yacht.getHeading() < perpendicularAngle) {
-//                spawnMark = GeoUtility
-//                    .getGeoCoordinate(spawnMark, perpendicularAngle + 90, SEPARATION);
-//            } else {
-//                spawnMark = GeoUtility
-//                    .getGeoCoordinate(spawnMark, perpendicularAngle + 270, SEPARATION);
-//            }
-//
-//            yacht.setLocation(spawnMark);
-//            boatIndex++;
-//        }
+        CompoundMark cm = GameState.getMarkOrder().getMarkOrder().get(0);
+        GeoPoint startMark1 = cm.getSubMark(1);
+        GeoPoint startMark2 = cm.getSubMark(2);
 
-//        final double SEPARATION = 50.0;  // distance apart in meters
-//
-//        //Reverse of the angle from start to first mark
-//        double angleToFirstMark = 360 - GeoUtility.getBearing(
-//            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
-//            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
-//        );
-//
-//        //Length of start line
-//        double startLineLength = GeoUtility.getDistance(
-//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
-//        );
-//
-//        //Angle of start line
-//        double startMarkToMarkAngle = GeoUtility.getBearing(
-//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
-//        );
-//
-//        //How many yachts can fit along the start line
-//        int spacesAlongLine = (int) Math.round(startLineLength / SEPARATION);
-//        //The free space left by the boats.
-//        double buffer = (startLineLength % SEPARATION) / 2;
-//
-//        //Randomize starting order.
-//        List<ServerYacht> serverYachtList = new ArrayList<>(GameState.getYachts().values());
-//        Collections.shuffle(serverYachtList);
-//
-//        //set the starting point away from start line.
-//        GeoPoint startingPoint = GeoUtility.getGeoCoordinate(
-//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-//            angleToFirstMark, SEPARATION
-//        );
-//
-//        //Move it along the start line
-//        startingPoint = GeoUtility.getGeoCoordinate(
-//            startingPoint, startMarkToMarkAngle, buffer
-//        );
-//
-//        int yachtCount = 0;
-//        int repeats = 0;
-//
-//        GeoPoint yachtLocation;
-//
-//        for (ServerYacht serverYacht : serverYachtList) {
-//
-//            //Move away from start line
-//            yachtLocation = GeoUtility.getGeoCoordinate(
-//                startingPoint, angleToFirstMark,repeats * SEPARATION
-//            );
-//            //Move along start line
-//            yachtLocation = GeoUtility.getGeoCoordinate(
-//                yachtLocation, startMarkToMarkAngle, yachtCount * SEPARATION
-//            );
-//            serverYacht.setLocation(yachtLocation);
-//            serverYacht.setHeading(GeoUtility.getBearing(
-//                yachtLocation, GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
-//            ));
-//            //Set location for next yacht
-//            yachtCount++;
-//            if (yachtCount > spacesAlongLine) {
-//                yachtCount = 0;
-//                repeats++;
-//            }
-//        }
+        // Calculating midpoint
+        Double perpendicularAngle = GeoUtility.getBearing(startMark1, startMark2);
+        Double length = GeoUtility.getDistance(startMark1, startMark2);
+        GeoPoint midpoint = GeoUtility.getGeoCoordinate(startMark1, perpendicularAngle, length / 2);
 
-        final double DISTANCE_TO_START = 75d;
-        final double YACHT_SEPARATION = 20d;
+        // Setting each boats position side by side
+        double DISTANCE_FACTOR = 50.0;  // distance apart in meters
+        int boatIndex = 0;
+        for (ServerYacht yacht : GameState.getYachts().values()) {
+            int distanceApart = boatIndex / 2;
 
-        //Length of start line
-        double startLineLength = GeoUtility.getDistance(
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
-        );
-
-        //How many yachts can fit along the start line
-        int spacesAlongLine = (int) Math.round(startLineLength / YACHT_SEPARATION);
-
-        //Angle of start line
-        double startMarkToMarkAngle = GeoUtility.getBearing(
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
-            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
-        );
-
-        //angle from first mark to the start
-        double angleToStart = GeoUtility.getBearing(
-            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint(),
-            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint()
-        );
-
-        double angleFromStart = GeoUtility.getBearing(
-            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
-            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
-        );
-
-        GeoPoint startingPoint = GeoUtility.getGeoCoordinate(
-            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
-            angleToStart, DISTANCE_TO_START
-        );
-
-        List<ServerYacht> randomisedYachts = new ArrayList<>(GameState.getYachts().values());
-        Collections.shuffle(randomisedYachts);
-        while (randomisedYachts.size() > 0) {
-
-            int numYachtsInLine = spacesAlongLine > randomisedYachts.size() ? randomisedYachts.size() : spacesAlongLine;
-            double yachtSpace = numYachtsInLine * YACHT_SEPARATION / 2;
-
-            GeoPoint firstYachtPoint = GeoUtility.getGeoCoordinate(
-                startingPoint, startMarkToMarkAngle + 180, yachtSpace
-            );
-
-            for (int i=0; i<numYachtsInLine; i++){
-                randomisedYachts.get(0).setHeading(angleFromStart);
-                randomisedYachts.get(0).setLocation(firstYachtPoint);
-                firstYachtPoint = GeoUtility.getGeoCoordinate(
-                    firstYachtPoint, startMarkToMarkAngle, yachtSpace
-                );
-                randomisedYachts.remove(0);
+            if (boatIndex % 2 == 1 && boatIndex != 0) {
+                distanceApart++;
+                distanceApart *= -1;
             }
 
-            startingPoint = GeoUtility.getGeoCoordinate(
-                startingPoint, angleToStart, DISTANCE_TO_START
-            );
-        }
+            GeoPoint spawnMark = GeoUtility
+                .getGeoCoordinate(midpoint, perpendicularAngle, distanceApart * DISTANCE_FACTOR);
+
+            if (yacht.getHeading() < perpendicularAngle) {
+                spawnMark = GeoUtility
+                    .getGeoCoordinate(spawnMark, perpendicularAngle + 90, DISTANCE_FACTOR);
+            } else {
+                spawnMark = GeoUtility
+                    .getGeoCoordinate(spawnMark, perpendicularAngle + 270, DISTANCE_FACTOR);
             }
 
-    public boolean hasStarted() {
-        return hasStarted;
+            yacht.setLocation(spawnMark);
+            boatIndex++;
+        }
     }
 }

src/main/java/seng302/gameServer/MessageFactory.java

@@ -1,11 +1,9 @@
 package seng302.gameServer;
 
-import seng302.gameServer.messages.*;
 import java.util.ArrayList;
 import java.util.List;
 import seng302.gameServer.messages.BoatLocationMessage;
 import seng302.gameServer.messages.BoatSubMessage;
-import seng302.gameServer.messages.ChatterMessage;
 import seng302.gameServer.messages.RaceStartNotificationType;
 import seng302.gameServer.messages.RaceStartStatusMessage;
 import seng302.gameServer.messages.RaceStatus;
@@ -13,21 +11,13 @@ import seng302.gameServer.messages.RaceStatusMessage;
 import seng302.gameServer.messages.RaceType;
 import seng302.gameServer.messages.XMLMessage;
 import seng302.gameServer.messages.XMLMessageSubType;
-import seng302.gameServer.messages.YachtEventCodeMessage;
-import seng302.gameServer.messages.YachtEventType;
 import seng302.model.Player;
 import seng302.model.ServerYacht;
 import seng302.model.stream.xml.generator.RaceXMLTemplate;
 import seng302.model.stream.xml.generator.RegattaXMLTemplate;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.model.token.Token;
-import seng302.model.token.TokenType;
 import seng302.utilities.XMLGenerator;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A Class for interfacing between the data we have in the GameState to the messages we need to send
  * through the MainServerThread.
@@ -45,51 +35,6 @@ Ideally this class would be created with an instance of the GameState (I tried i
 public class MessageFactory {
 
     private static XMLGenerator xmlGenerator = new XMLGenerator();
-    private static XMLMessage race;
-    private static XMLMessage regatta;
-    private static XMLMessage boats;
-
-    public static void updateXMLGenerator(RaceXMLData race, RegattaXMLData regatta) {
-        xmlGenerator.setRegattaTemplate(
-            new RegattaXMLTemplate(
-                regatta.getRegattaName(),
-                regatta.getCourseName(),
-                regatta.getCentralLat(),
-                regatta.getCentralLng()
-            )
-        );
-        xmlGenerator.setRaceTemplate(
-            new RaceXMLTemplate(
-                new ArrayList<>(),
-                new ArrayList<>(),
-                race.getMarkSequence(),
-                race.getCourseLimit(),
-                new ArrayList<>(race.getCompoundMarks().values()),
-                GameState.getCapacity(), true
-            )
-        );
-        String xmlStr = xmlGenerator.getRaceAsXml();
-        MessageFactory.race = new XMLMessage(xmlStr, XMLMessageSubType.RACE, xmlStr.length());
-        xmlStr = xmlGenerator.getRegattaAsXml();
-        MessageFactory.regatta = new XMLMessage(xmlStr, XMLMessageSubType.REGATTA, xmlStr.length());
-        xmlStr = xmlGenerator.getBoatsAsXml();
-        MessageFactory.boats = new XMLMessage(xmlStr, XMLMessageSubType.BOAT, xmlStr.length());
-    }
-
-    public static void updateBoats(List<ServerYacht> yachts) {
-//        for (ServerYacht serverYacht : yachts) {
-//            System.out.println(serverYacht);
-//        }
-        xmlGenerator.getRace().setBoats(yachts);
-        String xmlStr = xmlGenerator.getBoatsAsXml();
-        MessageFactory.boats = new XMLMessage(xmlStr, XMLMessageSubType.BOAT, xmlStr.length());
-    }
-
-    public static void updateTokens(List<Token> tokens) {
-        xmlGenerator.getRace().setTokens(tokens);
-        String xmlStr = xmlGenerator.getRaceAsXml();
-        MessageFactory.race = new XMLMessage(xmlStr, XMLMessageSubType.RACE, xmlStr.length());
-    }
 
 
     public static RaceStartStatusMessage getRaceStartStatusMessage() {
@@ -150,83 +95,37 @@ public class MessageFactory {
     }
 
     public static XMLMessage getRaceXML() {
-        return race;
+        List<ServerYacht> yachts = new ArrayList<>(GameState.getYachts().values());
+        List<Token> tokens = GameState.getTokensInPlay();
+        RaceXMLTemplate raceXMLTemplate = new RaceXMLTemplate(yachts, tokens);
+        xmlGenerator.setRaceTemplate(raceXMLTemplate);
+
+        XMLMessage raceXMLMessage = new XMLMessage(
+            xmlGenerator.getRaceAsXml(),
+            XMLMessageSubType.RACE,
+            xmlGenerator.getRaceAsXml().length());
+
+        return raceXMLMessage;
     }
 
     public static XMLMessage getRegattaXML() {
-       return regatta;
+        //@TODO calculate lat/lng values
+
+        return new XMLMessage(
+            xmlGenerator.getRegattaAsXml(),
+            XMLMessageSubType.REGATTA,
+            xmlGenerator.getRegattaAsXml().length());
     }
 
     public static XMLMessage getBoatXML() {
-        return boats;
-    }
+        List<ServerYacht> yachts = new ArrayList<>(GameState.getYachts().values());
+        List<Token> tokens = GameState.getTokensInPlay();
+        RaceXMLTemplate raceXMLTemplate = new RaceXMLTemplate(yachts, tokens);
+        xmlGenerator.setRaceTemplate(raceXMLTemplate);
 
-    public static YachtEventCodeMessage makeCollisionMessage(ServerYacht serverYacht) {
-        return new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION);
-    }
-
-
-    /**
-     * Constructs a message to be sent out whenever a yacht picks up a boost
-     *
-     * @param serverYacht The yacht that has picked up a power up
-     * @param token The token which they picked up
-     * @return The corresponding YachtEventCodeMessage
-     */
-    public static YachtEventCodeMessage makePickupMessage(ServerYacht serverYacht, Token token) {
-        YachtEventType yachtEventType = null;
-        switch (token.getTokenType()) {
-            case BOOST:
-                yachtEventType = YachtEventType.TOKEN_VELOCITY;
-                break;
-            case HANDLING:
-                yachtEventType = YachtEventType.TOKEN_HANDLING;
-                break;
-            case WIND_WALKER:
-                yachtEventType = YachtEventType.TOKEN_WIND_WALKER;
-                break;
-            case BUMPER:
-                yachtEventType = YachtEventType.TOKEN_BUMPER;
-                break;
-            case RANDOM:
-                yachtEventType = YachtEventType.TOKEN_RANDOM;
-                break;
-        }
-        return new YachtEventCodeMessage(serverYacht.getSourceId(), yachtEventType);
-    }
-
-    /**
-     * Constructs a message representing a certain buff / debuff for a given yacht. For now this is
-     * just for the bumper debuff so the affected boat is aware that it has been crashed. This could
-     * however be extended to render affects for all boats given a certain debuff.
-     *
-     * @param yacht The yacht affected by some status
-     * @param token The token indicating what status they have
-     * @return A YachtEventCodeMessage
-     */
-    public static YachtEventCodeMessage makeStatusEffectMessage(ServerYacht yacht,
-        TokenType token) {
-        YachtEventType yachtEventType = null;
-        switch (token) {
-            case BUMPER:
-                yachtEventType = YachtEventType.BUMPER_CRASH;
-                break;
-        }
-        return new YachtEventCodeMessage(yacht.getSourceId(), yachtEventType);
-    }
-
-
-    /**
-     * Constructs a message to be sent out when a given yacht powers down (From a boost of any type)
-     *
-     * @param yacht The yacht that is powering down
-     * @return A YachtEventCodeMessage representing this action
-     */
-    public static YachtEventCodeMessage makePowerDownMessage(ServerYacht yacht) {
-        return new YachtEventCodeMessage(yacht.getSourceId(), YachtEventType.POWER_DOWN);
-    }
-
-    public static ChatterMessage makeChatterMessage(Integer messageType, String message) {
-        return new ChatterMessage(messageType, "SERVER: " + message);
+        return new XMLMessage(
+            xmlGenerator.getBoatsAsXml(),
+            XMLMessageSubType.BOAT,
+            xmlGenerator.getBoatsAsXml().length());
     }
 }

src/main/java/seng302/gameServer/ServerAdvertiser.java

@@ -1,10 +1,5 @@
 package seng302.gameServer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.DiscoveryServerClient;
-import seng302.discoveryServer.util.ServerListing;
-
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceInfo;
 import java.io.IOException;
@@ -37,16 +32,12 @@ public class ServerAdvertiser {
     private static ServerAdvertiser instance = null;
     private static JmDNS jmdnsInstance = null;
     private ServiceInfo serviceInfo; // Note: Whenever this is changed, our service will be re-registered on the network.
-    private DiscoveryServerClient repositoryClient;
 
     private Hashtable<String ,String> props;
-    private Logger logger = LoggerFactory.getLogger(ServerAdvertiser.class);
 
     private ServerAdvertiser() throws IOException{
         jmdnsInstance = JmDNS.create(InetAddress.getByName(getLocalHostIp()));
 
-        repositoryClient = new DiscoveryServerClient();
-
         props = new Hashtable<>();
         props.put("map", "");
         props.put("spacesLeft", "0");
@@ -131,13 +122,10 @@ public class ServerAdvertiser {
                     try {
                         jmdnsInstance.registerService(serviceInfo);
                     } catch (IOException e) {
-                        logger.warn("Failed to register service info");
+                        System.out.println("Failed");
                     }
                 }
             }, 0);
-
-        ServerListing serverListing = new ServerListing(serverName, props.get("map"), new DiscoveryServerClient().getInetIp(), portNo, Integer.parseInt(props.get("capacity")));
-        repositoryClient.register(serverListing);
     }
 
     /**

src/main/java/seng302/gameServer/ServerDescription.java

@@ -7,10 +7,6 @@ public class ServerDescription {
     private String serverName;
     private String mapName;
     private Integer numPlayers;
-    private Long lastUpdated;
-    private Long lastRefreshed;
-
-    private static Long EXPIRY_INTERVAL = 5000L;
 
     public ServerDescription(String serverName, String mapName, Integer numPlayers, Integer capacity, String address, Integer portNum){
         this.serverName = serverName;
@@ -19,7 +15,6 @@ public class ServerDescription {
         this.address = address;
         this.portNum = portNum;
         this.capacity = capacity;
-        lastUpdated = System.currentTimeMillis();
     }
 
 
@@ -85,17 +80,4 @@ public class ServerDescription {
         return this.getName().hashCode() + this.getAddress().hashCode() +
                 this.portNumber().hashCode() + this.getMapName().hashCode();
     }
-
-    public Boolean hasExpired(){
-        return System.currentTimeMillis() - lastUpdated > EXPIRY_INTERVAL;
-    }
-
-    public Boolean serverShouldBeRemoved() {
-        if (lastRefreshed == null) return false;
-        return System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL;
-    }
-
-    public void hasBeenRefreshed(){
-        lastRefreshed = System.currentTimeMillis();
-    }
 }

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -1,11 +1,23 @@
 package seng302.gameServer;
 
 
-import javafx.beans.property.SimpleObjectProperty;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.*;
-import org.w3c.dom.Document;
 import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.ChatterMessage;
 import seng302.gameServer.messages.ClientType;
@@ -13,28 +25,14 @@ import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RegistrationResponseMessage;
 import seng302.gameServer.messages.RegistrationResponseStatus;
+import seng302.gameServer.messages.XMLMessage;
+import seng302.gameServer.messages.XMLMessageSubType;
 import seng302.model.Player;
 import seng302.model.ServerYacht;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.utilities.StreamParser;
+import seng302.model.stream.xml.generator.RaceXMLTemplate;
 import seng302.utilities.XMLGenerator;
-import seng302.utilities.XMLParser;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.zip.CRC32;
-import java.util.zip.Checksum;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -79,11 +77,9 @@ public class ServerToClientThread implements Runnable {
     private List<ConnectionListener> connectionListeners = new ArrayList<>();
     private DisconnectListener disconnectListener;
 
+    private ServerYacht yacht;
     private Player player;
 
-    private SimpleObjectProperty<RaceXMLData> raceXMLProperty = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<RegattaXMLData> regattaXMLProperty = new SimpleObjectProperty<>();
-
     public ServerToClientThread(Socket socket) {
         this.socket = socket;
         seqNo = 0;
@@ -104,11 +100,33 @@ public class ServerToClientThread implements Runnable {
     }
 
     private void setUpPlayer(){
-        String shortName = "P" + sourceId;
-        String longName = "Player " + sourceId;
+        BufferedReader fn;
+        String fName = "";
+        BufferedReader ln;
+        String lName = "";
+
+        fn = new BufferedReader(
+                new InputStreamReader(
+                        ServerToClientThread.class.getResourceAsStream(
+                                "/server_config/CSV_Database_of_First_Names.csv"
+                        )
+                )
+        );
+        List<String> all = fn.lines().collect(Collectors.toList());
+        fName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
+        ln = new BufferedReader(
+                new InputStreamReader(
+                        ServerToClientThread.class.getResourceAsStream(
+                                "/server_config/CSV_Database_of_Last_Names.csv"
+                        )
+                )
+        );
+        all = ln.lines().collect(Collectors.toList());
+        lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
 
         ServerYacht yacht = new ServerYacht(
-            BoatMeshType.DINGHY, sourceId, sourceId.toString(), shortName, longName, "NZ");
+                "Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
+        );
 
         player = new Player(socket, yacht);
         GameState.addYacht(sourceId, yacht);
@@ -167,52 +185,37 @@ public class ServerToClientThread implements Runnable {
                     long computedCrc = checksum.getValue();
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
-                        StreamPacket packet = new StreamPacket(type, payloadLength, timeStamp, payload);
                         switch (PacketType.assignPacketType(type, payload)) {
                             case BOAT_ACTION:
-                                BoatAction actionType = ServerPacketParser.extractBoatAction(packet);
+                                BoatAction actionType = ServerPacketParser
+                                        .extractBoatAction(
+                                                new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.updateBoat(sourceId, actionType);
                                 break;
 
                             case RACE_REGISTRATION_REQUEST:
-                                ClientType requestedType = ServerPacketParser
-                                    .extractClientType(packet);
+                                ClientType requestedType = ServerPacketParser.extractClientType(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
+
                                 completeRegistration(requestedType);
                                 break;
                             case CHATTER_TEXT:
                                 ChatterMessage chatterMessage = ServerPacketParser
-                                    .extractChatterText(packet);
+                                    .extractChatterText(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.processChatter(chatterMessage, isHost);
                                 break;
                             case RACE_CUSTOMIZATION_REQUEST:
-                                Long sourceID = Message.bytesToLong(
-                                    Arrays.copyOfRange(payload, 0, 3)
-                                );
+                                Long sourceID = Message
+                                    .bytesToLong(Arrays.copyOfRange(payload, 0, 3));
                                 CustomizeRequestType requestType = ServerPacketParser
-                                    .extractCustomizationType(packet);
-
+                                    .extractCustomizationType(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.customizePlayer(sourceID, requestType,
-                                    Arrays.copyOfRange(payload, 6, payload.length)
-                                );
+                                    Arrays.copyOfRange(payload, 6, payload.length));
                                 GameState.setCustomizationFlag();
                                 // TODO: 17/08/2017 ajm412: Send a response packet here, not really necessary until we do shapes.
                                 break;
-                            case RACE_XML:
-                                Document document = StreamParser.extractXmlMessage(packet);
-                                raceXMLProperty.set(
-                                    XMLParser.parseRace(document)
-                                );
-                                GameState.setMaxPlayers(XMLParser.getMaxPlayers(document));
-                                GameState.setTokensEnabled(XMLParser.tokensEnabled(document));
-                                break;
-                            case REGATTA_XML:
-                                regattaXMLProperty.set(
-                                    XMLParser.parseRegatta(
-                                        StreamParser.extractXmlMessage(packet)
-                                    )
-                                );
-                                break;
-
                         }
                     } else {
                         logger.warn("Packet has been dropped", 1);
@@ -229,9 +232,25 @@ public class ServerToClientThread implements Runnable {
     }
 
     public void sendSetupMessages() {
-        sendMessage(MessageFactory.getRegattaXML());
-        sendMessage(MessageFactory.getBoatXML());
-        sendMessage(MessageFactory.getRaceXML());
+        xmlGenerator = new XMLGenerator();
+        RaceXMLTemplate race = new RaceXMLTemplate(new ArrayList<>(GameState.getYachts().values()), new ArrayList<>());
+
+        xmlGenerator.setRaceTemplate(race);
+
+        System.out.println(xmlGenerator.getRegatta().getName());
+
+        XMLMessage xmlMessage;
+        xmlMessage = new XMLMessage(xmlGenerator.getRegattaAsXml(), XMLMessageSubType.REGATTA,
+                xmlGenerator.getRegattaAsXml().length());
+        sendMessage(xmlMessage);
+
+        xmlMessage = new XMLMessage(xmlGenerator.getBoatsAsXml(), XMLMessageSubType.BOAT,
+                xmlGenerator.getBoatsAsXml().length());
+        sendMessage(xmlMessage);
+
+        xmlMessage = new XMLMessage(xmlGenerator.getRaceAsXml(), XMLMessageSubType.RACE,
+                xmlGenerator.getRaceAsXml().length());
+        sendMessage(xmlMessage);
     }
 
     private void closeSocket() {
@@ -300,6 +319,10 @@ public class ServerToClientThread implements Runnable {
         return socket;
     }
 
+    public ServerYacht getYacht() {
+        return yacht;
+    }
+
     public void addConnectionListener(ConnectionListener listener) {
         connectionListeners.add(listener);
     }
@@ -323,12 +346,4 @@ public class ServerToClientThread implements Runnable {
     public void setAsHost() {
         isHost = true;
     }
-
-    public SimpleObjectProperty<RaceXMLData> raceXMLProperty() {
-        return raceXMLProperty;
-    }
-
-    public SimpleObjectProperty<RegattaXMLData> regattaXMLProperty() {
-        return regattaXMLProperty;
-    }
 }

src/main/java/seng302/gameServer/messages/BoatAction.java

@@ -14,9 +14,7 @@ public enum BoatAction {
     TACK_GYBE(4),
     UPWIND(5),
     DOWNWIND(6),
-    MAINTAIN_HEADING(7),
-    CONTINUOUSLY_TURNING(8),
-    DEFAULT_TURNING(9);
+    MAINTAIN_HEADING(7);
 
     private final int type;
     private static final Map<Integer, BoatAction> intToTypeMap = new HashMap<>();

src/main/java/seng302/gameServer/messages/BoatActionMessage.java

@@ -5,19 +5,19 @@ package seng302.gameServer.messages;
  */
 public class BoatActionMessage extends Message{
     private final MessageType MESSAGE_TYPE = MessageType.BOAT_ACTION;
-    private final int MESSAGE_SIZE = 5;
+    private final int MESSAGE_SIZE = 1;
     private BoatAction actionType;
 
-    public BoatActionMessage(BoatAction actionType, int sourceId) {
+    public BoatActionMessage(BoatAction actionType) {
         this.actionType = actionType;
-        setHeader(new Header(MessageType.BOAT_ACTION, sourceId, (short) MESSAGE_SIZE)); // the second variable is the source id
+        setHeader(new Header(MessageType.BOAT_ACTION, 0, (short) 1)); // the second variable is the source id
         allocateBuffer();
         writeHeaderToBuffer();
         // Write message fields
         putInt(actionType.getValue(), 1);
-        putInt(sourceId, 4);
         writeCRC();
         rewind();
+
     }
 
     @Override

src/main/java/seng302/gameServer/messages/ChatterMessage.java

@@ -40,7 +40,7 @@ public class ChatterMessage extends Message {
         return message;
     }
 
-    public int getMessageType() {
+    public int getMessage_type() {
         return message_type;
     }
 }

src/main/java/seng302/gameServer/messages/Message.java

@@ -158,13 +158,7 @@ public abstract class Message {
      * @return The current buffer as a byte array
      */
     public byte[] getBuffer(){
-        byte[] bytes = buffer.array();
-
-//        buffer.reset();
-//        buffer.clear();
-//        buffer = null;
-
-        return bytes;
+        return buffer.array();
     }
 
     /**

src/main/java/seng302/gameServer/messages/MessageType.java

@@ -21,10 +21,7 @@ public enum MessageType {
     REGISTRATION_REQUEST(101),
     REGISTRATION_RESPONSE(102),
     CUSTOMIZATION_REQUEST(103),
-    CUSTOMIZATION_RESPONSE(104),
-    REPO_REGISTRATION_REQUEST(201),
-    ROOM_CODE_REQUEST(202),
-    LOBBY_REQUEST(203);
+    CUSTOMIZATION_RESPONSE(104);
 
 
     private int code;

src/main/java/seng302/gameServer/messages/RegistrationRequestMessage.java

@@ -4,8 +4,8 @@ package seng302.gameServer.messages;
 public class RegistrationRequestMessage extends Message {
     private static int MESSAGE_LENGTH = 2;
 
-    public RegistrationRequestMessage(ClientType type, int clientID){
-        setHeader(new Header(MessageType.REGISTRATION_REQUEST, clientID, (short) getSize()));
+    public RegistrationRequestMessage(ClientType type){
+        setHeader(new Header(MessageType.REGISTRATION_REQUEST, 1, (short) getSize()));
 
         allocateBuffer();
         writeHeaderToBuffer();

src/main/java/seng302/gameServer/messages/RoomCodeRequest.java

@@ -1,24 +0,0 @@
-package seng302.gameServer.messages;
-
-public class RoomCodeRequest extends Message{
-    private int size = 0;
-
-    @Override
-    public int getSize() {
-        return size;
-    }
-
-    public RoomCodeRequest(String roomCode){
-        size = roomCode.length() + 6;
-
-        setHeader(new Header(MessageType.ROOM_CODE_REQUEST, 0x01, (short)getSize()));
-        allocateBuffer();
-        writeHeaderToBuffer();
-
-        putInt(roomCode.length(), 6);
-        putBytes(roomCode.getBytes());
-
-        writeCRC();
-        rewind();
-    }
-}

src/main/java/seng302/gameServer/messages/ServerRegistrationMessage.java

@@ -1,64 +0,0 @@
-package seng302.gameServer.messages;
-
-import seng302.discoveryServer.util.ServerListing;
-
-public class ServerRegistrationMessage extends Message {
-    private int size;
-
-    public ServerRegistrationMessage(ServerListing serverListing) {
-        String serverName = serverListing.getServerName();
-        String mapName = serverListing.getMapName();
-        String address = serverListing.getAddress();
-        int port = serverListing.getPortNumber();
-        int players = serverListing.getPortNumber();
-        int capacity = serverListing.getCapacity();
-        String roomCode = serverListing.getRoomCode();
-
-        createMessage(serverName, mapName, address, port, players, capacity, roomCode);
-    }
-
-    public static ServerRegistrationMessage getEmptyRegistration() {
-        return new ServerRegistrationMessage("","","",0,0,0,"");
-    }
-
-    @Override
-    public int getSize() {
-        return size;
-    }
-
-    public ServerRegistrationMessage(String serverName, String mapName, String address, int port, int players, int capacity, String roomCode){
-        createMessage(serverName, mapName, address, port, players, capacity, roomCode);
-    }
-
-    private void createMessage(String serverName, String mapName, String address, int port, int players, int capacity, String roomCode){
-        size = serverName.getBytes().length + mapName.length() + address.length() + roomCode.length() + 36;
-
-        setHeader(new Header(MessageType.REPO_REGISTRATION_REQUEST, 0x01, (short) getSize()));
-        allocateBuffer();
-        writeHeaderToBuffer();
-
-        int nameLength = serverName.length();
-        int mapNameLength = mapName.length();
-        int addressLength = address.length();
-        int roomCodeLength = roomCode.length();
-
-        // Put fields here
-        putInt(nameLength, 6);
-        putInt(mapNameLength, 6);
-        putInt(addressLength, 6);
-        putInt(roomCodeLength, 6);
-
-        putInt(port, 4);
-        putInt(players, 4);
-        putInt(capacity, 4);
-
-        putBytes(serverName.getBytes());
-        putBytes(mapName.getBytes());
-        putBytes(address.getBytes());
-        putBytes(roomCode.getBytes());
-
-        writeCRC();
-        rewind();
-    }
-
-}

src/main/java/seng302/gameServer/messages/YachtEventType.java

@@ -1,18 +1,11 @@
 package seng302.gameServer.messages;
 
 /**
- * Enum for different event types for the yacht
+ * Created by wmu16 on 11/09/17.
  */
 public enum YachtEventType {
     COLLISION(33),
-    TOKEN_VELOCITY(34),
-    TOKEN_BUMPER(35),
-    TOKEN_HANDLING(36),
-    TOKEN_WIND_WALKER(37),
-    TOKEN_RANDOM(38),
-    POWER_DOWN(39),
-    BUMPER_CRASH(40);
-
+    TOKEN(34);
 
     private int code;
 

src/main/java/seng302/model/ClientYacht.java

@@ -6,23 +6,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
-import java.util.Timer;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.ReadOnlyLongProperty;
 import javafx.beans.property.ReadOnlyLongWrapper;
-import javafx.beans.value.ObservableObjectValue;
-import javafx.collections.FXCollections;
 import javafx.scene.paint.Color;
-import jdk.nashorn.internal.objects.annotations.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.model.token.TokenType;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
-import seng302.model.token.TokenType;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 /**
  * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
@@ -42,40 +34,19 @@ public class ClientYacht extends Observable {
         void notifyRounding(ClientYacht yacht, int legNumber);
     }
 
-    @FunctionalInterface
-    public interface ColorChangeListener {
-
-        void notifyColorChange(ClientYacht yacht);
-    }
-
-    //This notifies RaceViewController so it can display icon - wmu16
-    @FunctionalInterface
-    public interface PowerUpListener {
-        void notifyPowerUp(ClientYacht yacht, TokenType tokenType);
-    }
-
-    //This notifies RaceViewController so it can remove token icon - wmu16
-    @FunctionalInterface
-    public interface PowerDownListener {
-        void notifyPowerDown(ClientYacht yacht);
-    }
-
-
-
     private Logger logger = LoggerFactory.getLogger(ClientYacht.class);
 
 
-    private BoatMeshType boatType;
+    private String boatType;
     private Integer sourceId;
     private String hullID; //matches HullNum in the XML spec.
     private String shortName;
     private String boatName;
     private String country;
     private Integer position;
-    private TokenType powerUp;
 
     private Long estimateTimeAtFinish;
-    private Boolean sailIn = true;
+    private Boolean sailIn = false;
     private Integer currentMarkSeqID = 0;
     private Long markRoundTime;
     private Long timeTillNext;
@@ -85,24 +56,15 @@ public class ClientYacht extends Observable {
     private Integer boatStatus;
     private Double currentVelocity;
 
-    Timer t;
-
-    private BoatObject boatObject;
-
     private List<YachtLocationListener> locationListeners = new ArrayList<>();
     private List<MarkRoundingListener> markRoundingListeners = new ArrayList<>();
-    private List<PowerUpListener> powerUpListeners = new ArrayList<>();
-    private List<PowerDownListener> powerDownListeners = new ArrayList<>();
-    private List<ColorChangeListener> colorChangeListeners = new ArrayList<>();
-
     private ReadOnlyDoubleWrapper velocityProperty = new ReadOnlyDoubleWrapper();
     private ReadOnlyLongWrapper timeTillNextProperty = new ReadOnlyLongWrapper();
     private ReadOnlyLongWrapper timeSinceLastMarkProperty = new ReadOnlyLongWrapper();
     private ReadOnlyIntegerWrapper placingProperty = new ReadOnlyIntegerWrapper();
-    private ReadOnlyDoubleWrapper headingProperty = new ReadOnlyDoubleWrapper();
     private Color colour;
 
-    public ClientYacht(BoatMeshType boatType, Integer sourceId, String hullID, String shortName,
+    public ClientYacht(String boatType, Integer sourceId, String hullID, String shortName,
         String boatName, String country) {
         this.boatType = boatType;
         this.sourceId = sourceId;
@@ -112,7 +74,6 @@ public class ClientYacht extends Observable {
         this.country = country;
         this.location = new GeoPoint(57.670341, 11.826856);
         this.heading = 120.0;   //In degrees
-        this.headingProperty.set(this.heading);
         this.currentVelocity = 0d;
         this.boatStatus = 1;
         this.colour = Color.rgb(0, 0, 0, 1.0);
@@ -127,7 +88,7 @@ public class ClientYacht extends Observable {
         super.addObserver(o);
     }
 
-    public BoatMeshType getBoatType() {
+    public String getBoatType() {
         return boatType;
     }
 
@@ -238,32 +199,6 @@ public class ClientYacht extends Observable {
         this.position = position;
     }
 
-    /**
-     * Powers down the boat and notifies the raceViewController to display
-     */
-    public void powerDown() {
-        this.powerUp = null;
-        for (PowerDownListener listener : powerDownListeners) {
-            listener.notifyPowerDown(this);
-        }
-    }
-
-    /**
-     * powers up the boat and notifies the raceViewController to display
-     *
-     * @param tokenType The type of token that this boat is being powered up with
-     */
-    public void setPowerUp(TokenType tokenType) {
-        this.powerUp = tokenType;
-        for (PowerUpListener listener : powerUpListeners) {
-            listener.notifyPowerUp(this, tokenType);
-        }
-    }
-
-    public TokenType getPowerUp() {
-        return powerUp;
-    }
-
     public void toggleSail() {
         sailIn = !sailIn;
     }
@@ -286,7 +221,6 @@ public class ClientYacht extends Observable {
 
     public void setHeading(Double heading) {
         this.heading = heading;
-        setHeadingProperty();
     }
 
     @Override
@@ -313,15 +247,12 @@ public class ClientYacht extends Observable {
 
     public void setColour(Color colour) {
         this.colour = colour;
-        for (ColorChangeListener listener : colorChangeListeners) {
-            listener.notifyColorChange(this);
-        }
     }
 
+
     public void updateLocation(double lat, double lng, double heading, double velocity) {
         setLocation(lat, lng);
         this.heading = heading;
-        setHeadingProperty();
         this.currentVelocity = velocity;
         updateVelocityProperty(velocity);
         for (YachtLocationListener yll : locationListeners) {
@@ -329,10 +260,6 @@ public class ClientYacht extends Observable {
         }
     }
 
-    private void setHeadingProperty() {
-        headingProperty.set(heading);
-    }
-
     public void addLocationListener(YachtLocationListener listener) {
         locationListeners.add(listener);
     }
@@ -341,18 +268,6 @@ public class ClientYacht extends Observable {
         markRoundingListeners.add(listener);
     }
 
-    public void addPowerUpListener(PowerUpListener listener) {
-        powerUpListeners.add(listener);
-    }
-
-    public void addPowerDownListener(PowerDownListener listener) {
-        powerDownListeners.add(listener);
-    }
-
-    public void addColorChangeListener(ColorChangeListener listener) {
-        colorChangeListeners.add(listener);
-    }
-
     public void removeMarkRoundingListener(MarkRoundingListener listener) {
         markRoundingListeners.remove(listener);
     }
@@ -373,17 +288,4 @@ public class ClientYacht extends Observable {
     public Double getCurrentVelocity() {
         return currentVelocity;
     }
-
-    public void setBoatObject(BoatObject newBoatObject) {
-        this.boatObject = newBoatObject;
-    }
-
-    public BoatObject getBoatObject() {
-        return this.boatObject;
-    }
-
-    public ReadOnlyDoubleWrapper getHeadingProperty() {
-        return headingProperty;
-    }
-
 }

src/main/java/seng302/model/GameKeyBind.java

@@ -1,87 +0,0 @@
-package seng302.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import javafx.scene.input.KeyCode;
-
-public class GameKeyBind {
-
-    private static GameKeyBind instance;
-    private Map<KeyCode, KeyAction> keyToActionMap;
-    private Map<KeyAction, KeyCode> actionToKeyMap;
-    private Boolean continuouslyTurning;
-
-
-    private GameKeyBind() {
-        setToDefault();
-    }
-
-    public void setToDefault() {
-        actionToKeyMap = new HashMap<>();
-        keyToActionMap = new HashMap<>();
-        continuouslyTurning = false;
-        // default key bindings
-        ArrayList<KeyCode> keys = new ArrayList<>();
-        keys.add(KeyCode.Z);
-        keys.add(KeyCode.X);
-        keys.add(KeyCode.SPACE);
-        keys.add(KeyCode.SHIFT);
-        keys.add(KeyCode.ENTER);
-        keys.add(KeyCode.PAGE_UP);
-        keys.add(KeyCode.PAGE_DOWN);
-        keys.add(KeyCode.F1);
-        keys.add(KeyCode.D);
-        keys.add(KeyCode.A);
-        keys.add(KeyCode.W);
-        keys.add(KeyCode.S);
-        for (int i = 0; i < 12; i++) {
-            actionToKeyMap.put(KeyAction.getType(i + 1), keys.get(i));
-            keyToActionMap.put(keys.get(i), KeyAction.getType(i + 1));
-        }
-    }
-
-    public static GameKeyBind getInstance() {
-        if (instance == null) {
-            instance = new GameKeyBind();
-        }
-        return instance;
-    }
-
-    public KeyCode getKeyCode(KeyAction keyAction) {
-        return instance.actionToKeyMap.get(keyAction);
-    }
-
-    public KeyAction getKeyAction(KeyCode keyCode) {
-        return instance.keyToActionMap.get(keyCode);
-    }
-
-    /**
-     * Binds a key to a key action
-     *
-     * @return true if successfully bind
-     */
-    public boolean bindKeyToAction(KeyCode keyCode, KeyAction keyAction) {
-        if (instance.keyToActionMap.containsKey(keyCode)) {
-            // if the key has been bound to other action, return false
-            return false;
-        } else {
-            instance.keyToActionMap.put(keyCode, keyAction); // add key -> action
-            KeyCode oldKeyCode = instance.actionToKeyMap
-                .get(keyAction); // get old key for the action
-            instance.keyToActionMap.remove(oldKeyCode); // remove the old key -> action
-            instance.actionToKeyMap
-                .replace(keyAction, keyCode); // replace the old key by the newer one
-            return true;
-        }
-    }
-
-    public void toggleTurningMode() {
-        continuouslyTurning = !continuouslyTurning;
-    }
-
-    public Boolean isContinuouslyTurning() {
-        return continuouslyTurning;
-    }
-
-}

src/main/java/seng302/model/KeyAction.java

@@ -1,40 +0,0 @@
-package seng302.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum KeyAction {
-    ZOOM_IN(1),
-    ZOOM_OUT(2),
-    VMG(3),
-    SAILS_STATE(4),
-    TACK_GYBE(5),
-    UPWIND(6),
-    DOWNWIND(7),
-    VIEW(8),
-    RIGHT(9),
-    LEFT(10),
-    FORWARD(11),
-    BACKWARD(12);
-
-    private final int type;
-    private static final Map<Integer, KeyAction> intToTypeMap = new HashMap<>();
-
-    static {
-        for (KeyAction type : KeyAction.values()) {
-            intToTypeMap.put(type.getValue(), type);
-        }
-    }
-
-    KeyAction(int type) {
-        this.type = type;
-    }
-
-    public static KeyAction getType(int value) {
-        return intToTypeMap.get(value);
-    }
-
-    public int getValue() {
-        return this.type;
-    }
-}

src/main/java/seng302/model/Limit.java

@@ -15,9 +15,4 @@ public class Limit extends GeoPoint {
     public Integer getSeqID() {
         return seqID;
     }
-
-    @Override
-    public String toString(){
-        return "Limit = {seqID=" + seqID + ", lat=" + getLat() + ", lng=" + getLng() + "}";
-    }
 }

src/main/java/seng302/model/PolarTable.java

@@ -4,9 +4,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * A static class for parsing and storing the polars. Will parse the whole polar table and also store the optimised
@@ -19,7 +17,6 @@ public final class PolarTable {
     private static HashMap<Double, HashMap<Double, Double>> polarTable;
     private static HashMap<Double, HashMap<Double, Double>> upwindOptimal;
     private static HashMap<Double, HashMap<Double, Double>> downwindOptimal;
-    private static Double optimalAngle;
 
     private static int upTwaIndex;
     private static int dnTwaIndex;
@@ -36,13 +33,11 @@ public final class PolarTable {
         upwindOptimal = new HashMap<>();
         downwindOptimal = new HashMap<>();
 
-        String line = null;
-        String check;
+        String line;
         Boolean isHeaderLine = true;
 
         try (BufferedReader br = new BufferedReader(new InputStreamReader(polarFile))) {
-            while ((check = br.readLine()) != null) {
-                line = check;
+            while ((line = br.readLine()) != null) {
                 String[] thisLine = line.split(",");
 
                 //Initial line in file
@@ -71,10 +66,7 @@ public final class PolarTable {
                     upwindOptimal.put(thisWindSpeed, thisUpWindPolar);
                     downwindOptimal.put(thisWindSpeed, thisDnWindPolar);
                 }
-
-
             }
-            getMaxSpeedAngle(line);
 
         } catch (IOException e) {
             System.out.println("[PolarTable] IO exception");
@@ -82,27 +74,6 @@ public final class PolarTable {
     }
 
 
-    /**
-     * Passes the final line of the polar table and iterates over the speeds for each
-     * angle, velocity pair to find the angle that produces the highest velocity
-     *
-     * @param line The last line of the polar file
-     */
-    private static void getMaxSpeedAngle(String line) {
-        String[] theLastLine = line.split(",");
-        Double maxWindVal = Double.parseDouble(theLastLine[0]);
-        Double optimalAngle = Double.parseDouble(theLastLine[1]);
-        Double maxSpeed = Double.parseDouble(theLastLine[2]);
-        for (Map.Entry<Double, Double> entry : polarTable.get(maxWindVal).entrySet()) {
-            if (entry.getValue() > maxSpeed) {
-                maxSpeed = entry.getValue();
-                optimalAngle = entry.getKey();
-            }
-        }
-        PolarTable.optimalAngle = optimalAngle;
-    }
-
-
 
     /**
      * Parses the header line of a polar file
@@ -114,18 +85,14 @@ public final class PolarTable {
             String thisItem = thisLine[i];
             if (thisItem.toLowerCase().startsWith("uptwa")) {
                 upTwaIndex = i;
-            } else if (thisItem.toLowerCase().startsWith("dntwa")) {
+            }
+            else if (thisItem.toLowerCase().startsWith("dntwa")) {
                 dnTwaIndex = i;
             }
         }
     }
 
 
-    public static Double getOptimalAngle() {
-        return optimalAngle;
-    }
-
-
     /**
      * @return The entire polar table
      */

src/main/java/seng302/model/RaceState.java

@@ -3,8 +3,11 @@ package seng302.model;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Observable;
 import java.util.TimeZone;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
@@ -31,9 +34,8 @@ public class RaceState {
     private ReadOnlyDoubleWrapper windDirection = new ReadOnlyDoubleWrapper();
     private long serverSystemTime;
     private long expectedStartTime;
-    private boolean raceRunning = false;
+    private boolean isRaceStarted = false;
     private boolean gunFired = false;
-    private boolean raceFinished = false;
     long timeTillStart;
     private ObservableList<ClientYacht> playerPositions;
     private List<ClientYacht> collisions = new ArrayList<>();
@@ -48,7 +50,7 @@ public class RaceState {
         this.windDirection.set(data.getWindDirection());
         this.serverSystemTime = data.getCurrentTime();
         this.expectedStartTime = data.getExpectedStartTime();
-        this.raceRunning = data.isRaceStarted();
+        this.isRaceStarted = data.isRaceStarted();
     }
 
     public void setTimeZone (TimeZone timeZone) {
@@ -93,12 +95,9 @@ public class RaceState {
     }
 
     public boolean isRaceStarted () {
-        return raceRunning;
+        return isRaceStarted;
     }
 
-    public void setRaceStarted(Boolean value) {
-        this.raceRunning = value;
-    }
     public void setBoats(Collection<ClientYacht> clientYachts) {
         playerPositions.setAll(clientYachts);
     }
@@ -126,12 +125,4 @@ public class RaceState {
     public void removeCollisionListener(CollisionListener collisionListener) {
         collisionListeners.remove(collisionListener);
     }
-
-    public void setRaceFinished() {
-        raceFinished = true;
-    }
-
-    public Boolean getRaceFinished() {
-        return raceFinished;
-    }
 }

src/main/java/seng302/model/ScaledPoint.java

@@ -1,122 +0,0 @@
-package seng302.model;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import javafx.geometry.Point2D;
-import seng302.utilities.GeoUtility;
-
-/**
- * Contains information on a scaled lat lon point for use with mapping geographical elements to a 2d plane.
- */
-public class ScaledPoint extends GeoPoint {
-
-    public enum ScaleDirection {
-        HORIZONTAL,
-        VERTICAL
-    }
-
-    private double x, y, scaleFactor;
-    private ScaleDirection scaleDirection;
-
-    private ScaledPoint(double lat, double lng, double x, double y, double scaleFactor, ScaleDirection direction) {
-        super(lat, lng);
-        this.x = x;
-        this.y = y;
-        this.scaleFactor = scaleFactor;
-        this.scaleDirection = direction;
-    }
-
-    public double getX() {
-        return x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public double getScaleFactor() {
-        return scaleFactor;
-    }
-
-    public ScaleDirection getScaleDirection() {
-        return scaleDirection;
-    }
-
-    public Point2D findScaledXY(GeoPoint unscaled) {
-        return findScaledXY(unscaled.getLat(), unscaled.getLng());
-    }
-
-    public Point2D findScaledXY(double unscaledLat, double unscaledLon) {
-        double distanceFromReference;
-        double angleFromReference;
-        double xReference = this.getX();
-        double yReference = this.getY();
-
-        angleFromReference = GeoUtility.getBearingRad(
-            this, new GeoPoint(unscaledLat, unscaledLon)
-        );
-        distanceFromReference = GeoUtility.getDistance(
-            this, new GeoPoint(unscaledLat, unscaledLon)
-        );
-        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
-            xReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-            yReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-        } else if (angleFromReference >= 0) {
-            angleFromReference = angleFromReference - Math.PI / 2;
-            xReference += scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-            yReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
-            angleFromReference = Math.abs(angleFromReference);
-            xReference -= scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-            yReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-        } else {
-            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
-            xReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
-            yReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
-        }
-        return new Point2D(xReference, yReference);
-    }
-
-    public static ScaledPoint makeScaledPoint(double width, double height,
-        List<? extends GeoPoint> points, boolean centered) {
-
-        double referencePointX, referencePointY, scaleFactor, lat, lng;
-        ScaleDirection scaleDirection;
-        points = new ArrayList<>(points);
-        points.sort(Comparator.comparingDouble(GeoPoint::getLat));
-        GeoPoint minLatPoint = points.get(0);
-        GeoPoint maxLatPoint = points.get(points.size() - 1);
-
-        points.sort(Comparator.comparingDouble(GeoPoint::getLng));
-        GeoPoint minLonPoint = points.get(0);
-        GeoPoint maxLonPoint = points.get(points.size() - 1);
-
-        referencePointX = centered ? 0 : width / 2;
-        referencePointY = centered ? 0 : height / 2;
-
-        lat = (maxLatPoint.getLat() - minLatPoint.getLat()) / 2 + minLatPoint.getLat();
-        lng = (maxLonPoint.getLng() - minLonPoint.getLng()) / 2 + minLonPoint.getLng();
-
-        GeoPoint ref = new GeoPoint(lat, lng);
-
-        double vertDistance = GeoUtility.getDistance(
-            ref, new GeoPoint(ref.getLat(), maxLonPoint.getLng())
-        ) * 2.1;
-
-        double horiDistance = GeoUtility.getDistance(
-            ref, new GeoPoint(maxLatPoint.getLat(), ref.getLng())
-        ) * 2.1;
-
-        double vertScale = height / vertDistance;
-
-        if (horiDistance * vertScale > width) {
-            scaleFactor = width / horiDistance;
-            scaleDirection = ScaleDirection.HORIZONTAL;
-        } else {
-            scaleFactor = vertScale;
-            scaleDirection = ScaleDirection.VERTICAL;
-        }
-        return new ScaledPoint(lat, lng, referencePointX, referencePointY, scaleFactor, scaleDirection);
-    }
-}

src/main/java/seng302/model/ServerYacht.java

@@ -1,6 +1,5 @@
 package seng302.model;
 
-import java.util.HashMap;
 import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +8,10 @@ import seng302.gameServer.messages.BoatStatus;
 import seng302.model.mark.Mark;
 import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+
+import java.util.HashMap;
+import java.util.Observable;
+import java.util.Observer;
 
 /**
  * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
@@ -18,14 +20,12 @@ import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
  */
 public class ServerYacht {
 
-    private Logger logger = LoggerFactory.getLogger(ServerYacht.class);
+    private Logger logger = LoggerFactory.getLogger(ClientYacht.class);
+
+    public static final Double TURN_STEP = 5.0;
 
     //Boat info
-    private BoatMeshType boatType;
-    private Double turnStep = 5.0;
-    private Double boatTypeSpeedMultiplier = 1.0;
-    private Double boatTypeTurnStepMultiplier = 1.0;
-    private Double boatTypeAccelerationMultiplier = 1.0;
+    private String boatType;
     private Integer sourceId;
     private String hullID; //matches HullNum in the XML spec.
     private String shortName;
@@ -55,15 +55,11 @@ public class ServerYacht {
     //PowerUp
     private TokenType powerUp;
     private Long powerUpStartTime;
-    private Double powerUpSpeedMultiplier;
-    private Integer powerUpHandlingMultiplier;
 
-    //turning mode
-    private Boolean continuouslyTurning;
 
-    public ServerYacht(BoatMeshType boatType, Integer sourceId, String hullID, String shortName,
+    public ServerYacht(String boatType, Integer sourceId, String hullID, String shortName,
         String boatName, String country) {
-        setBoatType(boatType);
+        this.boatType = boatType;
         this.boatStatus = BoatStatus.PRESTART;
         this.sourceId = sourceId;
         this.hullID = hullID;
@@ -80,12 +76,10 @@ public class ServerYacht {
         this.legNumber = 0;
         this.boatColor = Colors.getColor(sourceId - 1);
         this.powerUp = null;
-        this.powerUpSpeedMultiplier = 1d;
-        this.powerUpHandlingMultiplier = 1;
+
         this.hasEnteredRoundingZone = false;
         this.hasPassedLine = false;
         this.hasPassedThroughGate = false;
-        this.continuouslyTurning = false;
     }
 
 
@@ -112,33 +106,13 @@ public class ServerYacht {
         location = geoPoint;
     }
 
-    /**
-     * Powers up a yacht with a given yacht, only after powering it down first to avoid double power
-     * ups
-     *
-     * @param powerUp The given power up
-     */
     public void powerUp(TokenType powerUp) {
-        powerDown();
-        switch (powerUp) {
-            case BOOST:
-                powerUpSpeedMultiplier = GameState.VELOCITY_BOOST_MULTIPLIER;
-                break;
-            case HANDLING:
-                powerUpHandlingMultiplier = GameState.HANDLING_BOOST_MULTIPLIER;
-                break;
-        }
         this.powerUp = powerUp;
         powerUpStartTime = System.currentTimeMillis();
     }
 
-    /**
-     * Powers down a yacht, returning its power multipliers back to 1
-     */
     public void powerDown() {
         this.powerUp = null;
-        this.powerUpSpeedMultiplier = 1d;
-        this.powerUpHandlingMultiplier = 1;
     }
 
     public Long getPowerUpStartTime() {
@@ -155,7 +129,7 @@ public class ServerYacht {
      * @param amount the amount by which to adjust the boat heading.
      */
     public void adjustHeading(Double amount) {
-        Double newVal = heading + amount * powerUpHandlingMultiplier * boatTypeTurnStepMultiplier;
+        Double newVal = heading + amount;
         lastHeading = heading;
         heading = (double) Math.floorMod(newVal.longValue(), 360L);
     }
@@ -178,11 +152,11 @@ public class ServerYacht {
     /**
      * Enables the boats auto pilot feature, which will move the boat towards a given heading.
      *
-     * @param newHeading The heading to move the boat towards.
+     * @param thisHeading The heading to move the boat towards.
      */
-    private void setAutoPilot(Double newHeading) {
+    private void setAutoPilot(Double thisHeading) {
         isAuto = true;
-        autoHeading = newHeading;
+        autoHeading = thisHeading;
     }
 
     /**
@@ -200,9 +174,8 @@ public class ServerYacht {
         if (isAuto) {
             turnTowardsHeading(autoHeading);
             if (Math.abs(heading - autoHeading)
-                <= turnStep*1.5) {
+                <= TURN_STEP) { //Cancel when within 1 turn step of target.
                 isAuto = false;
-                setHeading(autoHeading);
             }
         }
     }
@@ -214,52 +187,44 @@ public class ServerYacht {
     public void turnUpwind() {
         disableAutoPilot();
         Double normalizedHeading = normalizeHeading();
-        if (continuouslyTurning) {
-            adjustHeading(turnStep);
-        } else {
         if (normalizedHeading == 0) {
             if (lastHeading < 180) {
-                    adjustHeading(-turnStep);
+                adjustHeading(-TURN_STEP);
             } else {
-                    adjustHeading(turnStep);
+                adjustHeading(TURN_STEP);
             }
         } else if (normalizedHeading == 180) {
             if (lastHeading < 180) {
-                    adjustHeading(turnStep);
+                adjustHeading(TURN_STEP);
             } else {
-                    adjustHeading(-turnStep);
+                adjustHeading(-TURN_STEP);
             }
         } else if (normalizedHeading < 180) {
-                adjustHeading(-turnStep);
+            adjustHeading(-TURN_STEP);
         } else {
-                adjustHeading(turnStep);
-            }
+            adjustHeading(TURN_STEP);
         }
     }
 
     public void turnDownwind() {
         disableAutoPilot();
         Double normalizedHeading = normalizeHeading();
-        if (continuouslyTurning) {
-            adjustHeading(-turnStep);
-        } else {
         if (normalizedHeading == 0) {
             if (lastHeading < 180) {
-                    adjustHeading(turnStep);
+                adjustHeading(TURN_STEP);
             } else {
-                    adjustHeading(-turnStep);
+                adjustHeading(-TURN_STEP);
             }
         } else if (normalizedHeading == 180) {
             if (lastHeading < 180) {
-                    adjustHeading(-turnStep);
+                adjustHeading(-TURN_STEP);
             } else {
-                    adjustHeading(turnStep);
+                adjustHeading(TURN_STEP);
             }
         } else if (normalizedHeading < 180) {
-                adjustHeading(turnStep);
+            adjustHeading(TURN_STEP);
         } else {
-                adjustHeading(-turnStep);
-            }
+            adjustHeading(-TURN_STEP);
         }
     }
 
@@ -288,7 +253,7 @@ public class ServerYacht {
 
             // Take optimal heading and turn into a boat heading rather than a wind heading.
             optimalHeading =
-                (optimalHeading + GameState.getWindDirection()) % 360;
+                optimalHeading + GameState.getWindDirection();
 
             setAutoPilot(optimalHeading);
         }
@@ -303,9 +268,9 @@ public class ServerYacht {
     private void turnTowardsHeading(Double newHeading) {
         Double newVal = heading - newHeading;
         if (Math.floorMod(newVal.longValue(), 360L) > 180) {
-            adjustHeading(turnStep  / 5);
+            adjustHeading(TURN_STEP / 5);
         } else {
-            adjustHeading(-turnStep / 5);
+            adjustHeading(-TURN_STEP / 5);
         }
     }
 
@@ -456,43 +421,4 @@ public class ServerYacht {
         return boatColor;
     }
 
-    public void setBoatType(BoatMeshType boatType) {
-        this.boatTypeAccelerationMultiplier = boatType.accelerationMultiplier;
-        this.boatTypeSpeedMultiplier = boatType.maxSpeedMultiplier;
-        this.boatTypeTurnStepMultiplier = boatType.turnStep;
-        this.boatType = boatType;
-    }
-
-    public Double getBoatTypeSpeedMultiplier() {
-        return boatTypeSpeedMultiplier;
-    }
-
-    public Double getBoatTypeAccelerationMultiplier() {
-        return boatTypeAccelerationMultiplier;
-    }
-
-
-    public BoatMeshType getBoatType() {
-        return boatType;
-    }
-
-    public void setContinuouslyTurning(Boolean continuouslyTurning) {
-        this.continuouslyTurning = continuouslyTurning;
-    }
-
-    public Double getPowerUpSpeedMultiplier() {
-        return powerUpSpeedMultiplier;
-    }
-
-    public void setPowerUpSpeedMultiplier(Double powerUpSpeedMultiplier) {
-        this.powerUpSpeedMultiplier = powerUpSpeedMultiplier;
-    }
-
-    public Integer getPowerUpHandlingMultiplier() {
-        return powerUpHandlingMultiplier;
-    }
-
-    public void setPowerUpHandlingMultiplier(Integer powerUpHandlingMultiplier) {
-        this.powerUpHandlingMultiplier = powerUpHandlingMultiplier;
-    }
 }

src/main/java/seng302/model/mark/CompoundMark.java

@@ -1,6 +1,6 @@
 package seng302.model.mark;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import seng302.gameServer.messages.RoundingSide;
 import seng302.model.GeoPoint;
@@ -10,13 +10,13 @@ public class CompoundMark {
 
 	private int compoundMarkId;
 	private String name;
-	private List<Mark> marks;
+	private List<Mark> marks = new ArrayList<>();
     private GeoPoint midPoint;
 
     public CompoundMark(int markID, String name, List<Mark> marks) {
         this.compoundMarkId = markID;
         this.name = name;
-        this.marks = Collections.unmodifiableList(marks);
+        this.marks.addAll(marks);
         if (marks.size() > 1) {
             this.midPoint = GeoUtility.getDirtyMidPoint(marks.get(0), marks.get(1));
         } else {

src/main/java/seng302/model/mark/Corner.java

@@ -32,10 +32,4 @@ public class Corner {
     public Integer getZoneSize() {
         return zoneSize;
     }
-
-    @Override
-    public String toString() {
-        return "Corner = {seqID=" + seqID + ", compoundMarkID=" + compoundMarkID + ", rounding="
-            + rounding +", zoneSize=" + zoneSize + "}";
-    }
 }

src/main/java/seng302/model/mark/MarkOrder.java

@@ -1,33 +1,34 @@
 package seng302.model.mark;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.io.IOException;
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import seng302.gameServer.messages.RoundingSide;
+import seng302.model.ServerYacht;
+import seng302.model.stream.xml.generator.RaceXMLTemplate;
 import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.token.Token;
+import seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
+import java.util.*;
 
 /**
  * Class to hold the order of the marks in the race.
  */
 public class MarkOrder {
     private List<CompoundMark> raceMarkOrder;
-    private List<CompoundMark> orderedUniqueCompoundMarks;
     private Logger logger = LoggerFactory.getLogger(MarkOrder.class);
-    private List<Mark> allMarks;
+    private Set<Mark> allMarks;
 
-
-    public MarkOrder(RaceXMLData raceXMLData){
-        raceMarkOrder = new ArrayList<>();
-        for (Corner corner : raceXMLData.getMarkSequence()){
-            CompoundMark compoundMark = raceXMLData.getCompoundMarks().get(corner.getCompoundMarkID());
-            compoundMark.setRoundingSide(
-                RoundingSide.getRoundingSide(corner.getRounding())
-            );
-            raceMarkOrder.add(compoundMark);
-        }
-        orderedUniqueCompoundMarks = new ArrayList<>(raceXMLData.getCompoundMarks().values());
+    public MarkOrder(){
+        loadRaceProperties();
     }
 
     /**
@@ -39,11 +40,8 @@ public class MarkOrder {
             logger.warn("Race order accessed but not instantiated");
             return null;
         }
-        return Collections.unmodifiableList(raceMarkOrder);
-    }
 
-    public List<CompoundMark> getOrderedUniqueCompoundMarks() {
-        return orderedUniqueCompoundMarks;
+        return Collections.unmodifiableList(raceMarkOrder);
     }
 
     /**
@@ -76,4 +74,70 @@ public class MarkOrder {
     public CompoundMark getNextMark(Integer currentSeqID) throws IndexOutOfBoundsException {
         return raceMarkOrder.get(currentSeqID + 1);
     }
+
+    public Set<Mark> getAllMarks(){
+        return Collections.unmodifiableSet(allMarks);
+    }
+
+    /**
+     * Loads the race order from an XML string
+     * @param xml An AC35 RaceXML
+     * @return An ordered list of marks in the race
+     */
+    private List<CompoundMark> loadRaceOrderFromXML(String xml) {
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db;
+        Document doc;
+        allMarks = new HashSet<>();
+
+        try {
+            db = dbf.newDocumentBuilder();
+            doc = db.parse(new InputSource(new StringReader(xml)));
+        } catch (ParserConfigurationException | IOException | SAXException e) {
+            logger.error("Failed to read generated race XML");
+            return null;
+        }
+        
+        RaceXMLData data = XMLParser.parseRace(doc);
+
+        if (data != null){
+            logger.debug("Loaded RaceXML for mark order");
+            List<Corner> corners = data.getMarkSequence();
+            Map<Integer, CompoundMark> marks = data.getCompoundMarks();
+            List<CompoundMark> course = new ArrayList<>();
+            for (Corner corner : corners){
+                CompoundMark compoundMark = marks.get(corner.getCompoundMarkID());
+                compoundMark.setRoundingSide(
+                    RoundingSide.getRoundingSide(corner.getRounding())
+                );
+                course.add(compoundMark);
+                allMarks.addAll(compoundMark.getMarks());
+            }
+
+            return course;
+        }
+
+        return null;
+    }
+
+    /**
+     * Load the raceXML and mark order
+     */
+    private void loadRaceProperties(){
+        XMLGenerator generator = new XMLGenerator();
+
+        // TODO: 29/08/17 wmu16 - This is terrible, having to make a template just to receive constant data
+        generator.setRaceTemplate(new RaceXMLTemplate(
+            new ArrayList<>(),
+            new ArrayList<>()));
+
+        String raceXML = generator.getRaceAsXml();
+
+        if (raceXML == null){
+            logger.error("Failed to generate raceXML (for race properties)");
+            return;
+        }
+        raceMarkOrder = loadRaceOrderFromXML(raceXML);
+    }
 }

src/main/java/seng302/model/stream/packets/PacketType.java

@@ -20,9 +20,7 @@ public enum PacketType {
     RACE_REGISTRATION_REQUEST,
     RACE_REGISTRATION_RESPONSE,
     RACE_CUSTOMIZATION_REQUEST,
-    RACE_CUSTOMIZATION_RESPONSE,
-
-    SERVER_REGISTRATION, ROOM_CODE_REQUEST, LOBBY_REQUEST;
+    RACE_CUSTOMIZATION_RESPONSE;
 
     public static PacketType assignPacketType(int packetType, byte[] payload){
         switch(packetType){
@@ -67,10 +65,6 @@ public enum PacketType {
                 return RACE_CUSTOMIZATION_REQUEST;
             case 104:
                 return RACE_CUSTOMIZATION_RESPONSE;
-            case 201:
-                return SERVER_REGISTRATION;
-            case 202:
-                return ROOM_CODE_REQUEST;
             default:
         }
         return OTHER;

src/main/java/seng302/model/stream/xml/generator/RaceXMLTemplate.java

@@ -1,12 +1,10 @@
 package seng302.model.stream.xml.generator;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import seng302.model.Limit;
 import seng302.model.ServerYacht;
-import seng302.model.mark.CompoundMark;
-import seng302.model.mark.Corner;
 import seng302.model.token.Token;
 
 /**
@@ -17,22 +15,11 @@ public class RaceXMLTemplate {
     private List<ServerYacht> yachts;
     private LocalDateTime startTime;
     private List<Token> tokens;
-    private List<Corner> roundings;
-    private List<Limit> courseLimit;
-    private List<CompoundMark> course;
-    private Integer maxPlayers;
-    private Boolean tokensEnabled;
 
-    public RaceXMLTemplate(List<ServerYacht> yachts, List<Token> tokens, List<Corner> roundings,
-        List<Limit> limit, List<CompoundMark> course, Integer maxPlayers, Boolean tokensEnabled) {
+    public RaceXMLTemplate(List<ServerYacht> yachts, List<Token> tokens) {
         this.yachts = yachts;
         this.tokens = tokens;
-        this.roundings = roundings;
-        this.courseLimit = limit;
-        this.course = course;
         startTime = LocalDateTime.now();
-        this.maxPlayers = maxPlayers;
-        this.tokensEnabled = tokensEnabled;
     }
 
     /**
@@ -52,18 +39,6 @@ public class RaceXMLTemplate {
         return Collections.unmodifiableList(tokens);
     }
 
-    public List<CompoundMark> getCompoundMarks() {
-        return Collections.unmodifiableList(course);
-    }
-
-    public List<Limit> getCourseLimit() {
-        return Collections.unmodifiableList(courseLimit);
-    }
-
-    public List<Corner> getRoundings() {
-        return Collections.unmodifiableList(roundings);
-    }
-
     /**
      * Set the time until the race starts
      * @param seconds The time in seconds until the race starts
@@ -79,20 +54,4 @@ public class RaceXMLTemplate {
     public String getRaceStartTime(){
         return startTime.toString();
     }
-
-    public void setBoats(List<ServerYacht> boats) {
-        yachts = boats;
-    }
-
-    public void setTokens(List<Token> tokens) {
-        this.tokens = tokens;
-    }
-
-    public String getTokensEnabled() {
-        return tokensEnabled.toString();
-    }
-
-    public String getMaxPlayers() {
-        return maxPlayers.toString();
-    }
 }

src/main/java/seng302/model/token/Token.java

@@ -1,9 +1,5 @@
 package seng302.model.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
 import seng302.model.GeoPoint;
 
 /**
@@ -13,50 +9,13 @@ import seng302.model.GeoPoint;
 public class Token extends GeoPoint {
 
     private TokenType tokenType;
-    private Random random = new Random();
 
-    //Constructor for creating a specific type client side
     public Token(TokenType tokenType, double lat, double lng) {
         super(lat, lng);
         this.tokenType = tokenType;
     }
 
-    //Making random type server side
-    public Token(double lat, double lng) {
-        super(lat, lng);
-        assignRandomType();
-    }
-
-    //Making random type server side
-    public Token(GeoPoint geoPoint) {
-        super(geoPoint.getLat(), geoPoint.getLng());
-        assignRandomType();
-    }
-
     public TokenType getTokenType() {
         return tokenType;
     }
-
-    /**
-     * Assigns a random type to the token (including the random type token)
-     */
-    public void assignRandomType() {
-        tokenType = TokenType.values()[random.nextInt(TokenType.values().length)];
-    }
-
-    /**
-     * Assigns a random, concrete type to the token (cannot be the random type)
-     */
-    public void realiseRandom() {
-        List<TokenType> tokenTypeList = new ArrayList<>(Arrays.asList(TokenType.values()));
-        tokenTypeList.remove(TokenType.RANDOM);
-        tokenType = tokenTypeList.get(random.nextInt(tokenTypeList.size()));
-    }
-
-    /**
-     * Exists for testing purposes only
-     */
-    public void assignType(TokenType tokenType) {
-        this.tokenType = tokenType;
-    }
 }

src/main/java/seng302/model/token/TokenType.java

@@ -5,32 +5,27 @@ package seng302.model.token;
  * Created by wmu16 on 28/08/17.
  */
 public enum TokenType {
-
-    BOOST(0, "Boost", 10_000),
-    HANDLING(1, "Handling", 10_000),
-    BUMPER(2, "Bumper", 10_000),
-    WIND_WALKER(3, "Wind Walker", 10_000),
-    RANDOM(4, "Random", 10_000);
+    BOOST(0),
+    HANDLING(1);
 
     private int value;
-    private String name;
-    private int timeout;
 
-    TokenType(int value, String name, int timeout) {
+    TokenType(int value) {
         this.value = value;
-        this.name = name;
-        this.timeout = timeout;
     }
 
     public int getValue() {
         return value;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public int getTimeout() {
-        return timeout;
+    public static TokenType getToken(int value) {
+        switch (value) {
+            case 0:
+                return BOOST;
+            case 1:
+                return HANDLING;
+            default:
+                return BOOST;
+        }
     }
 }

src/main/java/seng302/utilities/RandomSpawn.java

@@ -1,64 +0,0 @@
-package seng302.utilities;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-import seng302.model.GeoPoint;
-import seng302.model.mark.CompoundMark;
-import seng302.model.token.Token;
-
-/**
- * A class for generating and spawning tokens in random locations
- * Created by wmu16 on 27/09/17.
- */
-public class RandomSpawn {
-
-    private static final Integer DEGREES_IN_CIRCLE = 360;
-
-    private HashMap<GeoPoint, Double> spawnRadii;
-    private Object[] spawnCentres;
-    private Random random;
-
-    /**
-     * @param markOrder this must be the ORDERED list of marks. Better yet UNIQUE to avoid over
-     * computation
-     */
-    public RandomSpawn(List<CompoundMark> markOrder) {
-        this.spawnRadii = new HashMap<>();
-        random = new Random();
-
-        spawnRadii = generateSpawnRadii(markOrder);
-        spawnCentres = spawnRadii.keySet().toArray();
-    }
-
-    private HashMap<GeoPoint, Double> generateSpawnRadii(List<CompoundMark> markOrder) {
-        HashMap<GeoPoint, Double> spawnRadii = new HashMap<>();
-        for (int i = 0; i < markOrder.size() - 1; i++) {
-            GeoPoint spawnCentre = GeoUtility.getDirtyMidPoint(
-                markOrder.get(i).getMidPoint(),
-                markOrder.get(i + 1).getMidPoint());
-
-            Double distance = GeoUtility.getDistance(spawnCentre, markOrder.get(i).getMidPoint());
-            spawnRadii.put(spawnCentre, distance);
-        }
-
-        return spawnRadii;
-    }
-
-
-    /**
-     * @return A random token type at a random location in a random radii of the set of possible
-     * radii
-     */
-    public Token getRandomToken() {
-        GeoPoint randomSpawnCentre = (GeoPoint) spawnCentres[random.nextInt(spawnCentres.length)];
-        Double spawnRadius = spawnRadii.get(randomSpawnCentre);
-        Double randomDistance = spawnRadius * random.nextDouble();
-        Double randomAngle = random.nextDouble() * DEGREES_IN_CIRCLE;
-        GeoPoint randomLocation = GeoUtility
-            .getGeoCoordinate(randomSpawnCentre, randomAngle, randomDistance);
-        return new Token(randomLocation);
-
-    }
-
-}

src/main/java/seng302/utilities/Sounds.java

@@ -14,10 +14,8 @@ public class Sounds {
     private static MediaPlayer soundEffect;
     private static MediaPlayer soundPlayer;
     private static MediaPlayer hoverSoundPlayer;
-    private static MediaPlayer crashSoundPlayer;
 
     private static boolean hoverInitialized = false;
-    private static boolean crashInitialized = false;
     private static boolean musicMuted = false;
     private static boolean soundEffectsMuted = false;
 
@@ -101,10 +99,6 @@ public class Sounds {
         musicPlayer.setCycleCount(MediaPlayer.INDEFINITE);
         musicPlayer.setVolume(0.3);
         musicPlayer.play();
-        musicPlayer.setMute(musicMuted);
-        if (soundEffect != null) {
-            soundEffect.stop();
-        }
     }
 
 
@@ -161,17 +155,11 @@ public class Sounds {
 
     public static void playCrashSound() {
         if (!soundEffectsMuted) {
-            if (!crashInitialized) {
-                Media pickupSound = new Media(
+            Media crashSound = new Media(
                 Sounds.class.getClassLoader().getResource("sounds/Large-metal-door-slam.mp3")
                     .toString());
-                crashSoundPlayer = new MediaPlayer(pickupSound);
-                crashInitialized = true;
-            }
-            if (crashSoundPlayer != null) {
-                crashSoundPlayer.stop();
-            }
-            crashSoundPlayer.play();
+            soundPlayer = new MediaPlayer(crashSound);
+            soundPlayer.play();
         }
     }
 
@@ -188,10 +176,10 @@ public class Sounds {
     public static void playHoverSound() {
         if (!soundEffectsMuted) {
             if (!hoverInitialized) {
-                Media hoverSound = new Media(
+                Media crashSound = new Media(
                     Sounds.class.getClassLoader().getResource("sounds/Error-sound-effect.mp3")
                         .toString());
-                hoverSoundPlayer = new MediaPlayer(hoverSound);
+                hoverSoundPlayer = new MediaPlayer(crashSound);
                 hoverInitialized = true;
             }
             hoverSoundPlayer.setVolume(0.5);

src/main/java/seng302/utilities/StreamParser.java

@@ -2,6 +2,7 @@ package seng302.utilities;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -14,12 +15,8 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.parser.MarkRoundingData;
-import seng302.model.stream.parser.PositionUpdateData;
+import seng302.model.stream.parser.*;
 import seng302.model.stream.parser.PositionUpdateData.DeviceType;
-import seng302.model.stream.parser.RaceStartData;
-import seng302.model.stream.parser.RaceStatusData;
-import seng302.model.stream.parser.YachtEventData;
 
 /**
  * StreamParser is a utilities class for taking byte data, formatted according to the AC35 streaming
@@ -40,6 +37,7 @@ public class StreamParser {
             return null;
         }
         long heartbeat = bytesToLong(packet.getPayload());
+        System.out.println("heartbeat = " + heartbeat);
         return heartbeat;
     }
 
@@ -136,6 +134,7 @@ public class StreamParser {
         long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
         String xmlMessage = new String(
             (Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
+
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db;

src/main/java/seng302/utilities/XMLGenerator.java

@@ -179,8 +179,4 @@ public class XMLGenerator {
     public RegattaXMLTemplate getRegatta() {
         return regatta;
     }
-
-    public RaceXMLTemplate getRace() {
-        return race;
-    }
 }

src/main/java/seng302/utilities/XMLParser.java

@@ -1,44 +1,29 @@
 package seng302.utilities;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import javafx.scene.paint.Color;
-import javafx.util.Pair;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 import seng302.model.ClientYacht;
-import seng302.model.Colors;
 import seng302.model.Limit;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
-import seng302.model.stream.xml.generator.RaceXMLTemplate;
-import seng302.model.stream.xml.generator.RegattaXMLTemplate;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.model.token.Token;
 import seng302.model.token.TokenType;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
 
 /**
  * Utilities for parsing XML documents
  */
 public class XMLParser {
 
-    private static final int MAX_PLAYERS = 8;
-
     /**
      * Returns the text content of a given child element tag, assuming it exists, as an Integer.
      *
@@ -49,7 +34,7 @@ public class XMLParser {
     private static Integer getElementInt(Element ele, String tag) {
         NodeList tagList = ele.getElementsByTagName(tag);
         if (tagList.getLength() > 0) {
-            return Integer.parseInt(tagList.item(0).getTextContent().replaceAll("\\s+",""));
+            return Integer.parseInt(tagList.item(0).getTextContent());
         } else {
             return null;
         }
@@ -81,7 +66,7 @@ public class XMLParser {
     private static Double getElementDouble(Element ele, String tag) {
         NodeList tagList = ele.getElementsByTagName(tag);
         if (tagList.getLength() > 0) {
-            return Double.parseDouble(tagList.item(0).getTextContent().replaceAll("\\s+",""));
+            return Double.parseDouble(tagList.item(0).getTextContent());
         } else {
             return null;
         }
@@ -153,29 +138,19 @@ public class XMLParser {
             Node currentBoat = boatsList.item(i);
             if (currentBoat.getNodeName().equals("Boat")) {
 //                    Boat boat = new Boat(currentBoat);
-                BoatMeshType boatMeshType;
-                try {
-                    boatMeshType = BoatMeshType.valueOf(XMLParser.getNodeAttributeString(currentBoat, "Type"));
-                } catch (IllegalArgumentException e){
-                    boatMeshType = BoatMeshType.DINGHY;
-                }
-                Color color;
-                try {
-                    color = Color.web(getNodeAttributeString(currentBoat, "Color"));
-                } catch (NullPointerException npe) {
-                    color = Colors.getColor(new Random().nextInt(8));
-                }
                 ClientYacht yacht = new ClientYacht(
-                    boatMeshType,
+                    XMLParser.getNodeAttributeString(currentBoat, "Type"),
                     XMLParser.getNodeAttributeInt(currentBoat, "SourceID"),
                     XMLParser.getNodeAttributeString(currentBoat, "HullNum"),
                     XMLParser.getNodeAttributeString(currentBoat, "ShortName"),
                     XMLParser.getNodeAttributeString(currentBoat, "BoatName"),
                     XMLParser.getNodeAttributeString(currentBoat, "Country"));
-                yacht.setColour(color);
+                yacht.setColour(Color.web(getNodeAttributeString(currentBoat, "Color")));
+                if (yacht.getBoatType().equals("Yacht")) {
                     competingBoats.put(yacht.getSourceId(), yacht);
                 }
             }
+        }
         return competingBoats;
     }
 
@@ -199,36 +174,6 @@ public class XMLParser {
         );
     }
 
-    public static Boolean tokensEnabled(Document doc) {
-        Element docEle = doc.getDocumentElement();
-        try {
-            NamedNodeMap namedNodeMap = docEle.getElementsByTagName("Tokens").item(0).getAttributes();
-            Node node = namedNodeMap.getNamedItem("Enabled");
-            if (node != null) {
-                return Boolean.parseBoolean(node.getNodeValue());
-            }
-        } catch (NullPointerException npe) {
-            npe.printStackTrace();
-            return false;
-        }
-        return false;
-    }
-
-    public static Integer getMaxPlayers(Document doc) {
-        Element docEle = doc.getDocumentElement();
-        try {
-            NamedNodeMap namedNodeMap = docEle.getElementsByTagName("Participants").item(0).getAttributes();
-            Node node = namedNodeMap.getNamedItem("MaxPlayers");
-            if (node != null) {
-                return Integer.parseInt(node.getNodeValue());
-            }
-        } catch (NullPointerException npe) {
-            npe.printStackTrace();
-            return MAX_PLAYERS;
-        }
-        return MAX_PLAYERS;
-    }
-
     /**
      * Returns an object containing the data extracted from the given xml formatted document
      *
@@ -238,7 +183,7 @@ public class XMLParser {
     public static RaceXMLData parseRace(Document doc) {
         Element docEle = doc.getDocumentElement();
         return new RaceXMLData(
-            extractParticipantIDs(docEle),
+            extractParticpantIDs(docEle),
             extractTokens(docEle),
             extractCompoundMarks(docEle),
             extractMarkOrder(docEle),
@@ -251,7 +196,6 @@ public class XMLParser {
      */
     private static List<Token> extractTokens(Element docEle) {
         List<Token> tokens = new ArrayList<>();
-        try {
         NodeList tokenList = docEle.getElementsByTagName("Tokens").item(0).getChildNodes();
         for (int i = 0; i < tokenList.getLength(); i++) {
             Node tokenNode = tokenList.item(i);
@@ -262,9 +206,7 @@ public class XMLParser {
                 tokens.add(new Token(TokenType.valueOf(tokenType), lat, lng));
             }
         }
-        } catch (NullPointerException npe) {
-            return new ArrayList<>();
-        }
+
         return tokens;
     }
 
@@ -277,11 +219,13 @@ public class XMLParser {
         for (int i = 0; i < limitList.getLength(); i++) {
             Node limitNode = limitList.item(i);
             if (limitNode.getNodeName().equals("Limit")) {
-                courseLimit.add(new Limit(
+                courseLimit.add(
+                    new Limit(
                         XMLParser.getNodeAttributeInt(limitNode, "SeqID"),
                         XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
                         XMLParser.getNodeAttributeDouble(limitNode, "Lon")
-                ));
+                    )
+                );
             }
         }
         return courseLimit;
@@ -313,7 +257,7 @@ public class XMLParser {
     /**
      * Extracts course participants data
      */
-    private static List<Integer> extractParticipantIDs(Element docEle) {
+    private static List<Integer> extractParticpantIDs (Element docEle) {
         List<Integer> boatIDs = new ArrayList<>();
         NodeList pList = docEle.getElementsByTagName("Participants").item(0).getChildNodes();
         for (int i = 0; i < pList.getLength(); i++) {
@@ -335,11 +279,10 @@ public class XMLParser {
         for (int i = 0; i < cMarkList.getLength(); i++) {
             Node cMarkNode = cMarkList.item(i);
             if (cMarkNode.getNodeName().equals("CompoundMark")) {
-                String name = XMLParser.getNodeAttributeString(cMarkNode, "Name");
-                name = (name == null || name.equals("")) ? "Mark " + i+1: name;
                 cMark = new CompoundMark(
                     XMLParser.getNodeAttributeInt(cMarkNode, "CompoundMarkID"),
-                    name, createMarks(cMarkNode)
+                    XMLParser.getNodeAttributeString(cMarkNode, "Name"),
+                    createMarks(cMarkNode)
                 );
                 allMarks.add(cMark);
             }
@@ -360,169 +303,14 @@ public class XMLParser {
             Node markNode = childMarks.item(i);
             if (markNode.getNodeName().equals("Mark")) {
                 Integer seqID = XMLParser.getNodeAttributeInt(markNode, "SeqID");
-                seqID = (seqID == null) ? i+1 : seqID;
-
                 Integer sourceID = XMLParser.getNodeAttributeInt(markNode, "SourceID");
-                sourceID = (sourceID == null) ? i+1 : sourceID;
-
                 String markName = XMLParser.getNodeAttributeString(markNode, "Name");
-                markName = (markName == null || markName.equals("")) ? cMarkName + " " + i+1: markName;
-
                 Double targetLat = XMLParser.getNodeAttributeDouble(markNode, "TargetLat");
                 Double targetLng = XMLParser.getNodeAttributeDouble(markNode, "TargetLng");
-
                 Mark mark = new Mark(markName, seqID, targetLat, targetLng, sourceID);
                 subMarks.add(mark);
             }
         }
         return subMarks;
     }
-
-    /**
-     * This ungodly combination of existing methods and code blocks parses a race definition file.
-     * Look upon it and despair.
-     * @param url The input file path
-     * @param serverName the name of the server
-     * @param repetitions the repetitions of a segment of the race def file.
-     * @param maxPlayers max number of players. uses the default race max if null or greater than the actual max.
-     * @param tokensEnabled if tokens are enabled
-     * @return a pair which contains regatta string, race string as key, value pair.
-     */
-    public static Pair<RegattaXMLTemplate, RaceXMLTemplate> parseRaceDef(
-            String url, String serverName, Integer repetitions, Integer maxPlayers, Boolean tokensEnabled
-    ) {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db;
-        Document doc = null;
-        try {
-            db = dbf.newDocumentBuilder();
-            doc = db.parse(XMLParser.class.getResourceAsStream(url));
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            e.printStackTrace();
-        }
-        Element docEle = doc.getDocumentElement();
-
-        RegattaXMLTemplate regattaXMLTemplate = new RegattaXMLTemplate(
-            serverName, XMLParser.getElementString(docEle, "CourseName"),
-            XMLParser.getElementDouble(docEle, "CentralLat"),
-            XMLParser.getElementDouble(docEle, "CentralLng")
-        );
-
-        XMLGenerator xmlGenerator = new XMLGenerator();
-        xmlGenerator.setRegattaTemplate(regattaXMLTemplate);
-
-        if (maxPlayers == null) {
-            maxPlayers = XMLParser.getElementInt(docEle, "MaxPlayers");
-        } else if (maxPlayers > XMLParser.getElementInt(docEle, "MaxPlayers")) {
-            maxPlayers = XMLParser.getElementInt(docEle, "MaxPlayers");
-        }
-
-        RaceXMLTemplate raceXMLTemplate = new RaceXMLTemplate(
-            new ArrayList<>(), new ArrayList<>(),
-            XMLParser.extractMarkOrderRaceDef(docEle, repetitions),
-            XMLParser.extractCourseLimitRaceDef(docEle),
-            XMLParser.extractCompoundMarksRaceDef(docEle),
-            maxPlayers, tokensEnabled
-        );
-        xmlGenerator.setRaceTemplate(raceXMLTemplate);
-        return new Pair<>(regattaXMLTemplate, raceXMLTemplate);
-    }
-
-    private static List<Corner> extractMarkOrderRaceDef(Element docEle, int repitions){
-        List<Corner> compoundMarkSequence = new ArrayList<>();
-        NodeList cornerList = docEle.getElementsByTagName("Course").item(0).getChildNodes();
-
-        int seqId = 1;
-        final int zoneSize = 3;
-
-        for (int i=0; i<cornerList.getLength(); i++) {
-            Node segment = cornerList.item(i);
-            if (segment.getNodeName().equals("OpeningSegment") ||
-                segment.getNodeName().equals("ClosingSegment")) {
-
-                seqId = parseCourseSegment(segment, seqId, compoundMarkSequence);
-
-            } else if (segment.getNodeName().equals("RepeatingSegment")) {
-                for (int k = 0; k < repitions; k++) {
-                    seqId = parseCourseSegment(segment, seqId, compoundMarkSequence);
-                }
-            }
-        }
-        return compoundMarkSequence;
-    }
-
-    /**
-     * Parses a segment of the course adding new Corners to the given list.
-     * @param segment Segment to parse
-     * @param seqID initial sequence ID
-     * @param course course to add corners to
-     * @return the last sequence id.
-     */
-    private static int parseCourseSegment(Node segment, int seqID, List<Corner> course) {
-        NodeList segmentList = segment.getChildNodes();
-        for (int j = 0; j < segmentList.getLength(); j++) {
-            Node corner = segmentList.item(j);
-            if (corner.getNodeName().equals("Corner")) {
-                String rounding = XMLParser.getNodeAttributeString(corner, "Rounding");
-                rounding = //Converting "P" to "Port" and "S" to "Stbd"
-                    rounding.equals("P") ? "Port" :
-                    rounding.equals("S") ? "Stbd" : rounding;
-                course.add(new Corner(
-                    seqID++, XMLParser.getNodeAttributeInt(corner, "CompoundMarkID"),
-                    rounding, 3
-                ));
-            }
-        }
-        return seqID;
-    }
-
-    private static List<Limit> extractCourseLimitRaceDef(Element docEle) {
-        List<Limit> courseLimit = new ArrayList<>();
-        NodeList limitList = docEle.getElementsByTagName("CourseLimit").item(0).getChildNodes();
-        int seqId = 1;
-        for (int i = 0; i < limitList.getLength(); i++) {
-            Node limitNode = limitList.item(i);
-            if (limitNode.getNodeName().equals("Limit")) {
-                courseLimit.add(new Limit(
-                    seqId++, XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
-                    XMLParser.getNodeAttributeDouble(limitNode, "Lng")
-                ));
-            }
-        }
-        return courseLimit;
-    }
-
-    private static List<CompoundMark> extractCompoundMarksRaceDef(Element docEle){
-        List<CompoundMark> allMarks = new ArrayList<>();
-        NodeList cMarkList = docEle.getElementsByTagName("Marks").item(0).getChildNodes();
-        CompoundMark cMark;
-        int markCount = 200;
-        for (int i = 0; i < cMarkList.getLength(); i++) {
-            Node cMarkNode = cMarkList.item(i);
-            if (cMarkNode.getNodeName().equals("CompoundMark")) {
-                Integer id = XMLParser.getNodeAttributeInt(cMarkNode, "CompoundMarkID");
-                List<Mark> subMarks = createMarksRaceDef(cMarkNode, markCount,"Mark " + id);
-                markCount += subMarks.size();
-                allMarks.add(new CompoundMark(id, "Mark " + id, subMarks));
-            }
-        }
-        return allMarks;
-    }
-
-    private static List<Mark> createMarksRaceDef(Node compoundMark, int markCount, String markName) {
-        List<Mark> subMarks = new ArrayList<>();
-        NodeList childMarks = compoundMark.getChildNodes();
-        int seqID = 1;
-        for (int i = 0; i < childMarks.getLength(); i++) {
-            Node markNode = childMarks.item(i);
-            if (markNode.getNodeName().equals("Mark")) {
-                Double targetLat = XMLParser.getNodeAttributeDouble(markNode, "Lat");
-                Double targetLng = XMLParser.getNodeAttributeDouble(markNode, "Lng");
-                Mark mark = new Mark(markName + " subMark " + seqID, seqID, targetLat, targetLng, markCount++);
-                subMarks.add(mark);
-                seqID += 1;
-            }
-        }
-        return subMarks;
-    }
 }

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -1,14 +1,5 @@
 package seng302.visualiser;
 
-import javafx.application.Platform;
-import javafx.util.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.*;
-import seng302.model.stream.packets.PacketType;
-import seng302.model.stream.packets.StreamPacket;
-import seng302.utilities.XMLParser;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +14,6 @@ import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
-import javafx.util.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.messages.BoatAction;
@@ -35,15 +25,8 @@ import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RegistrationRequestMessage;
 import seng302.gameServer.messages.RegistrationResponseStatus;
-import seng302.gameServer.messages.XMLMessage;
-import seng302.gameServer.messages.XMLMessageSubType;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.xml.generator.RaceXMLTemplate;
-import seng302.model.stream.xml.generator.RegattaXMLTemplate;
-import seng302.utilities.XMLGenerator;
-import seng302.utilities.XMLParser;
-import seng302.visualiser.controllers.ViewManager;
 
 /**
  * A class describing a single connection to a Server for the purposes of sending and receiving on
@@ -51,8 +34,6 @@ import seng302.visualiser.controllers.ViewManager;
  */
 public class ClientToServerThread implements Runnable {
 
-    private boolean isStarted = false;
-
     /**
      * Functional interface for receiving packets from client socket.
      */
@@ -63,12 +44,7 @@ public class ClientToServerThread implements Runnable {
 
     @FunctionalInterface
     public interface DisconnectedFromHostListener {
-        void notifyDisconnection(String message);
-    }
-
-    @FunctionalInterface
-    public interface ConnectionErrorListener {
-        void notifyConnectionError(String message);
+        void notifYDisconnection (String message);
     }
 
     private class ByteReadException extends Exception {
@@ -80,7 +56,6 @@ public class ClientToServerThread implements Runnable {
     private Queue<StreamPacket> streamPackets = new ConcurrentLinkedQueue<>();
     private List<ClientSocketListener> listeners = new ArrayList<>();
     private List<DisconnectedFromHostListener> disconnectionListeners = new ArrayList<>();
-    private ConnectionErrorListener connectionErrorListener = null;
     private Thread thread;
 
     private Socket socket;
@@ -93,7 +68,7 @@ public class ClientToServerThread implements Runnable {
     private Timer upWindPacketTimer = new Timer();
     private Timer downWindPacketTimer = new Timer();
     private boolean upwindTimerFlag = false, downwindTimerFlag = false;
-    public static final int PACKET_SENDING_INTERVAL_MS = 100;
+    static public final int PACKET_SENDING_INTERVAL_MS = 100;
 
     private int clientId = -1;
 
@@ -128,8 +103,6 @@ public class ClientToServerThread implements Runnable {
      * variable is false.
      */
     public void run() {
-        isStarted = true;
-
         int sync1;
         int sync2;
         // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
@@ -160,12 +133,10 @@ public class ClientToServerThread implements Runnable {
                             else {
                                 if (clientId == -1) continue; // Do not continue if not registered
                                 streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
-                                synchronized (this) {
                                 for (ClientSocketListener csl : listeners)
                                     csl.newPacket();
                             }
                         }
-                        }
                     } else {
                         logger.warn("Packet has been dropped", 1);
                     }
@@ -179,11 +150,6 @@ public class ClientToServerThread implements Runnable {
         logger.warn("Closed connection to server", 1);
         notifyDisconnectListeners("Connection to server was terminated");
         closeSocket();
-
-        Platform.runLater(() -> {
-            ViewManager.getInstance().showErrorSnackBar("Server rejected connection.");
-            ViewManager.getInstance().goToStartView();
-        });
     }
 
     public void sendCustomizationRequest(CustomizeRequestType reqType, byte[] payload) {
@@ -200,22 +166,16 @@ public class ClientToServerThread implements Runnable {
     private void notifyDisconnectListeners (String message) {
         if (socketOpen) {
             for (DisconnectedFromHostListener listener : disconnectionListeners) {
-                listener.notifyDisconnection(message);
+                listener.notifYDisconnection(message);
             }
         }
     }
 
-    private void handleConnectionError(String message){
-        if (connectionErrorListener != null){
-            connectionErrorListener.notifyConnectionError(message);
-        }
-    }
-
     /**
      * Sends a request to the server asking for a source ID
      */
     private void sendRegistrationRequest() {
-        RegistrationRequestMessage requestMessage = new RegistrationRequestMessage(ClientType.PLAYER, clientId);
+        RegistrationRequestMessage requestMessage = new RegistrationRequestMessage(ClientType.PLAYER);
 
         try {
             os.write(requestMessage.getBuffer());
@@ -231,8 +191,9 @@ public class ClientToServerThread implements Runnable {
      * @param packet The registration requests packet
      */
     private void processRegistrationResponse(StreamPacket packet){
-        int sourceId = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 0, 4));
+        int sourceId = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 0, 3));
         int statusCode = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 4,5));
+
         RegistrationResponseStatus status = RegistrationResponseStatus.getResponseStatus(statusCode);
 
         if (status.equals(RegistrationResponseStatus.SUCCESS_PLAYING)){
@@ -250,10 +211,8 @@ public class ClientToServerThread implements Runnable {
         else{
             alertErrorText = "Could not connect to server";
         }
-        handleConnectionError("Server no longer available.");
         notifyDisconnectListeners(alertErrorText);
-
-        System.out.println();
+        closeSocket();
     }
 
     /**
@@ -284,7 +243,7 @@ public class ClientToServerThread implements Runnable {
                         new TimerTask() {
                             @Override
                             public void run() {
-                                sendBoatActionMessage(new BoatActionMessage(BoatAction.DOWNWIND, clientId));
+                                sendBoatActionMessage(new BoatActionMessage(BoatAction.DOWNWIND));
                             }
                         }, 0, PACKET_SENDING_INTERVAL_MS
                     );
@@ -297,14 +256,14 @@ public class ClientToServerThread implements Runnable {
                         new TimerTask() {
                             @Override
                             public void run() {
-                                sendBoatActionMessage(new BoatActionMessage(BoatAction.UPWIND, clientId));
+                                sendBoatActionMessage(new BoatActionMessage(BoatAction.UPWIND));
                             }
                         }, 0, PACKET_SENDING_INTERVAL_MS
                     );
                 }
                 break;
             default:
-                sendBoatActionMessage(new BoatActionMessage(actionType, clientId));
+                sendBoatActionMessage(new BoatActionMessage(actionType));
                 break;
         }
     }
@@ -360,32 +319,20 @@ public class ClientToServerThread implements Runnable {
     }
 
     public void addStreamObserver (ClientSocketListener streamListener) {
-        synchronized (this){
         listeners.add(streamListener);
     }
-    }
 
     public void removeStreamObserver (ClientSocketListener streamListener) {
         listeners.remove(streamListener);
     }
 
     public void addDisconnectionListener (DisconnectedFromHostListener listener) {
-        synchronized (this){
         disconnectionListeners.add(listener);
     }
-    }
 
     public void removeDisconnectionListener (DisconnectedFromHostListener listener) {
-        synchronized (this){
         disconnectionListeners.remove(listener);
     }
-    }
-
-    public void setConnectionErrorListener(ConnectionErrorListener listener){
-        synchronized (this){
-            connectionErrorListener = listener;
-        }
-    }
 
     private int readByte() throws ByteReadException {
         int currentByte = -1;
@@ -399,9 +346,8 @@ public class ClientToServerThread implements Runnable {
         }
         if (currentByte == -1) {
             notifyDisconnectListeners("Cannot read from server.");
-            logger.warn("InputStream reach end of stream", 1);
-            handleConnectionError("Could not connect to server. Server is no longer available.");
             closeSocket();
+            logger.warn("InputStream reach end of stream", 1);
         }
         return currentByte;
     }
@@ -423,29 +369,4 @@ public class ClientToServerThread implements Runnable {
     public int getClientId () {
         return clientId;
     }
-
-    public void sendXML(String path, String serverName, Integer legRepeats, Integer maxPlayers, Boolean tokensEnabled) {
-        Pair<RegattaXMLTemplate, RaceXMLTemplate> regattaRace = XMLParser.parseRaceDef(
-            path, serverName, legRepeats, maxPlayers, tokensEnabled
-        );
-        XMLGenerator xmlGenerator = new XMLGenerator();
-        xmlGenerator.setRegattaTemplate(regattaRace.getKey());
-        xmlGenerator.setRaceTemplate(regattaRace.getValue());
-        String regatta = xmlGenerator.getRegattaAsXml();
-        String race = xmlGenerator.getRaceAsXml();
-        sendByteBuffer(
-            new XMLMessage(
-                regatta, XMLMessageSubType.REGATTA, regatta.length()
-            ).getBuffer()
-        );
-        sendByteBuffer(
-            new XMLMessage(
-                race, XMLMessageSubType.RACE, race.length()
-            ).getBuffer()
-        );
-    }
-
-    public boolean hasStarted() {
-        return isStarted;
-    }
 }

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

@@ -10,15 +10,16 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import java.util.Timer;
-import java.util.TimerTask;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
-import javafx.scene.paint.Color;
 import javafx.util.Pair;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
@@ -28,8 +29,6 @@ import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.BoatStatus;
 import seng302.gameServer.messages.YachtEventType;
 import seng302.model.ClientYacht;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
 import seng302.model.RaceState;
 import seng302.model.stream.packets.StreamPacket;
 import seng302.model.stream.parser.MarkRoundingData;
@@ -39,15 +38,14 @@ import seng302.model.stream.parser.RaceStatusData;
 import seng302.model.stream.parser.YachtEventData;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.model.token.TokenType;
 import seng302.utilities.Sounds;
 import seng302.utilities.StreamParser;
 import seng302.utilities.XMLGenerator;
 import seng302.utilities.XMLParser;
+import seng302.visualiser.controllers.FinishScreenViewController;
 import seng302.visualiser.controllers.LobbyController;
 import seng302.visualiser.controllers.RaceViewController;
 import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.controllers.dialogs.PopupDialogController;
 
 /**
  * This class is a client side instance of a yacht racing game in JavaFX. The game is instantiated
@@ -66,12 +64,9 @@ public class GameClient {
     private RaceXMLData courseData;
     private RaceState raceState = new RaceState();
     private LobbyController lobbyController;
-    private RaceViewController raceViewController;
 
     private ArrayList<ClientYacht> finishedBoats = new ArrayList<>();
 
-    private GameKeyBind gameKeyBind; // all the key binding setting.
-
     private ObservableList<String> clientLobbyList = FXCollections.observableArrayList();
 
     /**
@@ -81,7 +76,17 @@ public class GameClient {
      */
     public GameClient(Pane holder) {
         this.holderPane = holder;
-        this.gameKeyBind = GameKeyBind.getInstance();
+//        if (holderPane.getParent() == null) {
+//            this.holderPane.parentProperty().addListener(((observable, oldValue, newValue) -> {
+//                if (newValue != null) {
+//                    newValue.getScene().setOnKeyPressed(this::keyPressed);
+//                    newValue.getScene().setOnKeyReleased(this::keyReleased);
+//                }
+//            }));
+//        } else {
+//            this.holderPane.getParent().getScene().setOnKeyPressed(this::keyPressed);
+//            this.holderPane.getParent().getScene().setOnKeyReleased(this::keyReleased);
+//        }
     }
 
     /**
@@ -95,6 +100,7 @@ public class GameClient {
             socketThread.addDisconnectionListener((cause) -> {
                 showConnectionError(cause);
                 tearDownConnection();
+                Platform.runLater(this::loadStartScreen);
             });
             socketThread.addStreamObserver(this::parsePackets);
 
@@ -111,75 +117,48 @@ public class GameClient {
             ViewManager.getInstance().setProperty("serverName", regattaData.getRegattaName());
             ViewManager.getInstance().setProperty("mapName", regattaData.getCourseName());
 
-            getServerThread().setConnectionErrorListener((eMessage) -> {
-                ViewManager.getInstance().showErrorSnackBar(eMessage);
-                //destroyClientToServerThread();
-            });
+            // TODO disable ready button;
 
+            //LobbyController_old lobbyController = loadLobby();
+            //lobbyController.setSocketThread(socketThread);
+            //lobbyController.setPlayerID(socketThread.getClientId());
+            //lobbyController.setPlayerListSource(clientLobbyList);
+            //lobbyController.disableReadyButton();
+
+
+
+//            lobbyController.addCloseListener((exitCause) -> this.loadStartScreen());
             this.lobbyController = ViewManager.getInstance().goToLobby(true);
 
         } catch (IOException ioe) {
-            ViewManager.getInstance().showErrorSnackBar("There are no servers currently available.");
+            showConnectionError("Unable to find server");
+            //Platform.runLater(this::loadStartScreen);
         }
     }
 
-    private void destroyClientToServerThread() {
-        socketThread.closeSocket();
-        socketThread = null;
-    }
-
     /**
      * Connect to a game as the host at the given address and starts the visualiser.
      * @param ipAddress IP to connect to.
      * @param portNumber Port to connect to.
      */
-    public ServerDescription runAsHost(
-        String ipAddress, Integer portNumber, String serverName, Integer maxPlayers, String race,
-        Integer numLegs, Boolean tokensEnabled
-    ) {
+    public ServerDescription runAsHost(String ipAddress, Integer portNumber, String serverName, Integer maxPlayers) {
         XMLGenerator.setDefaultRaceName(serverName);
+        GameState.setMaxPlayers(maxPlayers);
 
         server = new MainServerThread();
 
-        while (!server.hasStarted()){
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
         try {
             startClientToServerThread(ipAddress, 4942);
         } catch (IOException e) {
             showConnectionError("Cannot connect to server as host");
         }
 
-        // Wait for C2S thread
-        while (!socketThread.hasStarted()){
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        socketThread.sendXML(race, serverName, numLegs, maxPlayers, tokensEnabled);
-
-        int triesLeft = 15;
-
-        while (regattaData == null && triesLeft > 0){
+        while (regattaData == null){
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            triesLeft--;
-        }
-
-        if (triesLeft <= 0){
-            showConnectionError("Could not launch server");
-            return null;
         }
 
         this.lobbyController = ViewManager.getInstance().goToLobby(false);
@@ -196,15 +175,23 @@ public class GameClient {
         }
     }
 
+    private void loadStartScreen() {
+        FXMLLoader fxmlLoader = new FXMLLoader(
+            getClass().getResource("/views/StartScreenView.fxml"));
+        try {
+            holderPane.getChildren().clear();
+            holderPane.getChildren().add(fxmlLoader.load());
+        } catch (IOException e) {
+            showConnectionError("JavaFX crashed. Please restart the app");
+        }
+    }
 
     private void showConnectionError (String message) {
         Platform.runLater(() -> {
-            PopupDialogController controller = ViewManager.getInstance().showPopupDialog();
-            controller.setHeader("Oops");
-            controller.setContent(message);
-            controller.setOptionButtonText("GO HOME");
-            controller
-                .setOptionButtonEventHandler(event -> ViewManager.getInstance().goToStartView());
+            Alert alert = new Alert(AlertType.ERROR);
+            alert.setHeaderText("Connection Error");
+            alert.setContentText(message);
+            alert.showAndWait();
         });
     }
 
@@ -213,8 +200,41 @@ public class GameClient {
         socketThread.addStreamObserver(this::parsePackets);
     }
 
-    public void setRaceViewController(RaceViewController controller) {
-        this.raceViewController = controller;
+    private void loadRaceView() {
+        FXMLLoader fxmlLoader = loadFXMLToHolder("/views/RaceView.fxml");
+        holderPane.getScene().setOnKeyPressed(this::keyPressed);
+        holderPane.getScene().setOnKeyReleased(this::keyReleased);
+        raceView = fxmlLoader.getController();
+        ClientYacht player = allBoatsMap.get(socketThread.getClientId());
+        raceView.loadRace(allBoatsMap, courseData, raceState, player);
+
+    }
+
+
+
+    private void loadFinishScreenView() {
+        Sounds.stopMusic();
+        Sounds.stopSoundEffects();
+        Sounds.playFinishMusic();
+        FXMLLoader fxmlLoader = loadFXMLToHolder("/views/FinishScreenView.fxml");
+        FinishScreenViewController controller = fxmlLoader.getController();
+        controller.setFinishers(raceState.getPlayerPositions());
+    }
+
+    private FXMLLoader loadFXMLToHolder(String fxmlLocation) {
+        FXMLLoader fxmlLoader = new FXMLLoader(
+            getClass().getResource(fxmlLocation)
+        );
+        try {
+            final Node fxmlLoaderFX = fxmlLoader.load();
+            Platform.runLater(() -> {
+                holderPane.getChildren().clear();
+                holderPane.getChildren().add(fxmlLoaderFX);
+            });
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return fxmlLoader;
     }
 
     private void parsePackets() {
@@ -282,7 +302,12 @@ public class GameClient {
                     break;
 
                 case YACHT_EVENT_CODE:
-                    processYachtEvent(StreamParser.extractYachtEventCode(packet));
+                    YachtEventData yachtEventData = StreamParser.extractYachtEventCode(packet);
+                    if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
+                        showCollisionAlert(StreamParser.extractYachtEventCode(packet));
+                    } else if (yachtEventData.getEventId() == YachtEventType.TOKEN.getCode()) {
+                        showPickUp();
+                    }
                     break;
 
                 case CHATTER_TEXT:
@@ -302,14 +327,12 @@ public class GameClient {
 
             ClientYacht player = allBoatsMap.get(socketThread.getClientId());
             raceView.loadRace(allBoatsMap, courseData, raceState, player);
-            raceView.showView();
+
             raceView.getSendPressedProperty().addListener((obs, old, isPressed) -> {
                 if (isPressed) {
                     formatAndSendChatMessage(raceView.readChatInput());
                 }
             });
-            gameKeyBind.toggleTurningMode();
-            sendToggleTurningModePacket(); // notify the server about player's steering mode
         }
     }
 
@@ -375,13 +398,10 @@ public class GameClient {
             }
 
             if (raceFinished) {
-                raceViewController.showFinishDialog(finishedBoats);
                 Sounds.playFinishSound();
                 close();
-                ViewManager.getInstance().getGameClient().stopGame();
-                //loadFinishScreenView();
+                loadFinishScreenView();
             }
-            raceState.setRaceFinished();
         }
     }
 
@@ -396,6 +416,7 @@ public class GameClient {
         socketThread.setSocketToClose();
     }
 
+
     /**
      * Handle the key-pressed event from the text field.
      * @param e The key event triggering this call
@@ -407,16 +428,16 @@ public class GameClient {
             }
             return;
         }
-
-        if (gameKeyBind.getKeyCode(KeyAction.VMG) == e.getCode()) { // align with vmg
-            socketThread.sendBoatAction(BoatAction.VMG);
-        } else if (gameKeyBind.getKeyCode(KeyAction.UPWIND) == e.getCode()) { // upwind
-            socketThread.sendBoatAction(BoatAction.UPWIND);
-        } else if (gameKeyBind.getKeyCode(KeyAction.DOWNWIND) == e.getCode()) { // downwind
-            socketThread.sendBoatAction(BoatAction.DOWNWIND);
-        } else if (gameKeyBind.getKeyCode(KeyAction.TACK_GYBE) == e.getCode()) { // tack/gybe
+        switch (e.getCode()) {
+            case SPACE: // align with vmg
+                socketThread.sendBoatAction(BoatAction.VMG); break;
+            case PAGE_UP: // upwind
+                socketThread.sendBoatAction(BoatAction.UPWIND); break;
+            case PAGE_DOWN: // downwind
+                socketThread.sendBoatAction(BoatAction.DOWNWIND); break;
+            case ENTER: // tack/gybe
                 // if chat box is active take whatever is in there and send it to server
-            socketThread.sendBoatAction(BoatAction.TACK_GYBE);
+                socketThread.sendBoatAction(BoatAction.TACK_GYBE); break;
         }
     }
 
@@ -425,17 +446,15 @@ public class GameClient {
         if (raceView.isChatInputFocused()) {
             return;
         }
-
-        if (gameKeyBind.getKeyCode(KeyAction.SAILS_STATE) == e.getCode()) {  // sails in/sails out
-            if (allBoatsMap.get(socketThread.getClientId()).getSailIn()) {
-                socketThread.sendBoatAction(BoatAction.SAILS_OUT);
-            } else {
+        switch (e.getCode()) {
+            //TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet)
+            case SHIFT:  // sails in/sails out
                 socketThread.sendBoatAction(BoatAction.SAILS_IN);
-            }
                 allBoatsMap.get(socketThread.getClientId()).toggleSail();
-        } else if (gameKeyBind.getKeyCode(KeyAction.UPWIND) == e.getCode()
-            || gameKeyBind.getKeyCode(KeyAction.DOWNWIND) == e.getCode()) {
-            socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING);
+                break;
+            case PAGE_UP:
+            case PAGE_DOWN:
+                socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break;
         }
     }
 
@@ -443,66 +462,21 @@ public class GameClient {
         return courseData;
     }
 
-
-    /**
-     * Appropriately displays the event client side given the YachtEventCode (collision / token..)
-     *
-     * @param yachtEventData The YachtEvent data packet
-     */
-    private void processYachtEvent(YachtEventData yachtEventData) {
-        ClientYacht thisYacht = allBoatsMap.get(yachtEventData.getSubjectId().intValue());
-
-        if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
-            showCollisionAlert(thisYacht);
-        } else if (yachtEventData.getEventId() == YachtEventType.POWER_DOWN.getCode()) {
-            thisYacht.powerDown();
-            Sounds.playTokenPickupSound();  // TODO: 23/09/17 This should be power down sound
-        } else if (yachtEventData.getEventId() == YachtEventType.BUMPER_CRASH.getCode()) {
-            showDisableAlert(thisYacht);
-        } else {        //Else all token pickup types
-            TokenType tokenType = null;
-            if (yachtEventData.getEventId() == YachtEventType.TOKEN_VELOCITY.getCode()) {
-                tokenType = TokenType.BOOST;
-            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_BUMPER.getCode()) {
-                tokenType = TokenType.BUMPER;
-            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_HANDLING.getCode()) {
-                tokenType = TokenType.HANDLING;
-            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_RANDOM.getCode()) {
-                tokenType = TokenType.RANDOM;
-            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_WIND_WALKER.getCode()) {
-                tokenType = TokenType.WIND_WALKER;
-            }
-
-            Sounds.playTokenPickupSound();
-            thisYacht.setPowerUp(tokenType);
-        }
-    }
-
-
-    /**
-     * Turns a disabled boat black until the bumper affect wears off
-     *
-     * @param yacht The yacht to show as disabled
-     */
-    private void showDisableAlert(ClientYacht yacht) {
-        Color originalColor = yacht.getColour();
-        yacht.setColour(Color.BLACK);
-
-        Timer disableTimer = new Timer("Disable Timer");
-        disableTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                yacht.setColour(originalColor);
-            }
-        }, GameState.BUMPER_DISABLE_TIME);
-    }
-
     /**
      * Tells race view to show a collision animation.
      */
-    private void showCollisionAlert(ClientYacht yacht) {
+    private void showCollisionAlert(YachtEventData yachtEventData) {
         Sounds.playCrashSound();
-        raceState.storeCollision(yacht);
+        raceState.storeCollision(
+            allBoatsMap.get(
+                yachtEventData.getSubjectId().intValue()
+            )
+        );
+    }
+
+    // TODO: 11/09/17 wmu16 - Add in functionality to viually indicate a pickup to a user
+    private void showPickUp() {
+        Sounds.playTokenPickupSound();
     }
 
     private void formatAndSendChatMessage(String rawChat) {
@@ -530,21 +504,9 @@ public class GameClient {
         GameState.setCurrentStage(GameStages.CANCELLED);
         if (server != null) server.terminate();
         if (socketThread != null) socketThread.setSocketToClose();
-        server = null;
-//        socketThread = null;
     }
 
     public Map<Integer, ClientYacht> getAllBoatsMap() {
         return allBoatsMap;
     }
-
-    public void sendToggleTurningModePacket() {
-        if (socketThread != null) {
-            if (gameKeyBind.isContinuouslyTurning()) {
-                socketThread.sendBoatAction(BoatAction.CONTINUOUSLY_TURNING);
-            } else {
-                socketThread.sendBoatAction(BoatAction.DEFAULT_TURNING);
-            }
-        }
-    }
 }

src/main/java/seng302/visualiser/GameView.java

@@ -1,31 +1,442 @@
 package seng302.visualiser;
 
-import java.util.ArrayList;
-import java.util.List;
-import javafx.scene.Group;
-import javafx.scene.Node;
+import javafx.application.Platform;
+import javafx.collections.ObservableList;
+import javafx.geometry.Point2D;
+import javafx.scene.*;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Polygon;
+import seng302.gameServer.messages.RoundingSide;
+import seng302.model.GeoPoint;
 import seng302.model.Limit;
-import seng302.model.ScaledPoint;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
+import seng302.model.mark.Mark;
+import seng302.utilities.GeoUtility;
+import seng302.visualiser.fxObjects.assets_2D.*;
+
+import java.util.*;
 
 /**
- * Abstract class for keeping functionality common between race visualisation.
+ * Created by cir27 on 20/07/17.
  */
-public abstract class GameView {
+public class GameView extends Pane {
 
-    double canvasWidth, canvasHeight;
-    ScaledPoint scaledPoint;
+    private double bufferSize = 50;
+    private double horizontalBuffer = 0;
 
-    List<Limit> borderPoints;
-    Group gameObjects = new Group();
-    Group markers = new Group();
-    Group tokens = new Group();
-    List<CompoundMark> course = new ArrayList<>();
-    List<CompoundMark> compoundMarks = new ArrayList<>();
-    List<Corner> courseOrder = new ArrayList<>();
+    private double canvasWidth = 1100;
+    private double canvasHeight = 920;
+    private boolean horizontalInversion = false;
 
-    public abstract Node getAssets();
-    public abstract void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence);
-    public abstract void updateBorder(List<Limit> border);
+    private double distanceScaleFactor;
+    private ScaleDirection scaleDirection;
+    private GeoPoint minLatPoint, minLonPoint, maxLatPoint, maxLonPoint;
+    private double referencePointX, referencePointY;
+
+    private Polygon raceBorder = new CourseBoundary();
+
+    /* Note that if either of these is null then values for it have not been added and the other
+       should be used as the limits of the map. */
+    private List<Limit> borderPoints;
+    private Map<Mark, Marker2D> markerObjects;
+
+    private ObservableList<Node> gameObjects;
+    private Group markers = new Group();
+    private Group tokens = new Group();
+    private List<CompoundMark> course = new ArrayList<>();
+
+    private ImageView mapImage = new ImageView();
+
+    private enum ScaleDirection {
+        HORIZONTAL,
+        VERTICAL
+    }
+
+    public GameView () {
+        gameObjects = this.getChildren();
+        gameObjects.addAll(mapImage, raceBorder, markers, tokens);
+    }
+
+    /**
+     * Adds a course to the GameView. The view is scaled accordingly unless a border is set in which
+     * case the course is added relative ot the border.
+     *
+     * @param newCourse the mark objects that make up the course.
+     * @param sequence The sequence the marks travel through
+     */
+    public void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence) {
+        markerObjects = new HashMap<>();
+
+        for (Corner corner : sequence) { //Makes course out of all compound marks.
+            for (CompoundMark compoundMark : newCourse) {
+                if (corner.getCompoundMarkID() == compoundMark.getId()) {
+                    course.add(compoundMark);
+                }
+            }
+        }
+
+        // TODO: 16/08/17 Updating mark roundings here. It should not happen here. Nor should it be done this way.
+        for (Corner corner : sequence){
+            CompoundMark compoundMark = course.get(corner.getSeqID() - 1);
+            compoundMark.setRoundingSide(
+                RoundingSide.getRoundingSide(corner.getRounding())
+            );
+        }
+
+        final List<Gate> gates = new ArrayList<>();
+        Paint colour = Color.BLACK;
+        //Creates new markers
+        for (CompoundMark cMark : newCourse) {
+            //Set start and end colour
+            if (cMark.getId() == sequence.get(0).getCompoundMarkID()) {
+                colour = Color.GREEN;
+            } else if (cMark.getId() == sequence.get(sequence.size() - 1).getCompoundMarkID()) {
+                colour = Color.RED;
+            }
+            //Create mark dots
+            for (Mark mark : cMark.getMarks()) {
+                makeAndBindMarker(mark, colour);
+            }
+            //Create gate line
+            if (cMark.isGate()) {
+                for (int i = 1; i < cMark.getMarks().size(); i++) {
+                    gates.add(
+                        makeAndBindGate(
+                            markerObjects.get(cMark.getSubMark(i)),
+                            markerObjects.get(cMark.getSubMark(i + 1)),
+                            colour
+                        )
+                    );
+                }
+            }
+            colour = Color.BLACK;
+        }
+
+        createMarkArrows(sequence);
+
+        //Scale race to markers if there is no border.
+        if (borderPoints == null) {
+            rescaleRace(new ArrayList<>(markerObjects.keySet()));
+        }
+        //Move the Markers to initial position.
+        markerObjects.forEach(((mark, marker2D) -> {
+            Point2D p2d = findScaledXY(mark.getLat(), mark.getLng());
+            marker2D.setLayoutX(p2d.getX());
+            marker2D.setLayoutY(p2d.getY());
+        }));
+        Platform.runLater(() -> {
+            markers.getChildren().clear();
+            markers.getChildren().addAll(gates);
+            markers.getChildren().addAll(markerObjects.values());
+        });
+    }
+
+    /**
+     * 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) {
+        for (int i=1; i < sequence.size()-1; i++) { //General case.
+            double averageLat = 0;
+            double averageLng = 0;
+            int numMarks = course.get(i-1).getMarks().size();
+            for (Mark mark : course.get(i-1).getMarks()) {
+                averageLat += mark.getLat();
+                averageLng += mark.getLng();
+            }
+            GeoPoint lastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+            numMarks = course.get(i+1).getMarks().size();
+            averageLat = 0;
+            averageLng = 0;
+            for (Mark mark : course.get(i+1).getMarks()) {
+                averageLat += mark.getLat();
+                averageLng += mark.getLng();
+            }
+            GeoPoint nextMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+            // TODO: 16/08/17 This comparison doesn't need to exist but the alternative is to user server enum client side.
+            for (Mark mark : course.get(i).getMarks()) {
+                markerObjects.get(mark).addArrows(
+                    mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
+                    GeoUtility.getBearing(lastMarkAv, mark),
+                    GeoUtility.getBearing(mark, nextMarkAv)
+                );
+            }
+        }
+        createStartLineArrows();
+        createFinishLineArrows();
+    }
+
+    private void createStartLineArrows () {
+        double averageLat = 0;
+        double averageLng = 0;
+        int numMarks = 0;
+        for (Mark mark : course.get(1).getMarks()) {
+            numMarks += 1;
+            averageLat += mark.getLat();
+            averageLng += mark.getLng();
+        }
+        GeoPoint firstMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+        for (Mark mark : course.get(0).getMarks()) {
+            markerObjects.get(mark).addArrows(
+                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
+                0d, //90
+                GeoUtility.getBearing(mark, firstMarkAv)
+            );
+        }
+    }
+
+    private void createFinishLineArrows () {
+        double numMarks = 0;
+        double averageLat = 0;
+        double averageLng = 0;
+        for (Mark mark : course.get(course.size()-2).getMarks()) {
+            numMarks += 1;
+            averageLat += mark.getLat();
+            averageLng += mark.getLng();
+        }
+        GeoPoint secondToLastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
+        for (Mark mark : course.get(course.size()-1).getMarks()) {
+            markerObjects.get(mark).addArrows(
+                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
+                GeoUtility.getBearing(secondToLastMarkAv, mark),
+                GeoUtility.getBearing(mark, mark)
+            );
+        }
+    }
+
+    /**
+     * Creates a new Marker and binds it's position to the given Mark.
+     *
+     * @param observableMark The mark to bind the marker to.
+     * @param colour The desired colour of the mark
+     */
+    private void makeAndBindMarker(Mark observableMark, Paint colour) {
+        Marker2D marker2D = new Marker2D(colour);
+//        marker.addArrows(MarkArrowFactory.RoundingSide.PORT, ThreadLocalRandom.current().nextDouble(91, 180), ThreadLocalRandom.current().nextDouble(1, 90));
+        markerObjects.put(observableMark, marker2D);
+        observableMark.addPositionListener((mark, lat, lon) -> {
+            Point2D p2d = findScaledXY(lat, lon);
+            markerObjects.get(mark).setLayoutX(p2d.getX());
+            markerObjects.get(mark).setLayoutY(p2d.getY());
+        });
+    }
+
+    /**
+     * Creates a new gate connecting the given marks.
+     *
+     * @param m1 The first Mark of the gate.
+     * @param m2 The second Mark of the gate.
+     * @param colour The desired colour of the gate.
+     * @return the new gate.
+     */
+    private Gate makeAndBindGate(Marker2D m1, Marker2D m2, Paint colour) {
+        Gate gate = new Gate(colour);
+        gate.startXProperty().bind(
+            m1.layoutXProperty()
+        );
+        gate.startYProperty().bind(
+            m1.layoutYProperty()
+        );
+        gate.endXProperty().bind(
+            m2.layoutXProperty()
+        );
+        gate.endYProperty().bind(
+            m2.layoutYProperty()
+        );
+        return gate;
+    }
+
+    /**
+     * Adds a border to the GameView and rescales to the size of the border, does not rescale if a
+     * border already exists. Assumes the border is larger than the course.
+     *
+     * @param border the race border to be drawn.
+     */
+    public void updateBorder(List<Limit> border) {
+        if (borderPoints == null) {
+            borderPoints = border;
+            rescaleRace(new ArrayList<>(borderPoints));
+        }
+
+        rescaleRace(new ArrayList<>(border));
+
+        List<Double> boundaryPoints = new ArrayList<>();
+        for (Limit limit : border) {
+            Point2D location = findScaledXY(limit.getLat(), limit.getLng());
+            boundaryPoints.add(location.getX());
+            boundaryPoints.add(location.getY());
+        }
+        raceBorder.getPoints().setAll(boundaryPoints);
+    }
+
+    /**
+     * Rescales the race to the size of the window.
+     *
+     * @param limitingCoordinates the set of geo points that contains the extremities of the race.
+     */
+    public void rescaleRace(List<GeoPoint> limitingCoordinates) {
+        //Check is called once to avoid unnecessarily change the course limits once the race is running
+        findMinMaxPoint(limitingCoordinates);
+        double minLonToMaxLon = scaleRaceExtremities();
+        calculateReferencePointLocation(minLonToMaxLon);
+    }
+
+    /**
+     * Sets the class variables minLatPoint, maxLatPoint, minLonPoint, maxLonPoint to the point with
+     * the leftmost point, rightmost point, southern most point and northern most point
+     * respectively.
+     */
+    private void findMinMaxPoint(List<GeoPoint> points) {
+        List<GeoPoint> sortedPoints = new ArrayList<>(points);
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLat));
+        minLatPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLat = sortedPoints.get(sortedPoints.size() - 1);
+        maxLatPoint = new GeoPoint(maxLat.getLat(), maxLat.getLng());
+
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLng));
+        minLonPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLon = sortedPoints.get(sortedPoints.size() - 1);
+        maxLonPoint = new GeoPoint(maxLon.getLat(), maxLon.getLng());
+        if (maxLonPoint.getLng() - minLonPoint.getLng() > 180) {
+            horizontalInversion = true;
+        }
+    }
+
+    /**
+     * Calculates the location of a reference point, this is always the point with minimum latitude,
+     * in relation to the canvas.
+     *
+     * @param minLonToMaxLon The horizontal distance between the point of minimum longitude to
+     * maximum longitude.
+     */
+    private void calculateReferencePointLocation(double minLonToMaxLon) {
+        GeoPoint referencePoint = minLatPoint;
+        double referenceAngle;
+
+        if (scaleDirection == ScaleDirection.HORIZONTAL) {
+            referenceAngle = Math.abs(
+                GeoUtility.getBearingRad(referencePoint, minLonPoint)
+            );
+            referencePointX =
+                bufferSize + distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                    .getDistance(referencePoint, minLonPoint);
+            referenceAngle = Math.abs(GeoUtility.getDistance(referencePoint, maxLatPoint));
+            referencePointY = canvasHeight - (bufferSize + bufferSize);
+            referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+            referencePointY = referencePointY / 2;
+            referencePointY += bufferSize;
+            referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+        } else {
+            referencePointY = canvasHeight - bufferSize;
+            referenceAngle = Math.abs(
+                Math.toRadians(
+                    GeoUtility.getDistance(referencePoint, minLonPoint)
+                )
+            );
+            referencePointX = bufferSize;
+            referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, minLonPoint);
+            referencePointX +=
+                ((canvasWidth - (bufferSize + bufferSize)) - (minLonToMaxLon * distanceScaleFactor))
+                    / 2;
+            referencePointX += horizontalBuffer;
+        }
+        if (horizontalInversion) {
+            referencePointX = canvasWidth - bufferSize - (referencePointX - bufferSize);
+        }
+    }
+
+
+    /**
+     * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns
+     * it to distanceScaleFactor Returns the max horizontal distance of the map.
+     */
+    private double scaleRaceExtremities() {
+
+        double vertAngle = Math.abs(
+            GeoUtility.getBearingRad(minLatPoint, maxLatPoint)
+        );
+        double vertDistance =
+            Math.cos(vertAngle) * GeoUtility.getDistance(minLatPoint, maxLatPoint);
+        double horiAngle = Math.abs(
+            GeoUtility.getBearingRad(minLonPoint, maxLonPoint)
+        );
+        if (horiAngle <= (Math.PI / 2)) {
+            horiAngle = (Math.PI / 2) - horiAngle;
+        } else {
+            horiAngle = horiAngle - (Math.PI / 2);
+        }
+        double horiDistance =
+            Math.cos(horiAngle) * GeoUtility.getDistance(minLonPoint, maxLonPoint);
+
+        double vertScale = (canvasHeight - (bufferSize + bufferSize)) / vertDistance;
+
+        if ((horiDistance * vertScale) > (canvasWidth - (bufferSize + bufferSize))) {
+            distanceScaleFactor = (canvasWidth - (bufferSize + bufferSize)) / horiDistance;
+            scaleDirection = ScaleDirection.HORIZONTAL;
+        } else {
+            distanceScaleFactor = vertScale;
+            scaleDirection = ScaleDirection.VERTICAL;
+        }
+        return horiDistance;
+    }
+
+    private Point2D findScaledXY(double unscaledLat, double unscaledLon) {
+        double distanceFromReference;
+        double angleFromReference;
+        double xAxisLocation = referencePointX;
+        double yAxisLocation = referencePointY;
+
+        angleFromReference = GeoUtility.getBearingRad(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        distanceFromReference = GeoUtility.getDistance(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
+            xAxisLocation += Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+            yAxisLocation -= Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+        } else if (angleFromReference >= 0) {
+            angleFromReference = angleFromReference - Math.PI / 2;
+            xAxisLocation += Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+            yAxisLocation += Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
+            angleFromReference = Math.abs(angleFromReference);
+            xAxisLocation -= Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+            yAxisLocation -= Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+        } else {
+            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
+            xAxisLocation -= Math
+                .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
+            yAxisLocation += Math
+                .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
+        }
+        if (horizontalInversion) {
+            xAxisLocation = canvasWidth - bufferSize - (xAxisLocation - bufferSize);
+        }
+        return new Point2D(xAxisLocation, yAxisLocation);
+    }
+
+
+    public void setSize(Double width, Double height){
+        this.canvasWidth = width;
+        this.canvasHeight = height;
+    }
+
+    public void setHorizontalBuffer(Double buff){
+        this.horizontalBuffer = buff;
+    }
 }

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

@@ -2,48 +2,43 @@ package seng302.visualiser;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
-import javafx.beans.value.ObservableValue;
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
-import javafx.scene.Camera;
+import javafx.scene.AmbientLight;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.PerspectiveCamera;
+import javafx.scene.PointLight;
 import javafx.scene.SceneAntialiasing;
 import javafx.scene.SubScene;
-import javafx.scene.image.Image;
+import javafx.scene.effect.BlendMode;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Sphere;
+import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
-import org.fxyz3d.scene.Skybox;
 import seng302.gameServer.messages.RoundingSide;
 import seng302.model.ClientYacht;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
+import seng302.model.GeoPoint;
 import seng302.model.Limit;
-import seng302.model.ScaledPoint;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
 import seng302.model.token.Token;
 import seng302.utilities.GeoUtility;
-import seng302.utilities.Sounds;
-import seng302.visualiser.cameras.ChaseCamera;
-import seng302.visualiser.cameras.IsometricCamera;
-import seng302.visualiser.cameras.RaceCamera;
-import seng302.visualiser.cameras.TopDownCamera;
-import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.fxObjects.MarkArrowFactory;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
-import seng302.visualiser.fxObjects.assets_3D.Marker3D;
-import seng302.visualiser.fxObjects.assets_3D.Model;
+import seng302.visualiser.fxObjects.assets_2D.BoatObject;
 import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
 import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
@@ -51,78 +46,241 @@ import seng302.visualiser.fxObjects.assets_3D.ModelType;
  * Collection of animated3D assets that displays a race.
  */
 
-public class GameView3D extends GameView {
+public class GameView3D {
 
     private final double FOV = 60;
-    private final double DEFAULT_CAMERA_X = 0;
-    private final double DEFAULT_CAMERA_Y = 100;
+    private final double DEFAULT_CAMERA_DEPTH = 100;
 
     private Group root3D;
     private SubScene view;
+//    ParallelCamera camera;
+    private PerspectiveCamera camera;
     private Group gameObjects;
 
+    private double bufferSize = 0;
+    private double canvasWidth = 200;
+    private double canvasHeight = 200;
+    private boolean horizontalInversion = false;
+
+
+
+
+    private double distanceScaleFactor;
+    private ScaleDirection scaleDirection;
+    private GeoPoint minLatPoint, minLonPoint, maxLatPoint, maxLonPoint;
+    private double referencePointX, referencePointY;
+    private double metersPerPixelX, metersPerPixelY;
+
+    final double SCALE_DELTA = 1.1;
+
+    private Text fpsDisplay = new Text();
     private Group raceBorder = new Group();
-    // Cameras
-    private PerspectiveCamera isometricCam;
-    private PerspectiveCamera topDownCam;
-    private PerspectiveCamera chaseCam;
 
     /* Note that if either of these is null then values for it have not been added and the other
        should be used as the limits of the map. */
-    private Map<Mark, Marker3D> markerObjects;
+    private List<Limit> borderPoints;
+    private Map<Mark, Group> markerObjects;
 
-    private BoatObject playerBoat;
     private Map<ClientYacht, BoatObject> boatObjects = new HashMap<>();
+    private BoatObject selectedBoat = null;
     private Group wakesGroup = new Group();
     private Group boatObjectGroup = new Group();
+    private Group markers = new Group();
+    private Group tokens = new Group();
+    private Group playerAnnotation = new Group();
+    private List<CompoundMark> course = new ArrayList<>();
     private List<Node> mapTokens;
-    private AnimationTimer playerBoatAnimationTimer;
+    private Timer playerBoatAnimationTimer = new Timer();
     private Group trail = new Group();
-    private Double windDir;
-    private Skybox skybox;
+    private ImageView mapImage = new ImageView();
 
-    public GameView3D () {
-        isometricCam = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y);
-        topDownCam = new TopDownCamera();
-        chaseCam = new ChaseCamera();
+    //FRAME RATE
 
-        canvasWidth = canvasHeight = 300;
+    private AnimationTimer timer;
+    private int NUM_SAMPLES = 10;
+    private final long[] frameTimes = new long[NUM_SAMPLES];
+    private Double frameRate = 60.0;
+    private int frameTimeIndex = 0;
+    private boolean arrayFilled = false;
+    private ClientYacht playerYacht;
+    private double windDir = 0.0;
 
-        for (PerspectiveCamera pc : Arrays.asList(isometricCam, topDownCam, chaseCam)) {
-            pc.setFarClip(100000);
-            pc.setNearClip(0.1);
-            pc.setFieldOfView(FOV);
+    double scaleFactor = 1;
+
+    private enum ScaleDirection {
+        HORIZONTAL,
+        VERTICAL
     }
 
-        gameObjects = new Group();
-        root3D = new Group(isometricCam, gameObjects);
-        view = new SubScene(
-            root3D, 5000, 3000, true, SceneAntialiasing.BALANCED
+
+
+
+    public GameView3D () {
+        camera = new PerspectiveCamera(true);
+//        camera = new ParallelCamera();
+//        gameObjects.getTransforms().add(new Scale(4,4,4));
+//        camera.setLayoutX(camera.getLayoutX()-400);
+//        camera.setLayoutY(camera.getLayoutY()-400);
+        camera.getTransforms().addAll(
+            new Translate(0,0, -DEFAULT_CAMERA_DEPTH)
         );
-        view.setCamera(isometricCam);
+        camera.setFarClip(Double.MAX_VALUE);
+        camera.setNearClip(0.1);
+        camera.setFieldOfView(FOV);
+        gameObjects = new Group();
+        PointLight pl = new PointLight(Color.DARKGRAY);
+        pl.setLightOn(true);
+        pl.setBlendMode(BlendMode.ADD);
+        pl.setOpacity(0.5);
+        pl.getTransforms().add(new Translate(0,0,-500));
+        AmbientLight al = new AmbientLight();
+        al.setLightOn(true);
+        al.setBlendMode(BlendMode.SOFT_LIGHT);
+        al.getTransforms().add(new Translate(0, 0, -100));
+        root3D = new Group(camera, gameObjects);
+        view = new SubScene(
+            root3D, 1000, 1000, true, SceneAntialiasing.BALANCED
+        );
+        view.setCamera(camera);
+//        view.setFill(Color.LIGHTBLUE);
+        camera.getTransforms().add(new Rotate(30, new Point3D(1,0,0)));
+//        gameObjects.getChildren().addAll(raceBorder, markers, tokens);
+        System.out.println(camera.getLayoutX());
+        System.out.println(camera.getTranslateX());
+        System.out.println(camera.getLayoutY());
+        System.out.println(camera.getTranslateY());
+        System.out.println(camera.getTranslateZ());
+        camera.setTranslateZ(-80);
+        camera.setTranslateY(170);
+        Sphere red = new Sphere(1);
+        red.setMaterial(new PhongMaterial(Color.RED));
+        red.setLayoutX(0);
+        red.setLayoutY(0);
 
-        skybox = new Skybox(new Image(getClass().getResourceAsStream("/images/skybox.jpg")), 100000, isometricCam);
-        skybox.getTransforms().addAll(new Rotate(90, Rotate.X_AXIS));
+        Sphere blue = new Sphere(1);
+        blue.setMaterial(new PhongMaterial(Color.BLUE));
+        blue.setLayoutX(1);
+        blue.setLayoutY(0);
 
-        Model land = ModelFactory.importModel(ModelType.LAND_SMOOTH);
-        land.getAssets().getTransforms().add(new Rotate(90, Rotate.X_AXIS));
+        Sphere green = new Sphere(1);
+        green.setMaterial(new PhongMaterial(Color.GREEN));
+        green.setLayoutX(-.5);
+        green.setLayoutY(0);
+
+        Sphere white = new Sphere(1);
+        white.setMaterial(new PhongMaterial(Color.WHITE));
+        white.setLayoutX(-.25);
+        white.setLayoutY(0);
+
+        Sphere black = new Sphere(1);
+        black.setMaterial(new PhongMaterial(Color.BLACK));
+        black.setLayoutX(-.125);
+        black.setLayoutY(0);
 
         gameObjects.getChildren().addAll(
-            raceBorder, trail, markers, tokens, skybox, land.getAssets()
+//            ModelFactory.importModel(ModelType.OCEAN).getAssets(),
+            raceBorder, trail, markers, tokens, playerAnnotation,
+            white, blue, green, black, red
         );
 
+        System.out.println(camera.getLayoutX());
+        System.out.println(camera.getTranslateX());
+        System.out.println(camera.getLayoutY());
+        System.out.println(camera.getTranslateY());
+        System.out.println(camera.getTranslateZ());
+//        Sphere s = new Sphere(1);
+//        s.setMaterial(new PhongMaterial(Color.RED));
+//        Sphere left = new Sphere(1);
+//        left.setMaterial(new PhongMaterial(Color.LEMONCHIFFON));
+//        left.getTransforms().add(new Translate(-Math.tan(Math.toRadians(FOV / 2)) * DEFAULT_CAMERA_DEPTH, 0, 0));
+//        Sphere right = new Sphere(1);
+//        right.setMaterial(new PhongMaterial(Color.ROSYBROWN));
+//        right.getTransforms().add(new Translate(Math.tan(Math.toRadians(FOV / 2)) * DEFAULT_CAMERA_DEPTH, 0, 0));
+//        Sphere top = new Sphere(1);
+//        top.setMaterial(new PhongMaterial(Color.TEAL));
+//        top.getTransforms().add(new Translate(0,-Math.tan(Math.toRadians(FOV / 2)) * DEFAULT_CAMERA_DEPTH, 0));
+//        Sphere bottom = new Sphere(1);
+//        bottom.setMaterial(new PhongMaterial(Color.BLANCHEDALMOND));
+//        bottom.getTransforms().add(new Translate(0, Math.tan(Math.toRadians(FOV / 2)) * DEFAULT_CAMERA_DEPTH, 0));
+//
+//        Node boat = ModelFactory.boatGameView(BoatMeshType.DINGHY, Color.BLUE).getAssets();
+//        Node boat2 = ModelFactory.boatGameView(BoatMeshType.DINGHY, Color.BROWN).getAssets();
+//        boat2.getTransforms().add(new Translate(0,20, 0));
+//        Node boat3 = ModelFactory.boatGameView(BoatMeshType.DINGHY, Color.RED).getAssets();
+//        boat3.getTransforms().add(new Translate(0,-20, 0));
+//
+//        Node sMarker = ModelFactory.importModel(ModelType.START_MARKER).getAssets();
+//        sMarker.getTransforms().add(0, new Translate(30, 30, 0));
+//
+//        Node fMarker = ModelFactory.importModel(ModelType.FINISH_MARKER).getAssets();
+//        fMarker.getTransforms().add(0, new Translate(30, -30, 0));
+//
+//        Node marker = ModelFactory.importModel(ModelType.PLAIN_MARKER).getAssets();
+//        marker.getTransforms().add(0, new Translate(30, 0, 0));
+//
+//        Node coin = ModelFactory.importModel(ModelType.VELOCITY_PICKUP).getAssets();
+//        coin.setTranslateX(coin.getTranslateX() - 30);
+//
+//        gameObjects.getChildren().addAll(
+//            ModelFactory.importModel(ModelType.OCEAN).getAssets(),
+//            s, left, right, top, bottom,
+//            boat, boat2, boat3,
+//            sMarker, fMarker, marker,
+//            coin
+//        );
 
         view.sceneProperty().addListener((obs, old, scene) -> {
             if (scene != null) {
                 scene.addEventHandler(KeyEvent.KEY_PRESSED, this::cameraMovement);
             }
         });
+
+        initializeTimer();
     }
 
+    private void initializeTimer() {
+        Arrays.fill(frameTimes, 1_000_000_000 / 60);
+        timer = new AnimationTimer() {
+            private long lastTime = 0;
+            private int FPSCount = 30;
+            private Double frameRate = 60.0;
+            private int index = 0;
+            private boolean arrayFilled = false;
+            private long sum = 1_000_000_000 / 3;
+
             @Override
+            public void handle(long now) {
+                System.out.println(now);
+                if (lastTime == 0) {
+                    lastTime = now;
+                } else {
+                    if (now - lastTime >= (1e8 / 60)) { //Fix for framerate going above 60 when minimized
+                        long oldFrameTime = frameTimes[frameTimeIndex];
+                        frameTimes[frameTimeIndex] = now;
+                        frameTimeIndex = (frameTimeIndex + 1) % frameTimes.length;
+                        if (frameTimeIndex == 0) {
+                            arrayFilled = true;
+                        }
+                        long elapsedNanos;
+                        if (arrayFilled) {
+                            elapsedNanos = now - oldFrameTime;
+                            long elapsedNanosPerFrame = elapsedNanos / frameTimes.length;
+                            frameRate = 1_000_000_000.0 / elapsedNanosPerFrame;
+                            if (FPSCount-- == 0) {
+                                FPSCount = 30;
+                                drawFps(frameRate);
+                            }
+                        }
+                        lastTime = now;
+                    }
+                }
+                boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation());
+            }
+        };
+    }
+
     public void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence) {
         markerObjects = new HashMap<>();
-        compoundMarks = newCourse;
 
         for (Corner corner : sequence) { //Makes course out of all compound marks.
             for (CompoundMark compoundMark : newCourse) {
@@ -169,17 +327,14 @@ public class GameView3D extends GameView {
             }
         }
 
-        createMarkArrows();
-
         //Scale race to markers if there is no border.
         if (borderPoints == null) {
-            scaledPoint = ScaledPoint.makeScaledPoint(
-                canvasWidth, canvasHeight, new ArrayList<>(markerObjects.keySet()), true
-            );
+            rescaleRace(new ArrayList<>(markerObjects.keySet()));
         }
         //Move the Markers to initial position.
         markerObjects.forEach(((mark, marker) -> {
-            Point2D p2d = scaledPoint.findScaledXY(mark.getLat(), mark.getLng());
+            Point2D p2d = findScaledXY(mark.getLat(), mark.getLng());
+            System.out.println(mark.toString() + "  " + p2d.toString());
             marker.setLayoutX(p2d.getX());
             marker.setLayoutY(p2d.getY());
         }));
@@ -197,9 +352,12 @@ public class GameView3D extends GameView {
      * @param markerType the type of marker as a ModelType. Should be PLAIN_MARKER, START_MARKER or END_MARKER
      */
     private void makeAndBindMarker(Mark observableMark, ModelType markerType) {
-        markerObjects.put(observableMark, new Marker3D(markerType));
+
+        Group marker = ModelFactory.importModel(markerType).getAssets();
+
+        markerObjects.put(observableMark, marker);
         observableMark.addPositionListener((mark, lat, lon) -> {
-            Point2D p2d = scaledPoint.findScaledXY(lat, lon);
+            Point2D p2d = findScaledXY(lat, lon);
             markerObjects.get(mark).setLayoutX(p2d.getX());
             markerObjects.get(mark).setLayoutY(p2d.getY());
         });
@@ -214,8 +372,8 @@ public class GameView3D extends GameView {
      * @return the new gate.
      */
     private Group makeGate(Mark m1, Mark m2, ModelType gateType) {
-        Point2D m1Location = scaledPoint.findScaledXY(m1);
-        Point2D m2Location = scaledPoint.findScaledXY(m2);
+        Point2D m1Location = findScaledXY(m1);
+        Point2D m2Location = findScaledXY(m2);
 
         Group barrier = ModelFactory.importModel(gateType).getAssets();
         barrier.getTransforms().addAll(
@@ -236,83 +394,190 @@ public class GameView3D extends GameView {
 
 
     /**
-     * Calculates all the data needed for to create mark arrows. Requires that a course has been
-     * added to the gameview.
+     * Sets the class variables minLatPoint, maxLatPoint, minLonPoint, maxLonPoint to the point with
+     * the leftmost point, rightmost point, southern most point and northern most point
+     * respectively.
      */
-    private void createMarkArrows () {
-        for (int i=1; i < course.size()-1; i++) { //General case.
-            for (Mark mark : course.get(i).getMarks()) {
-                markerObjects.get(mark).addArrows(
-                    mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                    GeoUtility.getBearing(course.get(i-1).getMidPoint(), mark),
-                    GeoUtility.getBearing(mark, course.get(i+1).getMidPoint())
-                );
-            }
-        }
-        createStartLineArrows();
-        createFinishLineArrows();
-    }
+    private void findMinMaxPoint(List<GeoPoint> points) {
+        List<GeoPoint> sortedPoints = new ArrayList<>(points);
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLat));
+        minLatPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLat = sortedPoints.get(sortedPoints.size() - 1);
+        maxLatPoint = new GeoPoint(maxLat.getLat(), maxLat.getLng());
 
-    private void createStartLineArrows () {
-        for (Mark mark : course.get(0).getMarks()) {
-            markerObjects.get(mark).addArrows(
-                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                0d, //90
-                GeoUtility.getBearing(mark, course.get(1).getMidPoint())
-            );
+        sortedPoints.sort(Comparator.comparingDouble(GeoPoint::getLng));
+        minLonPoint = new GeoPoint(sortedPoints.get(0).getLat(), sortedPoints.get(0).getLng());
+        GeoPoint maxLon = sortedPoints.get(sortedPoints.size() - 1);
+        maxLonPoint = new GeoPoint(maxLon.getLat(), maxLon.getLng());
+        if (maxLonPoint.getLng() - minLonPoint.getLng() > 180) {
+            horizontalInversion = true;
         }
     }
 
-    private void createFinishLineArrows () {
-        for (Mark mark : course.get(course.size()-1).getMarks()) {
-            markerObjects.get(mark).addArrows(
-                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                GeoUtility.getBearing(course.get(course.size()-2).getMidPoint(), mark),
-                GeoUtility.getBearing(mark, mark)
+    /**
+     * Calculates the location of a reference point, this is always the point with minimum latitude,
+     * in relation to the canvas.
+     *
+     * @param minLonToMaxLon The horizontal distance between the point of minimum longitude to
+     * maximum longitude.
+     */
+    private void calculateReferencePointLocation(double minLonToMaxLon) {
+        GeoPoint referencePoint = minLatPoint;
+        double referenceAngle;
+
+        if (scaleDirection == ScaleDirection.HORIZONTAL) {
+            referenceAngle = Math.abs(
+                GeoUtility.getBearingRad(referencePoint, minLonPoint)
             );
+            referencePointX =
+                -100 + distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                    .getDistance(referencePoint, minLonPoint);
+            referenceAngle = Math.abs(GeoUtility.getDistance(referencePoint, maxLatPoint));
+            referencePointY = -100 + canvasHeight - (bufferSize + bufferSize);
+            referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+            referencePointY = referencePointY / 2;
+            referencePointY += bufferSize;
+            referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, maxLatPoint);
+        } else {
+            referencePointY = -100 + canvasHeight - bufferSize;
+            referenceAngle = Math.abs(
+                Math.toRadians(
+                    GeoUtility.getDistance(referencePoint, minLonPoint)
+                )
+            );
+            referencePointX = -100 + bufferSize;
+            referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * GeoUtility
+                .getDistance(referencePoint, minLonPoint);
+            referencePointX +=
+                ((canvasWidth - (bufferSize + bufferSize)) - (minLonToMaxLon * distanceScaleFactor))
+                    / 2;
         }
+        if (horizontalInversion) {
+            referencePointX = -100 + canvasWidth - bufferSize - (referencePointX - bufferSize);
+        }
+    }
+
+
+    /**
+     * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns
+     * it to distanceScaleFactor Returns the max horizontal distance of the map.
+     */
+    private double scaleRaceExtremities() {
+
+        double vertAngle = Math.abs(
+            GeoUtility.getBearingRad(minLatPoint, maxLatPoint)
+        );
+        double vertDistance =
+            Math.cos(vertAngle) * GeoUtility.getDistance(minLatPoint, maxLatPoint);
+        double horiAngle = Math.abs(
+            GeoUtility.getBearingRad(minLonPoint, maxLonPoint)
+        );
+        if (horiAngle <= (Math.PI / 2)) {
+            horiAngle = (Math.PI / 2) - horiAngle;
+        } else {
+            horiAngle = horiAngle - (Math.PI / 2);
+        }
+        double horiDistance =
+            Math.cos(horiAngle) * GeoUtility.getDistance(minLonPoint, maxLonPoint);
+
+        double vertScale = (canvasHeight - (bufferSize + bufferSize)) / vertDistance;
+
+        if ((horiDistance * vertScale) > (canvasWidth - (bufferSize + bufferSize))) {
+            distanceScaleFactor = (canvasWidth - (bufferSize + bufferSize)) / horiDistance;
+            scaleDirection = ScaleDirection.HORIZONTAL;
+        } else {
+            distanceScaleFactor = vertScale;
+            scaleDirection = ScaleDirection.VERTICAL;
+        }
+        return horiDistance;
+    }
+
+    private Point2D findScaledXY(GeoPoint unscaled) {
+        return findScaledXY(unscaled.getLat(), unscaled.getLng());
+    }
+
+    private Point2D findScaledXY(double unscaledLat, double unscaledLon) {
+        double distanceFromReference;
+        double angleFromReference;
+        double xAxisLocation = referencePointX;
+        double yAxisLocation = referencePointY;
+
+        angleFromReference = GeoUtility.getBearingRad(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        distanceFromReference = GeoUtility.getDistance(
+            minLatPoint, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
+            xAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+            yAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+        } else if (angleFromReference >= 0) {
+            angleFromReference = angleFromReference - Math.PI / 2;
+            xAxisLocation += distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+            yAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
+            angleFromReference = Math.abs(angleFromReference);
+            xAxisLocation -= distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+            yAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+        } else {
+            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
+            xAxisLocation -= distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+            yAxisLocation += distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+        }
+        if (horizontalInversion) {
+            xAxisLocation = canvasWidth - bufferSize - (xAxisLocation - bufferSize);
+        }
+        return new Point2D(xAxisLocation, yAxisLocation);
     }
 
     public void cameraMovement(KeyEvent event) {
-        GameKeyBind keyBinds = GameKeyBind.getInstance();
-        KeyAction keyPressed = keyBinds.getKeyAction(event.getCode());
-        if (keyPressed != null) {
-            switch (keyPressed) {
-                case ZOOM_IN:
-                    ((RaceCamera) view.getCamera()).zoomIn();
+        switch (event.getCode()) {
+            case NUMPAD8:
+                camera.getTransforms().addAll(new Rotate(0.5, new Point3D(1,0,0)));
                 break;
-                case ZOOM_OUT:
-                    ((RaceCamera) view.getCamera()).zoomOut();
+            case NUMPAD2:
+                camera.getTransforms().addAll(new Rotate(-0.5, new Point3D(1,0,0)));
                 break;
-                case FORWARD:
-                    ((RaceCamera) view.getCamera()).panUp();
+            case NUMPAD4:
+                camera.getTransforms().addAll(new Rotate(-0.5, new Point3D(0,1,0)));
                 break;
-                case BACKWARD:
-                    ((RaceCamera) view.getCamera()).panDown();
+            case NUMPAD6:
+                camera.getTransforms().addAll(new Rotate(0.5, new Point3D(0,1,0)));
                 break;
-                case LEFT:
-                    ((RaceCamera) view.getCamera()).panLeft();
+            case X:
+                camera.getTransforms().addAll(new Translate(0, 0, 1.5));
                 break;
-                case RIGHT:
-                    ((RaceCamera) view.getCamera()).panRight();
+            case Z:
+                camera.getTransforms().addAll(new Translate(0, 0, -1.5));
                 break;
-                case VIEW:
-                    toggleCamera();
+            case W:
+                camera.getTransforms().addAll(new Translate(0, -1, 0));
+                break;
+            case S:
+                camera.getTransforms().addAll(new Translate(0, 1, 0));
+                break;
+            case A:
+                camera.getTransforms().addAll(new Translate(-1, 0, 0));
+                break;
+            case D:
+                camera.getTransforms().addAll(new Translate(1, 0, 0));
                 break;
-            }
         }
     }
 
-    private void toggleCamera() {
-        Camera currCamera = view.getCamera();
-
-        if (currCamera.equals(isometricCam)) {
-            view.setCamera(topDownCam);
-        } else if (currCamera.equals(topDownCam)) {
-            view.setCamera(chaseCam);
-        } else {
-            view.setCamera(isometricCam);
-        }
+    /**
+     * Rescales the race to the size of the window.
+     *
+     * @param limitingCoordinates the set of geo points that contains the extremities of the race.
+     */
+    private void rescaleRace(List<GeoPoint> limitingCoordinates) {
+        //Check is called once to avoid unnecessarily change the course limits once the race is running
+        findMinMaxPoint(limitingCoordinates);
+        double minLonToMaxLon = scaleRaceExtremities();
+        calculateReferencePointLocation(minLonToMaxLon);
+//        drawGoogleMap();
     }
 
     /**
@@ -324,50 +589,36 @@ public class GameView3D extends GameView {
         final List<Group> wakes = new ArrayList<>();
         for (ClientYacht clientYacht : yachts) {
             Color colour = clientYacht.getColour();
-            newBoat = new BoatObject(clientYacht.getBoatType());
+            newBoat = new BoatObject();
+//            newBoat.addSelectedBoatListener(this::setSelectedBoat);
             newBoat.setFill(colour);
             boatObjects.put(clientYacht, newBoat);
+//            createAndBindAnnotationBox(clientYacht, colour);
             wakesGroup.getChildren().add(newBoat.getWake());
             wakes.add(newBoat.getWake());
             boatObjectGroup.getChildren().add(newBoat);
-            clientYacht.addLocationListener(this::updateBoatLocation);
-            clientYacht.addColorChangeListener(this::updateBoatColor);
-
-            if (clientYacht.getSourceId().equals(
-                ViewManager.getInstance().getGameClient().getServerThread().getClientId())) {
-                ((ChaseCamera) chaseCam).setPlayerBoat(newBoat);
-                ((TopDownCamera) topDownCam).setPlayerBoat(newBoat);
-
-                newBoat.setMarkIndicator(ModelFactory.importSTL("mark_pointer.stl"));
-                playerBoat = newBoat;
-
-            }
-        }
-        Platform.runLater(() -> {
-            ClientYacht playerYacht = ViewManager.getInstance().getGameClient().getAllBoatsMap()
-                .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId());
-
-            for (ObservableValue o : Arrays
-                .asList(playerBoat.layoutXProperty(), playerBoat.layoutXProperty())) {
-                o.addListener((obs, oldVal, newVal) -> {
-
-                    List<Mark> marks = course.get(playerYacht.getLegNumber()).getMarks();
-                    Point2D midPoint = new Point2D(0, 0);
-                    if (marks.size() == 1) {
-                        midPoint = scaledPoint.findScaledXY(marks.get(0));
-                    } else if (marks.size() == 2) {
-                        midPoint = (scaledPoint.findScaledXY(marks.get(0)))
-                            .midpoint(scaledPoint.findScaledXY(marks.get(1)));
-                    }
-
-                    if (midPoint != null) {
-                        playerBoat.updateMarkIndicator(midPoint);
-                    }
+//            trails.getChildren().add(newBoat.getTrail());
 
+            clientYacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
+                BoatObject bo = boatObjects.get(boat);
+                Point2D p2d = findScaledXY(lat, lon);
+                bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir);
+//                annotations.get(boat).setLocation(p2d.getX(), p2d.getY());
+                bo.setTrajectory(
+                    heading,
+                    velocity,
+                    metersPerPixelX,
+                    metersPerPixelY);
             });
         }
+//        annotationsGroup.getChildren().addAll(annotations.values());
+        Platform.runLater(() -> {
+
+//            gameObjects.addAll(trails);
             gameObjects.getChildren().addAll(wakes);
             gameObjects.getChildren().addAll(boatObjectGroup);
+//            gameObjects.addAll(annotationsGroup);
+//            gameObjects.addAll(boatObjectGroup);
         });
     }
 
@@ -375,23 +626,6 @@ public class GameView3D extends GameView {
         return view;
     }
 
-    /**
-     * Updates the boatObjects color with that of the clientYachts object. Used in notification from
-     * a listener on this attribute in clientYacht to re paint the boat mesh
-     *
-     * @param clientYacht The yacht to update the colour for
-     */
-    private void updateBoatColor(ClientYacht clientYacht) {
-        boatObjects.get(clientYacht).setFill(clientYacht.getColour());
-    }
-
-    private void updateBoatLocation(ClientYacht boat, Double lat, Double lon, Double heading,
-        Boolean sailIn, Double velocity) {
-        BoatObject bo = boatObjects.get(boat);
-        Point2D p2d = scaledPoint.findScaledXY(lat, lon);
-        bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir);
-    }
-
     /**
      * Adds a border to the GameView and rescales to the size of the border, does not rescale if a
      * border already exists. Assumes the border is larger than the course.
@@ -401,20 +635,18 @@ public class GameView3D extends GameView {
     public void updateBorder(List<Limit> border) {
         if (borderPoints == null) {
             borderPoints = border;
-            scaledPoint = ScaledPoint.makeScaledPoint(
-                canvasWidth, canvasHeight, new ArrayList<>(borderPoints), true
-            );
+            rescaleRace(new ArrayList<>(borderPoints));
         }
         List<Node> boundaryAssets = new ArrayList<>();
 
-        Point2D lastLocation = scaledPoint.findScaledXY(border.get(0).getLat(), border.get(0).getLng());
+        Point2D lastLocation = findScaledXY(border.get(0).getLat(), border.get(0).getLng());
         Group pylon = ModelFactory.importModel(ModelType.BORDER_PYLON).getAssets();
         pylon.setLayoutX(lastLocation.getX());
         pylon.setLayoutY(lastLocation.getY());
         boundaryAssets.add(pylon);
 
         for (int i=1; i<border.size(); i++) {
-            Point2D location = scaledPoint.findScaledXY(border.get(i).getLat(), border.get(i).getLng());
+            Point2D location = findScaledXY(border.get(i).getLat(), border.get(i).getLng());
             pylon = ModelFactory.importModel(ModelType.BORDER_PYLON).getAssets();
             pylon.setLayoutX(location.getX());
             pylon.setLayoutY(location.getY());
@@ -427,7 +659,7 @@ public class GameView3D extends GameView {
                     ),
                     new Point3D(0,0,1)
                 ),
-                new Scale((lastLocation.distance(location) / 10)-0.2, 1, 1)
+                new Scale((lastLocation.distance(location) / 15)-0.2, 1, 1)
             );
 
             Point2D midPoint = location.midpoint(lastLocation);
@@ -440,7 +672,7 @@ public class GameView3D extends GameView {
             boundaryAssets.add(pylon);
         }
 
-        Point2D firstLocation = scaledPoint.findScaledXY(border.get(0).getLat(), border.get(0).getLng());
+        Point2D firstLocation = findScaledXY(border.get(0).getLat(), border.get(0).getLng());
         Group barrier = ModelFactory.importModel(ModelType.BORDER_BARRIER).getAssets();
         barrier.getTransforms().addAll(
             new Rotate(
@@ -449,7 +681,7 @@ public class GameView3D extends GameView {
                 ),
                 new Point3D(0,0,1)
             ),
-            new Scale((firstLocation.distance(lastLocation) / 10)-0.2, 1, 1)
+            new Scale((firstLocation.distance(lastLocation) / 15)-0.2, 1, 1)
         );
 
         Point2D midPoint = lastLocation.midpoint(firstLocation);
@@ -468,28 +700,8 @@ public class GameView3D extends GameView {
     public void updateTokens(List<Token> newTokens) {
         mapTokens = new ArrayList<>();
         for (Token token : newTokens) {
-            Point2D location = scaledPoint.findScaledXY(token.getLat(), token.getLng());
-
-            ModelType modelType = null;
-            switch (token.getTokenType()) {
-                case BOOST:
-                    modelType = ModelType.VELOCITY_PICKUP;
-                    break;
-                case HANDLING:
-                    modelType = ModelType.HANDLING_PICKUP;
-                    break;
-                case BUMPER:
-                    modelType = ModelType.BUMPER_PICKUP;
-                    break;
-                case RANDOM:
-                    modelType = ModelType.RANDOM_PICKUP;
-                    break;
-                case WIND_WALKER:
-                    modelType = ModelType.WIND_WALKER_PICKUP;
-                    break;
-            }
-
-            Node tokenObject = ModelFactory.importModel(modelType).getAssets();
+            Point2D location = findScaledXY(token.getLat(), token.getLng());
+            Node tokenObject = ModelFactory.importModel(ModelType.VELOCITY_PICKUP).getAssets();
             tokenObject.setLayoutX(location.getX());
             tokenObject.setLayoutY(location.getY());
             mapTokens.add(tokenObject);
@@ -501,64 +713,88 @@ public class GameView3D extends GameView {
     }
 
     public void setBoatAsPlayer (ClientYacht playerYacht) {
-        playerYacht.toggleSail();
-        playerBoatAnimationTimer = new AnimationTimer() {
+        this.playerYacht = playerYacht;
 
-            Point2D lastLocation = scaledPoint.findScaledXY(playerYacht.getLocation());
+        Platform.runLater(() ->
+            playerAnnotation.getChildren().setAll(ModelFactory.importModel(ModelType.PLAYER_IDENTIFIER).getAssets())
+        );
+        BoatObject playerAssets = boatObjects.get(playerYacht);
+        playerAnnotation.layoutXProperty().bind(playerAssets.layoutXProperty());
+        playerAnnotation.layoutYProperty().bind(playerAssets.layoutYProperty());
+
+        playerBoatAnimationTimer.scheduleAtFixedRate(new TimerTask() {
+
+            private Point2D lastLocation = findScaledXY(playerYacht.getLocation());
 
             @Override
-            public void handle(long now) {
-                Point2D location = scaledPoint.findScaledXY(playerYacht.getLocation());
-                if (Math.abs(lastLocation.distance(location)) > 2) {
+            public void run() {
                 Node segment = ModelFactory.importModel(ModelType.TRAIL_SEGMENT).getAssets();
-                    location = scaledPoint.findScaledXY(playerYacht.getLocation());
+                Point2D location = findScaledXY(playerYacht.getLocation());
                 segment.getTransforms().addAll(
-                        new Translate(location.getX(), location.getY(), 0),
-                        new Rotate(playerYacht.getHeading(), new Point3D(0,0,1))
+                    new Translate(location.getX(), location.getY()),
+                    new Rotate(playerYacht.getHeading(), new Point3D(0,0,1)),
+                    new Scale(1, lastLocation.distance(location) / 5)
                 );
+                Platform.runLater(() -> {
                     trail.getChildren().add(segment);
-                    if (trail.getChildren().size() > 50) {
+                    if (trail.getChildren().size() > 100) {
                         trail.getChildren().remove(0);
                     }
-                    lastLocation = location;
-                }
-            }
-        };
-        playerBoatAnimationTimer.start();
-        playerYacht.addMarkRoundingListener(this::updateMarkArrows);
-        boatObjects.get(playerYacht).addSelectedBoatListener((boatObject, isSelected) -> {
-            System.out.println("IS SELECTED " + isSelected);
                 });
+                lastLocation = location;
+                // TODO: 11/09/2017 ROTATE PLAYER ICON
+//                double leg = playerYacht.getLegNumber();
+//                if (compoundMark != null) {
+//                    for (Mark mark : compoundMark.getMarks()) {
+////                System.out.println("markerObjects.get(mark) = " + markerObjects.get(mark));
+//                        markerObjects.get(mark).showNextExitArrow();
+//                    }
+//                }
+//                CompoundMark nextMark = null;
+//                if (legNumber < course.size() - 1) {
+//                    nextMark = course.get(legNumber);
+//                    for (Mark mark : nextMark.getMarks()) {
+//                        markerObjects.get(mark).showNextEnterArrow();
+//                    }
+//                }
+            }
+        }, 0L, 500L);
+        
+//        playerYacht.toggleSail();
+//        boatObjects.get(playerYacht).setAsPlayer();
+//        CompoundMark currentMark = course.get(playerYacht.getLegNumber());
+//        for (Mark mark : currentMark.getMarks()) {
+//            markerObjects.get(mark).showNextExitArrow();
+//        }
+//        annotations.get(playerYacht).addAnnotation(
+//            "velocity",
+//            playerYacht.getVelocityProperty(),
+//            (velocity) -> String.format("Speed: %.2f ms", velocity.doubleValue())
+//        );
+//        Platform.runLater(() -> {
+//            boatObjectGroup.getChildren().remove(boatObjects.get(playerYacht));
+//            gameObjects.add(boatObjects.get(playerYacht));
+//            annotationsGroup.getChildren().remove(annotations.get(playerYacht));
+//            gameObjects.add(annotations.get(playerYacht));
+//        });
+//        playerYacht.addMarkRoundingListener(this::updateMarkArrows);
     }
 
     public void setWindDir(double windDir) {
         this.windDir = windDir;
     }
 
-    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();
-                }
-            }
+    public void setFrameRateFXText(Text fpsDisplay) {
+        this.fpsDisplay = null;
+        this.fpsDisplay = fpsDisplay;
     }
+
+    private void drawFps(Double fps) {
+        System.out.println(fps);
+        Platform.runLater(() -> fpsDisplay.setText(String.format("%d FPS", Math.round(fps))));
     }
+
+//    public void setFPSVisibility(boolean visibility) {
+//        fpsDisplay.setVisible(visibility);
+//    }
 }

src/main/java/seng302/visualiser/MapMaker.java

@@ -1,126 +0,0 @@
-package seng302.visualiser;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javafx.scene.Node;
-import javafx.util.Pair;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import seng302.model.stream.xml.generator.RaceXMLTemplate;
-import seng302.model.stream.xml.generator.RegattaXMLTemplate;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.utilities.XMLGenerator;
-import seng302.utilities.XMLParser;
-
-/**
- * Makes maps from map definition xml files.
- */
-public class MapMaker {
-
-    private List<MapPreview> mapPreviews = new ArrayList<>();
-    private List<RaceXMLData> races = new ArrayList<>();
-    private List<RegattaXMLData> regattas = new ArrayList<>();
-    private List<String> filePaths = new ArrayList<>();
-    private List<Integer> maxPlayers = new ArrayList<>();
-    private static MapMaker instance;
-    private int index = 0;
-    private XMLGenerator xmlGenerator = new XMLGenerator();
-
-    private List<String> maps = new ArrayList<>(Arrays.asList("default.xml", "horseshoe.xml", "loop.xml"));
-
-    public static MapMaker getInstance() {
-        if (instance == null) {
-            instance = new MapMaker();
-        }
-        return instance;
-    }
-
-    private MapMaker() {
-        for (String mapPath : maps){
-            String path = ("/maps/" + mapPath);
-
-            Pair<RegattaXMLTemplate, RaceXMLTemplate> regattaRace = XMLParser.parseRaceDef(
-                    path, "", 1, null, false
-            );
-
-            RegattaXMLTemplate regattaTemplate = regattaRace.getKey();
-
-            filePaths.add(path);
-
-            regattas.add(new RegattaXMLData(
-                    regattaTemplate.getRegattaId(),
-                    regattaTemplate.getName(),
-                    regattaTemplate.getCourseName(),
-                    regattaTemplate.getLatitude(),
-                    regattaTemplate.getLongitude(),
-                    regattaTemplate.getUtcOffset()
-            ));
-
-            RaceXMLTemplate raceTemplate = regattaRace.getValue();
-            xmlGenerator.setRaceTemplate(raceTemplate);
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db;
-            Document doc = null;
-            try {
-                db = dbf.newDocumentBuilder();
-                doc = db.parse(new InputSource(new StringReader(xmlGenerator.getRaceAsXml())));
-            } catch (ParserConfigurationException | IOException | SAXException e) {
-                e.printStackTrace();
-            }
-
-            RaceXMLData race = XMLParser.parseRace(doc);
-            maxPlayers.add(XMLParser.getMaxPlayers(doc));
-
-            mapPreviews.add(new MapPreview(
-                    new ArrayList<>(race.getCompoundMarks().values()),
-                    race.getMarkSequence(), race.getCourseLimit()
-            ));
-
-            races.add(race);
-        }
-
-    }
-
-    public void next() {
-        index += 1;
-        if (index >= mapPreviews.size()) {
-            index = 0;
-        }
-    }
-
-    public void previous() {
-        index -= 1;
-        if (index < 0) {
-            index = mapPreviews.size() - 1;
-        }
-    }
-
-    public Node getCurrentGameView() {
-        return mapPreviews.get(index).getAssets();
-    }
-
-    public RaceXMLData getCurrentRace() {
-        return races.get(index);
-    }
-
-    public RegattaXMLData getCurrentRegatta() {
-        return regattas.get(index);
-    }
-
-    public String getCurrentRacePath() {
-        return filePaths.get(index);
-    }
-
-    public Integer getMaxPlayers() {
-        return maxPlayers.get(index);
-    }
-}

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

@@ -1,283 +0,0 @@
-package seng302.visualiser;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javafx.application.Platform;
-import javafx.geometry.Point2D;
-import javafx.scene.Node;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Polygon;
-import seng302.gameServer.messages.RoundingSide;
-import seng302.model.GeoPoint;
-import seng302.model.Limit;
-import seng302.model.ScaledPoint;
-import seng302.model.mark.CompoundMark;
-import seng302.model.mark.Corner;
-import seng302.model.mark.Mark;
-import seng302.utilities.GeoUtility;
-import seng302.visualiser.fxObjects.MarkArrowFactory;
-import seng302.visualiser.fxObjects.assets_2D.CourseBoundary;
-import seng302.visualiser.fxObjects.assets_2D.Gate;
-import seng302.visualiser.fxObjects.assets_2D.Marker2D;
-
-/**
- * Created by cir27 on 20/07/17.
- */
-public class MapPreview extends GameView {
-
-    private Polygon raceBorder = new CourseBoundary();
-    protected Map<Mark, Marker2D> markerObjects;
-
-    public MapPreview(List<CompoundMark> marks, List<Corner> course, List<Limit> border) {
-        this.compoundMarks = marks;
-        this.courseOrder = course;
-        this.borderPoints = border;
-        gameObjects.getChildren().addAll(raceBorder, markers, tokens);
-        gameObjects.parentProperty().addListener((obs, old, parent) -> {
-            if (parent != null) {
-                canvasWidth = parent.prefWidth(1);
-                canvasHeight = parent.prefHeight(1);
-                updateBorder(borderPoints);
-                updateCourse(compoundMarks, courseOrder);
-            }
-        });
-    }
-
-    @Override
-    public Node getAssets() {
-        return gameObjects;
-    }
-
-    public void setSize(double width, double height) {
-        canvasHeight = height;
-        canvasWidth = width;
-        updateBorder(borderPoints);
-        updateCourse(compoundMarks, courseOrder);
-    }
-
-    /**
-     * Adds a course to the GameView. The view is scaled accordingly unless a border is set in which
-     * case the course is added relative ot the border.
-     *
-     * @param newCourse the mark objects that make up the course.
-     * @param sequence The sequence the marks travel through
-     */
-    @Override
-    public void updateCourse(List<CompoundMark> newCourse, List<Corner> sequence) {
-
-        if (newCourse.size() == 0) {
-            return;
-        }
-        compoundMarks = newCourse;
-        markerObjects = new HashMap<>();
-        courseOrder = sequence;
-
-        for (Corner corner : courseOrder) { //Makes course out of all compound marks.
-            for (CompoundMark compoundMark : newCourse) {
-                if (corner.getCompoundMarkID() == compoundMark.getId()) {
-                    course.add(compoundMark);
-                }
-            }
-        }
-
-        // TODO: 16/08/17 Updating mark roundings here. It should not happen here. Nor should it be done this way.
-        for (Corner corner : sequence){
-            CompoundMark compoundMark = course.get(corner.getSeqID() - 1);
-            compoundMark.setRoundingSide(
-                RoundingSide.getRoundingSide(corner.getRounding())
-            );
-        }
-
-        final List<Gate> gates = new ArrayList<>();
-        Paint colour = Color.BLACK;
-        //Creates new markers
-        for (CompoundMark cMark : newCourse) {
-            //Set start and end colour
-            if (cMark.getId() == sequence.get(0).getCompoundMarkID()) {
-                colour = Color.GREEN;
-            } else if (cMark.getId() == sequence.get(sequence.size() - 1).getCompoundMarkID()) {
-                colour = Color.RED;
-            }
-            //Create mark dots
-            for (Mark mark : cMark.getMarks()) {
-                makeAndBindMarker(mark, colour);
-            }
-            //Create gate line
-            if (cMark.isGate()) {
-                for (int i = 1; i < cMark.getMarks().size(); i++) {
-                    gates.add(
-                        makeAndBindGate(
-                            markerObjects.get(cMark.getSubMark(i)),
-                            markerObjects.get(cMark.getSubMark(i + 1)),
-                            colour
-                        )
-                    );
-                }
-            }
-            colour = Color.BLACK;
-        }
-
-        createMarkArrows(sequence);
-
-        //Scale race to markers if there is no border.
-        if (borderPoints == null) {
-            scaledPoint = ScaledPoint.makeScaledPoint(
-                canvasWidth, canvasHeight, new ArrayList<>(markerObjects.keySet()), false
-            );
-        }
-        //Move the Markers to initial position.
-        markerObjects.forEach(((mark, marker2D) -> {
-            Point2D p2d = scaledPoint.findScaledXY(mark.getLat(), mark.getLng());
-            marker2D.setLayoutX(p2d.getX());
-            marker2D.setLayoutY(p2d.getY());
-        }));
-        Platform.runLater(() -> {
-            markers.getChildren().clear();
-            markers.getChildren().addAll(gates);
-            markers.getChildren().addAll(markerObjects.values());
-        });
-    }
-
-    /**
-     * 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) {
-        for (int i=1; i < sequence.size()-1; i++) { //General case.
-            double averageLat = 0;
-            double averageLng = 0;
-            int numMarks = course.get(i-1).getMarks().size();
-            for (Mark mark : course.get(i-1).getMarks()) {
-                averageLat += mark.getLat();
-                averageLng += mark.getLng();
-            }
-            GeoPoint lastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-            numMarks = course.get(i+1).getMarks().size();
-            averageLat = 0;
-            averageLng = 0;
-            for (Mark mark : course.get(i+1).getMarks()) {
-                averageLat += mark.getLat();
-                averageLng += mark.getLng();
-            }
-            GeoPoint nextMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-            // TODO: 16/08/17 This comparison doesn't need to exist but the alternative is to user server enum client side.
-            for (Mark mark : course.get(i).getMarks()) {
-                markerObjects.get(mark).addArrows(
-                    mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                    GeoUtility.getBearing(lastMarkAv, mark),
-                    GeoUtility.getBearing(mark, nextMarkAv)
-                );
-            }
-        }
-        createStartLineArrows();
-        createFinishLineArrows();
-    }
-
-    private void createStartLineArrows () {
-        double averageLat = 0;
-        double averageLng = 0;
-        int numMarks = 0;
-        for (Mark mark : course.get(1).getMarks()) {
-            numMarks += 1;
-            averageLat += mark.getLat();
-            averageLng += mark.getLng();
-        }
-        GeoPoint firstMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-        for (Mark mark : course.get(0).getMarks()) {
-            markerObjects.get(mark).addArrows(
-                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                0d, //90
-                GeoUtility.getBearing(mark, firstMarkAv)
-            );
-        }
-    }
-
-    private void createFinishLineArrows () {
-        double numMarks = 0;
-        double averageLat = 0;
-        double averageLng = 0;
-        for (Mark mark : course.get(course.size()-2).getMarks()) {
-            numMarks += 1;
-            averageLat += mark.getLat();
-            averageLng += mark.getLng();
-        }
-        GeoPoint secondToLastMarkAv = new GeoPoint(averageLat / numMarks, averageLng / numMarks);
-        for (Mark mark : course.get(course.size()-1).getMarks()) {
-            markerObjects.get(mark).addArrows(
-                mark.getRoundingSide() == RoundingSide.STARBOARD ? MarkArrowFactory.RoundingSide.STARBOARD : MarkArrowFactory.RoundingSide.PORT,
-                GeoUtility.getBearing(secondToLastMarkAv, mark),
-                GeoUtility.getBearing(mark, mark)
-            );
-        }
-    }
-
-    /**
-     * Creates a new Marker and binds it's position to the given Mark.
-     *
-     * @param observableMark The mark to bind the marker to.
-     * @param colour The desired colour of the mark
-     */
-    private void makeAndBindMarker(Mark observableMark, Paint colour) {
-        Marker2D marker2D = new Marker2D(colour);
-//        marker.addArrows(MarkArrowFactory.RoundingSide.PORT, ThreadLocalRandom.current().nextDouble(91, 180), ThreadLocalRandom.current().nextDouble(1, 90));
-        markerObjects.put(observableMark, marker2D);
-        observableMark.addPositionListener((mark, lat, lon) -> {
-            Point2D p2d = scaledPoint.findScaledXY(lat, lon);
-            markerObjects.get(mark).setLayoutX(p2d.getX());
-            markerObjects.get(mark).setLayoutY(p2d.getY());
-        });
-    }
-
-    /**
-     * Creates a new gate connecting the given marks.
-     *
-     * @param m1 The first Mark of the gate.
-     * @param m2 The second Mark of the gate.
-     * @param colour The desired colour of the gate.
-     * @return the new gate.
-     */
-    private Gate makeAndBindGate(Marker2D m1, Marker2D m2, Paint colour) {
-        Gate gate = new Gate(colour);
-        gate.startXProperty().bind(
-            m1.layoutXProperty()
-        );
-        gate.startYProperty().bind(
-            m1.layoutYProperty()
-        );
-        gate.endXProperty().bind(
-            m2.layoutXProperty()
-        );
-        gate.endYProperty().bind(
-            m2.layoutYProperty()
-        );
-        return gate;
-    }
-
-    /**
-     * Adds a border to the GameView and rescales to the size of the border, does not rescale if a
-     * border already exists. Assumes the border is larger than the course.
-     *
-     * @param border the race border to be drawn.
-     */
-    @Override
-    public void updateBorder(List<Limit> border) {
-        if (border.size() == 0) {
-            return;
-        }
-
-        borderPoints = border;
-        scaledPoint = ScaledPoint.makeScaledPoint(canvasWidth, canvasHeight, border, false);
-
-        List<Double> boundaryPoints = new ArrayList<>();
-        for (Limit limit : border) {
-            Point2D location = scaledPoint.findScaledXY(limit.getLat(), limit.getLng());
-            boundaryPoints.add(location.getX());
-            boundaryPoints.add(location.getY());
-        }
-        raceBorder.getPoints().setAll(boundaryPoints);
-    }
-}

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

@@ -1,86 +0,0 @@
-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/ServerListener.java

@@ -6,10 +6,11 @@ import seng302.gameServer.ServerDescription;
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceEvent;
 import javax.jmdns.ServiceListener;
-import javax.jmdns.impl.JmDNSImpl;
 import java.io.IOException;
 import java.net.InetAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 
 import static seng302.gameServer.ServerAdvertiser.getLocalHostIp;
 
@@ -17,7 +18,6 @@ import static seng302.gameServer.ServerAdvertiser.getLocalHostIp;
  * Listens for servers on the local network
  */
 public class ServerListener{
-    private static Integer SERVICE_REFRESH_INTERVAL = 5 * 1000;
     private static ServerListener instance;
     private ServerListenerDelegate delegate;
     private JmDNS jmdns = null;
@@ -91,16 +91,8 @@ public class ServerListener{
 
     private ServerListener() throws IOException {
         jmdns = JmDNS.create(InetAddress.getByName(getLocalHostIp()));
-
         listener = new GameServeMonitor();
         jmdns.addServiceListener(ServerAdvertiser.SERVICE_TYPE, listener);
-
-        /*new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                refresh();
-            }
-        }, 50, SERVICE_REFRESH_INTERVAL);*/
     }
 
     public static ServerListener getInstance() throws IOException {
@@ -118,25 +110,4 @@ public class ServerListener{
     public void setDelegate(ServerListenerDelegate delegate){
         this.delegate = delegate;
     }
-
-    public void refresh(){
-        ArrayList<ServerDescription> servers = new ArrayList<>(listener.servers);
-
-        for (ServerDescription serverDescription : servers){
-            if (serverDescription.hasExpired()){
-                jmdns.requestServiceInfo(ServerAdvertiser.SERVICE_TYPE, serverDescription.getName());
-            }
-            else{
-                serverDescription.hasBeenRefreshed();
-            }
-        }
-
-        for (ServerDescription server : servers){
-            if (server.serverShouldBeRemoved()){
-                listener.servers.remove(server);
-                delegate.serverRemoved(new ArrayList<ServerDescription>(listener.servers));
-            }
-        }
-
-    }
 }

src/main/java/seng302/visualiser/cameras/ChaseCamera.java

@@ -1,130 +0,0 @@
-package seng302.visualiser.cameras;
-
-import java.util.Arrays;
-import javafx.beans.property.DoubleProperty;
-import javafx.collections.ObservableList;
-import javafx.geometry.Point3D;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
-
-
-public class ChaseCamera extends PerspectiveCamera implements RaceCamera {
-
-    private final Double VERTICAL_PAN_LIMIT = 20.0;
-    private final Double NEAR_ZOOM_LIMIT = -15.0;
-    private final Double FAR_ZOOM_LIMIT = -125.0;
-
-    private final Double ZOOM_STEP = 2.5;
-    private final Double PAN_STEP = 2.5;
-
-    private ObservableList<Transform> transforms;
-    private BoatObject playerBoat;
-
-    private Double zoomFactor;
-    private Double horizontalPan;
-    private Double verticalPan;
-
-
-    public ChaseCamera() {
-        super(true);
-        transforms = this.getTransforms();
-
-        zoomFactor = (FAR_ZOOM_LIMIT + NEAR_ZOOM_LIMIT) / 2.0;
-        this.horizontalPan = 0.0;
-        this.verticalPan = 0.0;
-    }
-
-    /**
-     * Sets a player boat object to observe and update the camera with.
-     *
-     * @param playerBoat The player boat to be observed.
-     */
-    public void setPlayerBoat(BoatObject playerBoat) {
-        this.playerBoat = playerBoat;
-
-        for (DoubleProperty o : Arrays
-            .asList(playerBoat.getRotationProperty(), playerBoat.layoutYProperty(),
-                playerBoat.layoutXProperty())) {
-            o.addListener((obs, oldVal, newVal) -> repositionCamera());
-        }
-    }
-
-    /**
-     * Moves the camera to a new position after some change (Zooming or Panning)
-     */
-    private void repositionCamera() {
-        transforms.clear();
-        transforms.addAll(
-            new Translate(playerBoat.getLayoutX(), playerBoat.getLayoutY(), 0),
-            new Rotate(playerBoat.getRotationProperty().getValue() + horizontalPan,
-                new Point3D(0, 0, 1)),
-            new Rotate(60 + verticalPan, new Point3D(1, 0, 0)),
-            new Translate(0, 0, zoomFactor)
-        );
-    }
-
-    /**
-     * Adjusts the zoom amount (camera depth) by some adjustment value
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustZoomFactor(Double adjustment) {
-        if (zoomFactor + adjustment < NEAR_ZOOM_LIMIT && zoomFactor + adjustment > FAR_ZOOM_LIMIT) {
-            zoomFactor = zoomFactor + adjustment;
-            repositionCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Vertical Panning of the Camera
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustVerticalPan(Double adjustment) {
-        if (verticalPan + adjustment >= -VERTICAL_PAN_LIMIT
-            && verticalPan + adjustment <= VERTICAL_PAN_LIMIT) {
-            verticalPan += adjustment;
-            repositionCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Horizontal Panning of the Camera.
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustHorizontalPan(Double adjustment) {
-        this.horizontalPan += adjustment;
-        repositionCamera();
-    }
-
-    @Override
-    public void zoomIn() {
-        adjustZoomFactor(ZOOM_STEP);
-    }
-
-    @Override
-    public void zoomOut() {
-        adjustZoomFactor(-ZOOM_STEP);
-    }
-
-    @Override
-    public void panLeft() {
-        adjustHorizontalPan(-PAN_STEP);
-    }
-
-    @Override
-    public void panRight() {
-        adjustHorizontalPan(PAN_STEP);
-    }
-
-    @Override
-    public void panUp() {
-        adjustVerticalPan(-PAN_STEP);
-    }
-
-    @Override
-    public void panDown() {
-        adjustVerticalPan(PAN_STEP);
-    }
-}

src/main/java/seng302/visualiser/cameras/IsometricCamera.java

@@ -1,113 +0,0 @@
-package seng302.visualiser.cameras;
-
-import javafx.collections.ObservableList;
-import javafx.geometry.Point3D;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-
-public class IsometricCamera extends PerspectiveCamera implements RaceCamera {
-
-    private final Double MIN_X = -120.0;
-    private final Double MAX_X = 125.0;
-
-    private final Double MIN_Y = 40.0;
-    private final Double MAX_Y = 170.0;
-
-    private final Double PAN_LIMIT = 160.0;
-    private final Double NEAR_ZOOM_LIMIT = -50.0;
-    private final Double FAR_ZOOM_LIMIT = -160.0;
-
-    private Double horizontalPan;
-    private Double verticalPan;
-    private Double zoomFactor;
-
-    private ObservableList<Transform> transforms;
-
-    public IsometricCamera(Double cameraStartX, Double cameraStartY) {
-        super(true);
-        transforms = this.getTransforms();
-
-        zoomFactor = (FAR_ZOOM_LIMIT + NEAR_ZOOM_LIMIT) / 2.0;
-        horizontalPan = cameraStartX;
-        verticalPan = cameraStartY;
-
-        updateCamera();
-    }
-
-    /**
-     * Moves the camera to a new position after some change (Zooming or Panning)
-     */
-    private void updateCamera() {
-        transforms.clear();
-        transforms.addAll(
-            new Translate(horizontalPan, verticalPan, zoomFactor),
-            new Rotate(30, new Point3D(1, 0, 0))
-        );
-    }
-
-    /**
-     * Adjusts the zoom amount (camera depth) by some adjustment value
-     *
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustZoomFactor(Double adjustment) {
-        if (zoomFactor + adjustment < NEAR_ZOOM_LIMIT && zoomFactor + adjustment > FAR_ZOOM_LIMIT) {
-            zoomFactor = zoomFactor + adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Vertical Panning of the Camera
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustVerticalPan(Double adjustment) {
-        if (verticalPan + adjustment >= MIN_Y && verticalPan + adjustment <= MAX_Y) {
-            verticalPan += adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Horizontal Panning of the Camera.
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustHorizontalPan(Double adjustment) {
-        if (horizontalPan + adjustment >= MIN_X && horizontalPan + adjustment <= MIN_Y) {
-            this.horizontalPan += adjustment;
-            updateCamera();
-        }
-    }
-
-    @Override
-    public void zoomIn() {
-        adjustZoomFactor(-2.5);
-    }
-
-    @Override
-    public void zoomOut() {
-        adjustZoomFactor(2.5);
-    }
-
-    @Override
-    public void panLeft() {
-        adjustHorizontalPan(-2.5);
-    }
-
-    @Override
-    public void panRight() {
-        adjustHorizontalPan(2.5);
-    }
-
-    @Override
-    public void panUp() {
-        adjustVerticalPan(-2.5);
-    }
-
-    @Override
-    public void panDown() {
-        adjustVerticalPan(2.5);
-    }
-}

src/main/java/seng302/visualiser/cameras/RaceCamera.java

@@ -1,18 +0,0 @@
-package seng302.visualiser.cameras;
-
-
-public interface RaceCamera {
-
-    void zoomIn();
-
-    void zoomOut();
-
-    void panLeft();
-
-    void panRight();
-
-    void panUp();
-
-    void panDown();
-
-}

src/main/java/seng302/visualiser/cameras/TopDownCamera.java

@@ -1,123 +0,0 @@
-package seng302.visualiser.cameras;
-
-
-import java.util.Arrays;
-import javafx.beans.property.DoubleProperty;
-import javafx.collections.ObservableList;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-import seng302.visualiser.fxObjects.assets_3D.BoatObject;
-
-public class TopDownCamera extends PerspectiveCamera implements RaceCamera {
-
-    private final Double PAN_LIMIT = 30.0;
-    private final Double NEAR_ZOOM_LIMIT = -30.0;
-    private final Double FAR_ZOOM_LIMIT = -130.0;
-    private final Double ZOOM_STEP = 2.5;
-
-    private ObservableList<Transform> transforms;
-    private BoatObject playerBoat;
-
-    private Double zoomFactor;
-    private Double horizontalPan;
-    private Double verticalPan;
-
-    public TopDownCamera() {
-        super(true);
-        transforms = this.getTransforms();
-
-        zoomFactor = (FAR_ZOOM_LIMIT + NEAR_ZOOM_LIMIT) / 2.0;
-        horizontalPan = 0.0;
-        verticalPan = 0.0;
-    }
-
-    /**
-     * Sets a player boat object to observe and update the camera with.
-     *
-     * @param playerBoat The player boat to be observed.
-     */
-    public void setPlayerBoat(BoatObject playerBoat) {
-        this.playerBoat = playerBoat;
-
-        for (DoubleProperty o : Arrays
-            .asList(playerBoat.layoutXProperty(), playerBoat.layoutYProperty())) {
-            o.addListener((obs, oldVal, newVal) -> updateCamera());
-        }
-    }
-
-    /**
-     * Moves the camera to a new position after some change (Zooming or Panning)
-     */
-    private void updateCamera() {
-        transforms.clear();
-        transforms.addAll(
-            new Translate(playerBoat.getLayoutX() + horizontalPan,
-                playerBoat.getLayoutY() + verticalPan, zoomFactor)
-        );
-    }
-
-    /**
-     * Adjusts the zoom amount (camera depth) by some adjustment value
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustZoomFactor(Double adjustment) {
-        if (zoomFactor + adjustment < NEAR_ZOOM_LIMIT && zoomFactor + adjustment > FAR_ZOOM_LIMIT) {
-            zoomFactor = zoomFactor + adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Vertical Panning of the Camera
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustVerticalPan(Double adjustment) {
-        if (verticalPan + adjustment >= -PAN_LIMIT && verticalPan + adjustment <= PAN_LIMIT) {
-            verticalPan += adjustment;
-            updateCamera();
-        }
-    }
-
-    /**
-     * Adjusts the Horizontal Panning of the Camera.
-     * @param adjustment the adjustment to be made to the camera
-     */
-    private void adjustHorizontalPan(Double adjustment) {
-        if (horizontalPan + adjustment >= -PAN_LIMIT && horizontalPan + adjustment <= PAN_LIMIT) {
-            horizontalPan += adjustment;
-            updateCamera();
-        }
-    }
-
-    @Override
-    public void zoomIn() {
-        adjustZoomFactor(ZOOM_STEP);
-    }
-
-    @Override
-    public void zoomOut() {
-        adjustZoomFactor(-ZOOM_STEP);
-    }
-
-    @Override
-    public void panLeft() {
-        adjustHorizontalPan(-1.0);
-    }
-
-    @Override
-    public void panRight() {
-        adjustHorizontalPan(1.0);
-    }
-
-    @Override
-    public void panUp() {
-        adjustVerticalPan(-1.0);
-    }
-
-    @Override
-    public void panDown() {
-        adjustVerticalPan(1.0);
-    }
-
-}

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());
-        finishOrderTable.getStylesheets().add(getClass().getResource("/css/Master.css").toString());
+            .add(getClass().getResource("/css/master.css").toString());
+        finishOrderTable.getStylesheets().add(getClass().getResource("/css/master.css").toString());
 
         // set up data for table
         finishOrderTable.setItems(data);
@@ -88,6 +88,7 @@ public class FinishScreenViewController implements Initializable {
 
     public void switchToStartScreenView() {
         Sounds.playButtonClick();
+        //TODO merge fix
         setContentPane("/views/StartScreenView.fxml");
     }
 

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

@@ -5,31 +5,20 @@ import com.jfoenix.controls.JFXDialog;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Translate;
-import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
 import seng302.model.ClientYacht;
@@ -40,19 +29,12 @@ import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.utilities.Sounds;
-import seng302.visualiser.MapPreview;
+import seng302.visualiser.GameView;
 import seng302.visualiser.controllers.cells.PlayerCell;
 import seng302.visualiser.controllers.dialogs.BoatCustomizeController;
-import seng302.visualiser.controllers.dialogs.PopupDialogController;
-import seng302.visualiser.controllers.dialogs.TokenInfoDialogController;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
 public class LobbyController implements Initializable {
 
-    private final double INITIAL_MAP_HEIGHT = 770d;
-    private final double INITIAL_MAP_WIDTH = 574d;
-
     //--------FXML BEGIN--------//
     @FXML
     private VBox playerListVBox;
@@ -67,24 +49,19 @@ public class LobbyController implements Initializable {
     @FXML
     private Label mapName;
     @FXML
-    private AnchorPane serverMap;
-    @FXML
-    private Label roomLabel;
-    @FXML
-    private Pane speedTokenPane, handlingTokenPane, windWalkerTokenPane, bumperTokenPane, randomTokenPane;
+    private Pane serverMap;
     //---------FXML END---------//
 
     private RaceState raceState;
     private JFXDialog customizationDialog;
-    private JFXDialog tokenInfoDialog;
     public Color playersColor;
     private Map<Integer, ClientYacht> playerBoats;
-    private Double mapWidth = INITIAL_MAP_WIDTH, mapHeight = INITIAL_MAP_HEIGHT;
-    private MapPreview mapPreview;
+    private Double mapWidth, mapHeight;
+    private GameView gameView;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        roomLabel.setText("");
+
         this.playerBoats = ViewManager.getInstance().getGameClient().getAllBoatsMap();
 
         if (this.playersColor == null) {
@@ -107,36 +84,22 @@ public class LobbyController implements Initializable {
             serverName.setText(ViewManager.getInstance().getProperty("serverName"));
             mapName.setText(ViewManager.getInstance().getProperty("mapName"));
 
-            int tries = 0;
-
-            while (DiscoveryServerClient.getRoomCode() == null && tries <= 10){
-                try {
-                    Thread.sleep(10);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                tries ++;
-            }
-
-            if (DiscoveryServerClient.getRoomCode() != null){
-                setRoomCode(DiscoveryServerClient.getRoomCode());
-            }
-
             ViewManager.getInstance().getPlayerList().addListener((ListChangeListener<String>) c -> Platform.runLater(this::refreshPlayerList));
 
             ViewManager.getInstance().getPlayerList().setAll(ViewManager.getInstance().getPlayerList().sorted());
         });
 
-        customizeButton.setOnMouseReleased(event -> {
+        Platform.runLater(() -> {
+            Integer playerId = ViewManager.getInstance().getGameClient().getServerThread().getClientId();
+            String name = ViewManager.getInstance().getGameClient().getPlayerNames().get(playerId - 1);
+
+            playersColor = Colors.getColor(playerId - 1);
             customizationDialog = createCustomizeDialog();
+
+            customizeButton.setOnMouseReleased(event -> {
                 Sounds.playButtonClick();
                 customizationDialog.show();
             });
-
-        Platform.runLater(() -> {
-            Integer playerId = ViewManager.getInstance().getGameClient().getServerThread().getClientId();
-
-            playersColor = Colors.getColor(playerId - 1);
         });
 
         leaveLobbyButton.setOnMouseEntered(e -> Sounds.playHoverSound());
@@ -144,110 +107,10 @@ public class LobbyController implements Initializable {
         beginRaceButton.setOnMouseEntered(e -> Sounds.playHoverSound());
 
         initMapPreview();
-        initTokenPreviews();
-    }
-
-
-    /**
-     * Initialises the tokens in the side panel
-     */
-    private void initTokenPreviews() {
-        Group speedToken = ModelFactory.importModel(ModelType.VELOCITY_PICKUP).getAssets();
-        Group handlingToken = ModelFactory.importModel(ModelType.HANDLING_PICKUP).getAssets();
-        Group windWalkerToken = ModelFactory.importModel(ModelType.WIND_WALKER_PICKUP).getAssets();
-        Group bumperToken = ModelFactory.importModel(ModelType.BUMPER_PICKUP).getAssets();
-        Group randomToken = ModelFactory.importModel(ModelType.RANDOM_PICKUP).getAssets();
-
-        HashMap<Pane, Group> tokenPanes = new HashMap<>();
-        tokenPanes.put(speedTokenPane, speedToken);
-        tokenPanes.put(handlingTokenPane, handlingToken);
-        tokenPanes.put(windWalkerTokenPane, windWalkerToken);
-        tokenPanes.put(bumperTokenPane, bumperToken);
-        tokenPanes.put(randomTokenPane, randomToken);
-
-        Scale hoverScale = new Scale(1.2, 1.2, 1.2);
-
-        tokenPanes.entrySet().forEach((entry) -> {
-            Pane thisPane = entry.getKey();
-            Group thisToken = entry.getValue();
-
-            thisToken.getTransforms().addAll(
-                new Translate(40, 50, 0),
-                new Scale(13, 13, 13));
-
-            thisPane.setOnMouseEntered(event -> {
-                thisToken.getTransforms().add(hoverScale);
-            });
-            thisPane.setOnMouseExited(event -> {
-                thisToken.getTransforms().remove(hoverScale);
-            });
-            thisPane.setOnMouseReleased(event -> {
-                tokenInfoDialog = makeTokenDialog(thisPane);
-                tokenInfoDialog.show();
-            });
-
-            thisPane.getChildren().add(thisToken);
-        });
-
-        //Hacky rotations for wind and random to level it in the plane
-        windWalkerToken.getTransforms().addAll(
-            new Rotate(-70, new Point3D(1, 0, 0)),
-            new Translate(0, 2,0)
-        );
-        randomToken.getTransforms().addAll(
-            new Rotate(-90, new Point3D(1, 0, 0)),
-            new Translate(0, 0,1)
-        );
-    }
-
-    private JFXDialog makeTokenDialog(Pane inducingPane) {
-        String header = "...";
-        String body = "Nothing to see here";
-        ModelType modelType = ModelType.RANDOM_PICKUP;
-
-        if (inducingPane == speedTokenPane) {
-            header = "Speed Boost";
-            body = "Increases your max velocity";
-            modelType = ModelType.VELOCITY_PICKUP;
-        } else if (inducingPane == handlingTokenPane) {
-            header = "Handling Boost";
-            body = "Increases your turing rate";
-            modelType = ModelType.HANDLING_PICKUP;
-        } else if (inducingPane == windWalkerTokenPane) {
-            header = "Wind Walker";
-            body = "The wind now rotates with you, giving you your optimal speed in all directions";
-            modelType = ModelType.WIND_WALKER_PICKUP;
-        } else if (inducingPane == bumperTokenPane) {
-            header = "Bumper";
-            body = "While this is active, upon hitting another boat, you will power it down for a short time";
-            modelType = ModelType.BUMPER_PICKUP;
-        } else if (inducingPane == randomTokenPane) {
-            header = "Random";
-            body = "A 50% chance of becoming any other token and a 50% chance of slowing your boat for a time";
-            modelType = ModelType.RANDOM_PICKUP;
-        }
-
-        FXMLLoader dialog = new FXMLLoader(
-            getClass().getResource("/views/dialogs/TokenInfoDialog.fxml"));
-
-        JFXDialog tokenInfoDialog = null;
-
-        try {
-            tokenInfoDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
-                JFXDialog.DialogTransition.CENTER);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        TokenInfoDialogController controller = dialog.getController();
-        controller.setParentController(this);
-        controller.setHeader(header);
-        controller.setContent(body);
-        controller.setToken(modelType);
-        return tokenInfoDialog;
     }
 
     private JFXDialog createCustomizeDialog() {
+        // TODO: 12/09/17 ajm412: Why is this here? is there no better way we can do this? Ideally inside the LobbyController.
         FXMLLoader dialog = new FXMLLoader(
             getClass().getResource("/views/dialogs/BoatCustomizeDialog.fxml"));
 
@@ -256,6 +119,7 @@ public class LobbyController implements Initializable {
         try {
             customizationDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
                 JFXDialog.DialogTransition.CENTER);
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -264,39 +128,48 @@ public class LobbyController implements Initializable {
 
         controller.setParentController(this);
         controller.setPlayerColor(this.playersColor);
-        controller.setPlayerName(this.playerBoats
-            .get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
-            .getBoatName());
-        controller.setCurrentBoat(this.playerBoats.get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
-            .getBoatType().toString());
 
         return customizationDialog;
     }
 
+    /**
+     *
+     */
+    private void refreshMapView(){
+        RaceXMLData raceData = ViewManager.getInstance().getGameClient().getCourseData();
+        List<Limit> border = raceData.getCourseLimit();
+        List<CompoundMark> marks = new ArrayList<CompoundMark>(raceData.getCompoundMarks().values());
+        List<Corner> corners = raceData.getMarkSequence();
+
+        gameView.setSize(mapWidth, mapHeight);
+
+        // Update game view
+        gameView.updateBorder(border);
+        gameView.updateCourse(marks, corners);
+    }
 
     /**
      * Initializes a top down preview of the race course map.
      */
     private void initMapPreview() {
-        RaceXMLData raceData = ViewManager.getInstance().getGameClient().getCourseData();
-        List<Limit> border = raceData.getCourseLimit();
-        List<CompoundMark> marks = new ArrayList<>(raceData.getCompoundMarks().values());
-        List<Corner> corners = raceData.getMarkSequence();
+        gameView = new GameView();
+        gameView.setHorizontalBuffer(330d);
 
-        mapPreview = new MapPreview(marks, corners, border);
+        mapWidth = 770d;
+        mapHeight = 574d;
+
+        // Add game view
         serverMap.getChildren().clear();
-        serverMap.getChildren().add(mapPreview.getAssets());
-
-        mapPreview.setSize(mapWidth, mapHeight);
+        serverMap.getChildren().add(gameView);
 
         serverMap.widthProperty().addListener((observable, oldValue, newValue) -> {
             mapWidth = newValue.doubleValue();
-            mapPreview.setSize(mapWidth, mapHeight);
+            refreshMapView();
         });
-//
+
         serverMap.heightProperty().addListener((observable, oldValue, newValue) -> {
             mapHeight = newValue.doubleValue();
-            mapPreview.setSize(mapWidth, mapHeight);
+            refreshMapView();
         });
     }
 
@@ -328,7 +201,7 @@ public class LobbyController implements Initializable {
             FXMLLoader loader = new FXMLLoader(
                 getClass().getResource("/views/cells/PlayerCell.fxml"));
 
-            loader.setController(new PlayerCell(playerId, yacht));
+            loader.setController(new PlayerCell(playerId, yacht.getBoatName(), yacht.getColour()));
 
             try {
                 pane = loader.load();
@@ -368,12 +241,4 @@ public class LobbyController implements Initializable {
     public void closeCustomizationDialog() {
         customizationDialog.close();
     }
-
-    public void closeTokenInfoDialog() {
-        tokenInfoDialog.close();
-    }
-
-    public void setRoomCode(String roomCode) {
-        roomLabel.setText("Room: " + roomCode);
-    }
 }

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

@@ -1,50 +1,73 @@
 package seng302.visualiser.controllers;
 
 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 javafx.animation.RotateTransition;
+import java.util.concurrent.TimeUnit;
+import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+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;
+import javafx.scene.chart.XYChart.Data;
+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.util.Duration;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.Polyline;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 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.MiniMap;
-import seng302.visualiser.controllers.dialogs.FinishDialogController;
+import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
+import seng302.visualiser.controllers.annotations.ImportantAnnotationDelegate;
+import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
 import seng302.visualiser.fxObjects.ChatHistory;
+import seng302.visualiser.fxObjects.assets_2D.BoatObject;
+import seng302.visualiser.fxObjects.assets_2D.WindArrow;
 
 /**
  * Controller class that manages the display of a race
  */
-public class RaceViewController extends Thread {
+public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
     private final int CHAT_LIMIT = 128;
-    private static final Double ICON_BLINK_TIMEOUT_RATIO = 0.6;
-    private static final Integer ICON_BLINK_PERIOD = 500;
 
     @FXML
-    private AnchorPane loadingScreenPane;
-    @FXML
-    private ImageView loadingScreen;
+    private Pane basePane;
     @FXML
     private JFXButton chatSend;
     @FXML
@@ -52,11 +75,30 @@ public class RaceViewController extends Thread {
     @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 StackPane contentAnchorPane;
+    private GridPane contentGridPane;
     @FXML
-    private Pane miniMapPane;
+    private AnchorPane rvAnchorPane;
+    @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
@@ -65,47 +107,54 @@ public class RaceViewController extends Thread {
     private Label windSpeedLabel;
     @FXML
     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 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;
-    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);
-        //Centers the Image within the image view
-        double w = 0;
-        double h = 0;
-        double ratioX = loadingScreen.getFitWidth() / loadingImage.getWidth();
-        double ratioY = loadingScreen.getFitHeight() / loadingImage.getHeight();
-        double reduceRatio = 0;
-        if(ratioX >= ratioY) {
-            reduceRatio = ratioY;
-        } else {
-            reduceRatio = ratioX;
-        }
-        w = loadingImage.getWidth() * reduceRatio;
-        h = loadingImage.getHeight() * reduceRatio;
-        loadingScreen.setX((loadingScreen.getFitWidth() - w) / 2);
-        loadingScreen.setY((loadingScreen.getFitHeight() - h) / 2);
         Sounds.stopMusic();
         Sounds.playRaceMusic();
 
+        // Load a default important annotation state
+        //importantAnnotations = new ImportantAnnotationsState();
+
+        //Formatting the y axis of the sparkline
+//        raceSparkLine.getYAxis().setRotate(180);
+//        raceSparkLine.getYAxis().setTickLabelRotation(180);
+//        raceSparkLine.getYAxis().setTranslateX(-5);
+        //raceSparkLine.visibleProperty().setValue(false);
+        //raceSparkLine.getYAxis().setAutoRanging(false);
+        //sparklineYAxis.setTickMarkVisible(false);
+
+        //positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+//        raceSparkLine.visibleProperty().setValue(false);
+//        raceSparkLine.getYAxis().setAutoRanging(false);
+//        sparklineYAxis.setTickMarkVisible(false);
+//        positionVbox.getStylesheets().add(getClass().getResource("/css/master.css").toString());
+
+        //selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
+//        rvAnchorPane.prefWidthProperty().bind(ViewManager.getInstance().getDecorator().widthProperty());
+//        rvAnchorPane.prefHeightProperty().bind(ViewManager.getInstance().getDecorator().heightProperty());
+//        selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
+//        windArrowHolder.getChildren().addAll(windArrow);
+//        windArrow.setLayoutX(windArrowHolder.getWidth() / 2);
+//        windArrow.setLayoutY(windArrowHolder.getHeight() / 2);
+
+//        selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
         chatInput.lengthProperty().addListener((obs, oldLen, newLen) -> {
             if (newLen.intValue() > CHAT_LIMIT) {
                 chatInput.setText(chatInput.getText().substring(0, CHAT_LIMIT));
@@ -119,96 +168,60 @@ public class RaceViewController extends Thread {
         chatHistory.prefHeightProperty().bind(
             chatHistoryHolder.heightProperty()
         );
+//        chatHistory.setFitToWidth(true);
+//        chatHistory.setFitToHeight(true);
+//        chatHistory.textProperty().addListener((obs, oldValue, newValue) -> {
+//            chatHistory.setScrollTop(Double.MAX_VALUE);
+//        });
+        rvAnchorPane.setOnMouseClicked((event) ->
+                rvAnchorPane.requestFocus()
+        );
 
-        contentStackPane.setOnMouseClicked(event -> {
-            contentStackPane.requestFocus();
-        });
-        Platform.runLater(contentStackPane::requestFocus);
         //Makes the chat history non transparent when clicked on
-        chatInput.focusedProperty().addListener((observable, oldValue, newValue) -> {
+        chatInput.focusedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue,
+                Boolean newValue) {
                 if (newValue) {
                     chatHistory.increaseOpacity();
                 } else {
                     chatHistory.decreaseOpacity();
                 }
-        });
-
-        lastWindDirection = 0d;
-    }
-
-    public void showFinishDialog(ArrayList<ClientYacht> finishedBoats) {
-        raceState.setRaceStarted(false);
-        createFinishDialog(finishedBoats);
-    }
-
-    public void showView(){
-        loadingScreenPane.setVisible(false);
-        contentStackPane.setVisible(true);
-        miniMapPane.setVisible(true);
-        miniMapButton.setVisible(true);
-        Platform.runLater(new Runnable() {
-            @Override
-            public void run() {
-                contentStackPane.requestFocus();
             }
         });
     }
 
-    /**
-     * Create finishScreenDialog and set up finishDialogController.
-     */
-    private void createFinishDialog(ArrayList<ClientYacht> finishedBoats) {
-        FXMLLoader dialog = new FXMLLoader(
-            getClass().getResource("/views/dialogs/RaceFinishDialog.fxml"));
-
-        Platform.runLater(() -> {
-            try {
-                finishScreenDialog = new JFXDialog(contentStackPane, dialog.load(),
-                    JFXDialog.DialogTransition.CENTER);
-                finishDialogController = dialog.getController();
-                finishDialogController.setFinishedBoats(finishedBoats);
-                finishScreenDialog.show();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-
     public void loadRace (
         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;
 
-        player.addPowerUpListener(this::displayPowerUpIcon);
-        player.addPowerDownListener(this::removeIcon);
-
-        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("✕");
+        raceState.getPlayerPositions().addListener((ListChangeListener<ClientYacht>) c -> {
+            while (c.next()) {
+                if (c.wasPermutated()) {
+                    updateOrder(raceState.getPlayerPositions());
+                    updateSparkLine();
+                }
             }
         });
 
+        updateOrder(raceState.getPlayerPositions());
+        gameView = new GameView3D();
+        gameView.setFrameRateFXText(fpsDisplay);
         Platform.runLater(() -> {
-            contentStackPane.getChildren().add(0, gameView.getAssets());
+            contentAnchorPane.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());
+            System.out.println(((SubScene) gameView.getAssets()).getHeight());
+            System.out.println(((SubScene) gameView.getAssets()).getWidth());
+
         });
         gameView.setBoats(new ArrayList<>(participants.values()));
         gameView.updateBorder(raceData.getCourseLimit());
@@ -216,10 +229,11 @@ public class RaceViewController extends Thread {
         gameView.updateCourse(
             new ArrayList<>(raceData.getCompoundMarks().values()), raceData.getMarkSequence()
         );
+//        gameView.enableZoom();
         gameView.setBoatAsPlayer(player);
+//        gameView.startRace();
 
 //        raceState.addCollisionListener(gameView::drawCollision);
-
         raceState.windDirectionProperty().addListener((obs, oldDirection, newDirection) -> {
             gameView.setWindDir(newDirection.doubleValue());
             Platform.runLater(() -> updateWindDirection(newDirection.doubleValue()));
@@ -231,71 +245,205 @@ public class RaceViewController extends Thread {
             updateWindDirection(raceState.windDirectionProperty().doubleValue());
             updateWindSpeed(raceState.getWindSpeed());
         });
-        gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
-        Platform.runLater(this::initializeUpdateTimer);
+//        gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
+
+        //TODO extract chat stuff
+//        raceState.addCollisionListener(gameView::drawCollision);
+//        raceState.windDirectionProperty().addListener((obs, oldDirection, newDirection) -> {
+//            gameView.setWindDir(newDirection.doubleValue());
+//            updateWindDirection(newDirection.doubleValue());
+//        });
+//        raceState.windSpeedProperty().addListener((obs, oldSpeed, newSpeed) -> {
+//            updateWindSpeed(newSpeed.doubleValue());
+//        });
+//        updateWindDirection(raceState.windDirectionProperty().doubleValue());
+//        updateWindSpeed(raceState.getWindSpeed());
+//        gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
+//        chatInput.focusedProperty().addListener((obs, oldValue, newValue) -> {
+//            if (newValue) {
+//                gameView.disableZoom();
+//            } else {
+//                gameView.enableZoom();
+//            }
+//        });
+        Platform.runLater(() -> {
+            initializeUpdateTimer();
+//            initialiseFPSCheckBox();
+//            initialiseAnnotationSlider();
+//            initialiseBoatSelectionComboBox();
+//            initialiseSparkLine();
+        });
     }
 
     /**
-     * Displays the relevant icon, starts blinking it when it is close to turning off and then
-     * switches it off after the tokens time out
+     * The important annotations have been changed, update this view
      *
-     * @param yacht The yacht only for which we are displaying the icon
-     * @param tokenType The type of token, indicating what icon needs to be displayed
+     * @param importantAnnotationsState The current state of the selected annotations
      */
-    private void displayPowerUpIcon(ClientYacht yacht, TokenType tokenType) {
-        if (yacht == player) {
-            if (iconToDisplay != null) {
-                iconToDisplay.setVisible(false);
+    public void importantAnnotationsChanged(ImportantAnnotationsState importantAnnotationsState) {
+        this.importantAnnotations = importantAnnotationsState;
+        setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
-            switch (tokenType) {
-                case BOOST:
-                    iconToDisplay = velocityIcon;
-                    break;
-                case HANDLING:
-                    iconToDisplay = handlingIcon;
-                    break;
-                case WIND_WALKER:
-                    iconToDisplay = windWalkerIcon;
-                    break;
-                case BUMPER:
-                    iconToDisplay = bumperIcon;
-                    break;
-                case RANDOM:
-                    iconToDisplay = badRandomIcon;
-                    break;
-                default:
-                    iconToDisplay = velocityIcon;
-            }
 
-            //Turn icon on
-            iconToDisplay.setVisible(true);
-
-            //Start blinking icon towards end
-            if (blinkingTimer != null) {
-                blinkingTimer.cancel();
-            }
-            blinkingTimer = new Timer("Blinking Timer");
-            blinkingTimer.schedule(new TimerTask() {
-                Boolean isVisible = true;
-
-                @Override
-                public void run() {
-                    isVisible = !isVisible;
-                    iconToDisplay.setVisible(isVisible);
-                }
-            }, (int) (tokenType.getTimeout() * ICON_BLINK_TIMEOUT_RATIO), ICON_BLINK_PERIOD);
+    /**
+     * 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();
         }
     }
 
-    public void removeIcon(ClientYacht yacht) {
-        if (yacht == player) {
-            blinkingTimer.cancel();
-            iconToDisplay.setVisible(false);
-            iconToDisplay = null;
+//    private void initialiseFPSCheckBox() {
+//        toggleFps.selectedProperty().addListener((obs, oldVal, newVal) ->
+//            gameView.setFPSVisibility(toggleFps.isSelected())
+//        );
+//    }
+
+    private void initialiseAnnotationSlider() {
+//        annotationSlider.setLabelFormatter(new StringConverter<Double>() {
+//            @Override
+//            public String toString(Double n) {
+//                if (n == 0) {
+//                    return "None";
+//                }
+//                if (n == 1) {
+//                    return "Important";
+//                }
+//                if (n == 2) {
+//                    return "All";
+//                }
+//                return "All";
+//            }
+//
+//            @Override
+//            public Double fromString(String s) {
+//                switch (s) {
+//                    case "None":
+//                        return 0d;
+//                    case "Important":
+//                        return 1d;
+//                    case "All":
+//                        return 2d;
+//
+//                    default:
+//                        return 2d;
+//                }
+//            }
+//        });
+//        annotationSlider.setValue(2);
+//        annotationSlider.valueProperty().addListener((obs, oldVal, newVal) ->
+//            setAnnotations((int) annotationSlider.getValue())
+//        );
+    }
+
+
+    /**
+     * Used to add any new yachts into the race that may have started late or not have had data received yet
+     */
+    private void updateSparkLine(){
+//        // TODO: 2/08/17 there is about 0 chance of this working. Once we are keeping track of boat positions it can be fixed.
+//        // Collect the racing yachts that aren't already in the chart
+//        sparkLineData.clear();
+//        List<ClientYacht> sparkLineCandidates = new ArrayList<>(participants.values());
+//        // Create a new data series for new yachts
+//        sparkLineCandidates
+//            .stream()
+//            .filter(yacht -> yacht.getPosition() != null)
+//            .forEach(yacht -> {
+//                Series<String, Double> yachtData = new Series<>();
+//                yachtData.setName(yacht.getSourceId().toString());
+//                yachtData.getData().add(
+//                    new Data<>(
+//                        Integer.toString(yacht.getLegNumber()),
+//                        1.0 + participants.size() - yacht.getPosition()
+//                    )
+//                );
+//            sparkLineData.add(yachtData);
+//            });
+//
+//        // Lambda function to sort the series in order of leg (later legs shown more to the right)
+//        sparkLineData.sort((o1, o2) -> {
+//            Integer leg1 =  Integer.parseInt(o1.getData().get(o1.getData().size()-1).getXValue());
+//            Integer leg2 =  Integer.parseInt(o2.getData().get(o2.getData().size()-1).getXValue());
+//            if (leg2 < leg1){
+//                return 1;
+//            } else {
+//                return -1;
+//            }
+//        });
+//
+//        // Adds the new data series to the sparkline (and set the colour of the series)
+//        Platform.runLater(() -> {
+//            sparkLineData
+//                .stream()
+//                .filter(spark -> !raceSparkLine.getData().contains(spark))
+//                .forEach(spark -> {
+//                    raceSparkLine.getData().add(spark);
+//                    spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
+//                });
+//        });
+    }
+
+    private void initialiseSparkLine() {
+//        sparklineYAxis.setUpperBound(participants.size() + 1);
+//        raceSparkLine.setCreateSymbols(false);
+    }
+
+    /**
+     * Updates the yachts sparkline of the desired yacht and using the new leg number
+     * @param yacht The yacht to be updated on the sparkline
+     * @param legNumber the leg number that the position will be assigned to
+     */
+    void updateYachtPositionSparkline(ClientYacht yacht, Integer legNumber){
+        for (XYChart.Series<String, Double> positionData : sparkLineData) {
+            positionData.getData().add(
+                new Data<>(
+                    Integer.toString(legNumber),
+                    1.0 + participants.size() - yacht.getPlacing()
+                )
+            );
         }
     }
 
+
+    /**
+     * gets the rgb string of the yachts colour to use for the chart via css
+     * @param yachtId id of yacht passed in to get the yachts colour
+     * @return the colour as an rgb string
+     */
+    private String getBoatColorAsRGB(String yachtId){
+        Color color = participants.get(Integer.valueOf(yachtId)).getColour();
+        if (color == null){
+            return String.format("#%02X%02X%02X",255,255,255);
+        }
+        return String.format( "#%02X%02X%02X",
+            (int)( color.getRed() * 255 ),
+            (int)( color.getGreen() * 255 ),
+            (int)( color.getBlue() * 255 )
+        );
+    }
+
+
     /**
      * 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.
@@ -313,19 +461,42 @@ public class RaceViewController extends Thread {
         }, 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.
      */
     private void updateWindDirection(double direction) {
         windDirectionLabel.setText(String.format("%.1f°", direction));
-        RotateTransition rt = new RotateTransition(Duration.millis(300), windImageView);
-        rt.setByAngle(direction - lastWindDirection);
-        rt.setCycleCount(3);
-        rt.setAutoReverse(true);
-        rt.play();
-        lastWindDirection = direction;
-//        windImageView.setRotate(direction);
+        windImageView.setRotate(direction);
     }
 
     /**
@@ -394,6 +565,226 @@ public class RaceViewController extends Thread {
         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());
@@ -410,7 +801,7 @@ public class RaceViewController extends Thread {
     public String readChatInput() {
         String chat = chatInput.getText();
         chatInput.clear();
-        contentStackPane.requestFocus();
+        rvAnchorPane.requestFocus();
         return chat;
     }
 

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

@@ -7,7 +7,6 @@ import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -23,22 +22,11 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.discoveryServer.DiscoveryServerClient;
-import seng302.discoveryServer.util.ServerListing;
 import seng302.gameServer.ServerDescription;
-import seng302.gameServer.messages.ServerRegistrationMessage;
 import seng302.utilities.Sounds;
 import seng302.visualiser.ServerListener;
 import seng302.visualiser.ServerListenerDelegate;
 import seng302.visualiser.controllers.cells.ServerCell;
-import seng302.visualiser.controllers.dialogs.DirectConnectController;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ResourceBundle;
-import seng302.visualiser.controllers.dialogs.ServerCreationController;
 import seng302.visualiser.validators.HostNameFieldValidator;
 import seng302.visualiser.validators.NumberRangeValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -58,29 +46,15 @@ public class ServerListController implements Initializable, ServerListenerDelega
     private JFXButton serverListHostButton;
     //Direct Connect
     @FXML
-    private JFXButton directConnectButton;
+    private JFXButton connectButton;
+    @FXML
+    private JFXTextField serverHostName;
     @FXML
     private JFXTextField serverPortNumber;
-    @FXML
-    private JFXButton roomConnectButton;
-    @FXML
-    private JFXTextField roomNumber;
-    @FXML
-    private JFXButton autoSelectGame;
     //---------FXML END---------//
 
     private Label noServersFound;
     private Logger logger = LoggerFactory.getLogger(ServerListController.class);
-    private JFXDialog directConnectDialog;
-
-    private JFXDialog serverCreationDialog;
-    private List<ServerCreationDialogListener> serverCreationDialogListeners = new ArrayList<>();
-
-    @FunctionalInterface
-    public interface ServerCreationDialogListener {
-
-        void notifyClosure();
-    }
 
     // TODO: 12/09/17 ajm412: break this method down, its way too long.
     @Override
@@ -88,25 +62,13 @@ public class ServerListController implements Initializable, ServerListenerDelega
         serverListVBox.minWidthProperty().bind(serverListScrollPane.widthProperty());
 
         // Set Event Bindings
-        directConnectButton.setOnMouseEntered(event -> Sounds.playHoverSound());
+        connectButton.setOnMouseEntered(event -> Sounds.playHoverSound());
         serverListHostButton.setOnMouseEntered(event -> Sounds.playHoverSound());
-
-
-
-        roomNumber.setOnKeyPressed(event -> {
-            if (event.getCode().equals(KeyCode.ENTER)) {
-                connectToRoomCode(roomNumber.getText());
-            }
-        });
-
-        directConnectButton.setOnMouseReleased(event -> {
-            directConnectDialog.show();
+        connectButton.setOnMouseReleased(event -> {
+            attemptToDirectConnect();
             Sounds.playButtonClick();
         });
-
-        directConnectDialog = createDirectConnectDialog();
-
-        for (JFXTextField textField : Arrays.asList(roomNumber)) {
+        for (JFXTextField textField : Arrays.asList(serverHostName, serverPortNumber)) {
             // Event for pressing enter to submit direct connection
             textField.setOnKeyPressed(event -> {
                 if (event.getCode().equals(KeyCode.ENTER)) {
@@ -120,41 +82,15 @@ public class ServerListController implements Initializable, ServerListenerDelega
             textField.getValidators().add(validator);
         }
 
-        autoSelectGame.setOnMouseReleased(e -> {
-            ServerListing listing;
-            DiscoveryServerClient client = new DiscoveryServerClient();
-
-            try {
-                listing = client.getRandomServer();
-            } catch (Exception e1) {
-                ViewManager.getInstance().showErrorSnackBar("Unable to connect to matchmaking server. Are you connected to the internet?");
-                return;
-            }
-
-            if (client.didFail()){
-                return;
-            }
-
-            if (listing == null || listing.equals(ServerRegistrationMessage.getEmptyRegistration())) {
-                ViewManager.getInstance().showErrorSnackBar("There are currently no servers available for you to connect to.");
-                return;
-            }
-
-            ViewManager.getInstance().getGameClient().runAsClient(listing.getAddress(), listing.getPortNumber());
-        });
-
-        /*
         // Validating the hostname
         HostNameFieldValidator hostNameValidator = new HostNameFieldValidator();
         hostNameValidator.setMessage("Host name incorrect");
-        roomCodeInput.getValidators().add(hostNameValidator);
+        serverHostName.getValidators().add(hostNameValidator);
 
         // Validating the port number
         NumberRangeValidator portNumberValidator = new NumberRangeValidator(1025, 65536);
         portNumberValidator.setMessage("Port number incorrect");
         serverPortNumber.getValidators().add(portNumberValidator);
-        TODO later
-        */
 
         // Start listening for servers on network
         try {
@@ -175,69 +111,30 @@ public class ServerListController implements Initializable, ServerListenerDelega
         );
         serverListVBox.getChildren().add(noServersFound);
 
-        roomConnectButton.setOnMouseReleased(e -> {
-            String roomCode = roomNumber.getText();
-            connectToRoomCode(roomCode);
-        });
-
         // Set up dialog for server creation
-        serverListHostButton.setOnAction(action -> {
-            showServerCreationDialog();
-        });
-
-        addServerCreationDialogListener(this::closeServerCreationDialog);
-    }
-
-    /**
-     * Shows Server Creation Dialog when "Host" button is clicked.
-     */
-    private void showServerCreationDialog() {
         Platform.runLater(() -> {
             FXMLLoader dialogContent = new FXMLLoader(getClass().getResource(
                 "/views/dialogs/ServerCreationDialog.fxml"));
             try {
-                serverCreationDialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
+                JFXDialog dialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
                     DialogTransition.CENTER);
-                ServerCreationController serverCreationController = dialogContent.getController();
-                serverCreationController.setListener(serverCreationDialogListeners);
-                serverCreationDialog.show();
+                serverListHostButton.setOnAction(action -> {
+                    dialog.show();
                     Sounds.playButtonClick();
+                });
             } catch (IOException e) {
-                e.printStackTrace();
                 logger.warn("Could not create Server Creation Dialog.");
             }
         });
     }
 
-    private JFXDialog createDirectConnectDialog() {
-        FXMLLoader dialog = new FXMLLoader(
-                getClass().getResource("/views/dialogs/DirectConnect.fxml"));
-
-        JFXDialog dcDialog = null;
-
-        try {
-            dcDialog = new JFXDialog(serverListMainStackPane, dialog.load(),
-                    JFXDialog.DialogTransition.CENTER);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        DirectConnectController controller = dialog.getController();
-
-        return dcDialog;
-    }
-
-    private void closeServerCreationDialog() {
-        serverCreationDialog.close();
-    }
-
     /**
      * Validates the connection and attempts to connect to a given hostname and port number.
      */
     private void attemptToDirectConnect() {
-        /*if (validateDirectConnection(serverHostName.getText(), serverPortNumber.getText())) {
+        if (validateDirectConnection(serverHostName.getText(), serverPortNumber.getText())) {
             DirectConnect();
-        }*/
+        }
     }
 
     /**
@@ -247,40 +144,10 @@ public class ServerListController implements Initializable, ServerListenerDelega
      * @return boolean value if host and port number are valid values
      */
     private Boolean validateDirectConnection(String hostName, String portNumber) {
-        /*Boolean hostNameValid = ValidationTools.validateTextField(serverHostName);
-        *
+        Boolean hostNameValid = ValidationTools.validateTextField(serverHostName);
         Boolean portNumberValid = ValidationTools.validateTextField(serverPortNumber);
 
-        return hostNameValid && portNumberValid;*/
-        return true;
-    }
-
-    private void connectToRoomCode(String roomCode){
-        DiscoveryServerClient client = new DiscoveryServerClient();
-        ServerListing serverListing;
-
-        if (client.didFail()){
-            return;
-        }
-
-        try {
-            serverListing = client.getServerForRoomCode(roomCode);
-        } catch (Exception e) {
-            ViewManager.getInstance().showErrorSnackBar("Error connecting to matchmaking server. Please try again later.");
-            return;
-        }
-
-        if (serverListing == null || serverListing.equals(new ServerListing("","","", 0, 0))){
-            ViewManager.getInstance().showErrorSnackBar("No servers could be found with that room code.");
-            return;
-        }
-
-        try {
-            ViewManager.getInstance().getGameClient().runAsClient(serverListing.getAddress(), serverListing.getPortNumber());
-        }
-        catch (Exception e) {
-            ViewManager.getInstance().showErrorSnackBar("Error connecting to matchmaking service.");
-        }
+        return hostNameValid && portNumberValid;
     }
 
     /**
@@ -288,7 +155,7 @@ public class ServerListController implements Initializable, ServerListenerDelega
      */
     private void DirectConnect() {
         Sounds.playButtonClick();
-       // ViewManager.getInstance().getGameClient().runAsClient(serverHostName.getText(), Integer.parseInt(serverPortNumber.getText()));
+        ViewManager.getInstance().getGameClient().runAsClient(serverHostName.getText(), Integer.parseInt(serverPortNumber.getText()));
     }
 
     /**
@@ -329,14 +196,4 @@ public class ServerListController implements Initializable, ServerListenerDelega
     public void serverDetected(ServerDescription serverDescription, List<ServerDescription> servers) {
         Platform.runLater(() -> refreshServers(servers));
     }
-
-    private void addServerCreationDialogListener(
-        ServerCreationDialogListener serverCreationDialogListener) {
-        serverCreationDialogListeners.add(serverCreationDialogListener);
-    }
-
-    private void removeServerCreationDialogListener(
-        ServerCreationDialogListener serverCreationDialogListener) {
-        serverCreationDialogListeners.remove(serverCreationDialogListener);
-    }
 }

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

@@ -1,46 +0,0 @@
-package seng302.visualiser.controllers;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
-/**
- * Created by Kusal on 26-Sep-17.
- */
-public class SplashScreenController implements Initializable{
-
-    @FXML
-    private StackPane rootPane;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        new SplashScreen().start();
-    }
-
-
-    class SplashScreen extends Thread {
-        public void run(){
-            try {
-                Thread.sleep(3000);
-                Platform.runLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            Stage stage = new Stage();
-                            ViewManager.getInstance().initialStartView(stage);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        rootPane.getScene().getWindow().hide();
-                    }
-                });
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

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

@@ -59,7 +59,7 @@ public class StartScreenController implements Initializable{
     /**
      * Changes the view to the Server Browser.
      */
-    public void goToServerBrowser() {
+    private void goToServerBrowser() {
         try {
             ViewManager.getInstance().setScene(serverList);
         } catch (Exception e) {

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

@@ -2,30 +2,27 @@ package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDecorator;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialog.DialogTransition;
-import com.jfoenix.controls.JFXSnackbar;
 import com.jfoenix.svg.SVGGlyph;
+import java.io.IOException;
+import java.util.HashMap;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.*;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.SceneAntialiasing;
 import javafx.scene.image.Image;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import javafx.stage.StageStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.ServerAdvertiser;
+import seng302.utilities.BonjourInstallChecker;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameClient;
-import seng302.visualiser.controllers.dialogs.KeyBindingDialogController;
-import seng302.visualiser.controllers.dialogs.PopupDialogController;
-
-import java.io.IOException;
-import java.util.HashMap;
 
 public class ViewManager {
 
@@ -35,9 +32,12 @@ public class ViewManager {
     private HashMap<String, String> properties; //TODO is this the best way to do this??
     private ObservableList<String> playerList;
     private Logger logger = LoggerFactory.getLogger(ViewManager.class);
+
+    public Stage getStage() {
+        return stage;
+    }
+
     private Stage stage;
-    private JFXSnackbar jfxSnackbar;
-    private JFXDialog keyBindingDialog;
 
     private ViewManager() {
         properties = new HashMap<>();
@@ -53,18 +53,8 @@ public class ViewManager {
         if (instance == null) {
             instance = new ViewManager();
         }
-        return instance;
-    }
 
-    public void initialiseSplashScreen(Stage stage) throws IOException {
-        this.stage = stage;
-        Parent root = FXMLLoader.load(getClass().getResource("/views/SplashScreen.fxml"));
-        Scene scene = new Scene(root);
-        stage.setTitle("Party Parrots At Sea");
-        stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
-        stage.setScene(scene);
-        stage.initStyle(StageStyle.UNDECORATED);
-        stage.show();
+        return instance;
     }
 
     /**
@@ -74,14 +64,17 @@ public class ViewManager {
         this.stage = stage;
         Parent root = FXMLLoader.load(getClass().getResource("/views/StartScreenView.fxml"));
         stage.setTitle("Party Parrots At Sea");
+
         JFXDecorator decorator = new JFXDecorator(stage, root, false, true, true);
         decorator.setCustomMaximize(true);
         decorator.applyCss();
         decorator.getStylesheets()
             .add(getClass().getResource("/css/Master.css").toExternalForm());
-        gameClient = new GameClient(decorator);
+
         setDecorator(decorator);
 
+        gameClient = new GameClient(decorator);
+
         stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
         Scene scene = new Scene(decorator, 1200, 800, false, SceneAntialiasing.BALANCED);
         stage.setMinHeight(800);
@@ -119,56 +112,28 @@ public class ViewManager {
     private void setDecorator(JFXDecorator newDecorator) {
         decorator = newDecorator;
 
-        decorator.setOnCloseButtonAction(() -> {
-            gameClient.stopGame();
-            System.exit(0);
-        });
-
         //Injecting a volume toggle into the decorator.
         //Get the button box
         HBox btns = (HBox) decorator.getChildren().get(0);
 
-        //Create settings button -- [WIP]
-        JFXButton btnKeyBinding = new JFXButton();
-        btnKeyBinding.setText(" Key Bindings");
-        btnKeyBinding.setStyle("-fx-text-fill:#fff");
-        btnKeyBinding.getStyleClass().add("jfx-decorator-button");
-        btnKeyBinding.setCursor(Cursor.HAND);
-        btnKeyBinding.setFocusTraversable(false);
-
-        btnKeyBinding.setOnMouseClicked(event -> Platform.runLater(() -> {
-            try {
-                if (!checkDialogOpened(decorator.getChildren())) {
-                    showKeyBindingDialog();
-                }
-            } catch (IOException e) {
-                logger.warn("Something went wrong when opening key bind dialog");
-            }
-        }));
-
         //Create new button
         JFXButton btnMute = new JFXButton();
         btnMute.setText(" Toggle Sound");
         btnMute.setStyle("-fx-text-fill:#fff");
         btnMute.getStyleClass().add("jfx-decorator-button");
         btnMute.setCursor(Cursor.HAND);
-        btnMute.setFocusTraversable(false);
 
         //Create Graphics
         SVGGlyph spacer = new SVGGlyph(0, "SPACER", "", Color.WHITE);
         SVGGlyph volumeOn = new SVGGlyph(0, "VOLUME_ON",
-            "M0,6 L0,12 L4,12 L9,17 L9,1 L4,6 L0,6 L0,6 Z M13.5,9 C13.5,7.2 12.5,5.7 11,5 L11,13 C12.5,12.3 13.5,10.8 13.5,9 L13.5,9 Z M11,0.2 L11,2.3 C13.9,3.2 16,5.8 16,9 C16,12.2 13.9,14.8 11,15.7 L11,17.8 C15,16.9 18,13.3 18,9 C18,4.7 15,1.1 11,0.2 L11,0.2 Z",
+            "M39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769 M 48.128,49.03 C 50.057,45.934 51.19,42.291 51.19,38.377 C 51.19,34.399 50.026,30.703 48.043,27.577 M 55.082,20.537 C 58.777,25.523 60.966,31.694 60.966,38.377 C 60.966,44.998 58.815,51.115 55.178,56.076 M 61.71,62.611 C 66.977,55.945 70.128,47.531 70.128,38.378 C 70.128,29.161 66.936,20.696 61.609,14.01",
             Color.WHITE);
         SVGGlyph volumeOff = new SVGGlyph(0, "VOLUME_ON",
-            "M13.5,9 C13.5,7.2 12.5,5.7 11,5 L11,7.2 L13.5,9.7 L13.5,9 L13.5,9 Z M16,9 C16,9.9 15.8,10.8 15.5,11.6 L17,13.1 C17.7,11.9 18,10.4 18,8.9 C18,4.6 15,1 11,0.1 L11,2.2 C13.9,3.2 16,5.8 16,9 L16,9 Z M1.3,0 L0,1.3 L4.7,6 L0,6 L0,12 L4,12 L9,17 L9,10.3 L13.3,14.6 C12.6,15.1 11.9,15.5 11,15.8 L11,17.9 C12.4,17.6 13.6,17 14.7,16.1 L16.7,18.1 L18,16.8 L9,7.8 L1.3,0 L1.3,0 Z M9,1 L6.9,3.1 L9,5.2 L9,1 L9,1 Z",
-            Color.WHITE);
-        SVGGlyph keyBindingGlyph = new SVGGlyph(0, "KEY_BINDING",
-            "M20 5H4c-1.1 0-1.99.9-1.99 2L2 17c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm-9 3h2v2h-2V8zm0 3h2v2h-2v-2zM8 8h2v2H8V8zm0 3h2v2H8v-2zm-1 2H5v-2h2v2zm0-3H5V8h2v2zm9 7H8v-2h8v2zm0-4h-2v-2h2v2zm0-3h-2V8h2v2zm3 3h-2v-2h2v2zm0-3h-2V8h2v2z",
+            "M39.389,13.769 22.235,28.606 6,28.606 6,47.699 21.989,47.699 39.389,62.75 39.389,13.769",
             Color.WHITE);
         volumeOn.setSize(16, 16);
-        volumeOff.setSize(16, 16);
+        volumeOff.setSize(12, 16);
         spacer.setSize(40, 16);
-        keyBindingGlyph.setSize(24, 16);
 
         // Determine which graphic should go on the button
         if (Sounds.isMusicMuted() && Sounds.isSoundEffectsMuted()) {
@@ -177,12 +142,9 @@ public class ViewManager {
             btnMute.setGraphic(volumeOn);
         }
 
-        btnKeyBinding.setGraphic(keyBindingGlyph);
-
         // Add Buttons
         btns.getChildren().add(0, spacer);
         btns.getChildren().add(0, btnMute);
-        btns.getChildren().add(0, btnKeyBinding);
         btnMute.setOnAction((action) -> {
             Sounds.toggleAllSounds();
             if (btnMute.getGraphic().equals(volumeOff)) {
@@ -192,90 +154,18 @@ public class ViewManager {
             }
         });
 
-        jfxSnackbar = new JFXSnackbar(decorator);
     }
 
     /**
-     * Recursively find JFXDialog given a starting node. Will traverse children of StackPane.
-     *
-     * @param nodes children nodes to be check.
-     * @return true if node contains JFXDialog.
+     * Determines if a PC has compatibility with the bonjour protocol for server detection.
      */
-    private Boolean checkDialogOpened(ObservableList<Node> nodes) {
-        boolean foundJFXDialog = false;
-        for (Node node : nodes) {
-            if (node instanceof JFXDialog) {
-                return true;
-            } else if (node instanceof StackPane) {
-                foundJFXDialog = checkDialogOpened(((StackPane) node).getChildren());
+    private void checkCompatibility() {
+        if (BonjourInstallChecker.isBonjourSupported()) {
+            BonjourInstallChecker.openInstallUrl();
         }
     }
-        return foundJFXDialog;
-    }
-
-    private void showKeyBindingDialog() throws IOException {
-        FXMLLoader dialogContent = new FXMLLoader(getClass().getResource(
-            "/views/dialogs/KeyBindingDialog.fxml"));
-        for (Node node : decorator.getChildren()) {
-            if (node instanceof StackPane) {
-                keyBindingDialog = new JFXDialog((StackPane) node,
-                    dialogContent.load(),
-                    DialogTransition.CENTER);
-
-                KeyBindingDialogController keyBindingDialogController = dialogContent
-                    .getController();
-                keyBindingDialogController.setGameClient(this.gameClient);
-                keyBindingDialog.show();
-                decorator.requestFocus();
-                Sounds.playButtonClick();
-            }
-        }
-    }
-
-    public void closeKeyBindingDialog() {
-        keyBindingDialog.close();
-    }
-
-    public PopupDialogController showPopupDialog() {
-        FXMLLoader dialogContent = new FXMLLoader(
-            getClass().getResource("/views/dialogs/PopupDialog.fxml"));
-        for (Node node : decorator.getChildren()) {
-            if (node instanceof StackPane) {
-                try {
-                    JFXDialog dialog = new JFXDialog((StackPane) node, dialogContent.load(),
-                        DialogTransition.CENTER);
-                    PopupDialogController popupDialogController = dialogContent.getController();
-                    popupDialogController.setPopupDialog(dialog);
-                    dialog.show();
-                    return popupDialogController;
-                } catch (IOException e) {
-                    logger.error("Cannot load Popup dialog");
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Show a snackbar at the bottom of the app for 1 second.
-     *
-     * @param snackbarText text to be displayed.
-     */
-    public void showSnackbar(String snackbarText, boolean isWarning) {
-        if (isWarning) {
-            decorator.getStylesheets()
-                .add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm());
-        } else {
-            if (decorator.getStylesheets().size() > 1) {
-                decorator.getStylesheets().remove(1);
-            }
-        }
-        jfxSnackbar.show(snackbarText, 1500);
-    }
 
     private void closeAll() {
-        if (stage!= null) stage.close();
-
         try {
             ServerAdvertiser.getInstance().unregister();
         } catch (IOException e1) {
@@ -302,7 +192,7 @@ public class ViewManager {
             Stage stage = new Stage();
             initialStartView(stage);
         } catch (Exception e) {
-            logger.warn("Could not go to start view");
+            e.printStackTrace();
         }
     }
 
@@ -328,7 +218,6 @@ public class ViewManager {
 
     /**
      * Change the view to the Lobby Screen
-     *
      * @param disableReadyButton Boolean value so that clients can't try start a game.
      * @return A LobbyController object for the Lobby Screen.
      */
@@ -341,9 +230,8 @@ public class ViewManager {
             logger.error("Could not load lobby view");
         }
 
-        LobbyController lobbyController = loader.getController();
-
         if (disableReadyButton) {
+            LobbyController lobbyController = loader.getController();
             lobbyController.disableReadyButton();
         }
 
@@ -352,17 +240,19 @@ public class ViewManager {
 
     /**
      * Sets up the view for the race. Creating a new decorator and destroying the old one.
-     *
      * @return A RaceViewController for the race view screen.
      */
+
     public RaceViewController loadRaceView() {
         FXMLLoader loader = loadFxml("/views/RaceView.fxml");
+
         // have to create a new stage and set the race view maximized as JFoenix decorator has
         // bug causes stage cannot be fully maximised.
         Platform.runLater(() -> {
             try {
                 stage.close();
                 stage = new Stage();
+
                 JFXDecorator decorator = new JFXDecorator(stage, loader.load(), false, true, true);
                 decorator.setCustomMaximize(true);
                 decorator.applyCss();
@@ -370,16 +260,21 @@ public class ViewManager {
                     .add(getClass().getResource("/css/Master.css").toExternalForm());
                 setDecorator(decorator);
                 Scene scene = new Scene(decorator);
-                RaceViewController raceViewController = loader.getController();
-                gameClient.setRaceViewController(raceViewController);
                 // set key press event to catch key stoke
                 scene.setOnKeyPressed(gameClient::keyPressed);
                 scene.setOnKeyReleased(gameClient::keyReleased);
 
+                // uncomment to make it full screen
+//                Rectangle2D visualBounds = Screen.getPrimary().getVisualBounds();
+//                stage.setX(visualBounds.getMinX());
+//                stage.setY(visualBounds.getMinY());
+//                stage.setWidth(visualBounds.getWidth());
+//                stage.setHeight(visualBounds.getHeight());
+//                stage.setMaximized(true);
+//                stage.setFullScreen(true);
+
                 stage.setMinHeight(500);
                 stage.setMinWidth(800);
-                stage.setTitle("Party Parrots At Sea");
-                stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png")));
                 stage.setOnCloseRequest(e -> closeAll());
                 stage.setScene(scene);
                 stage.show();
@@ -398,19 +293,4 @@ public class ViewManager {
 
         return loader.getController();
     }
-
-    public void showErrorSnackBar(String msg){
-        decorator.getStylesheets()
-                .add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm());
-
-        JFXSnackbar bar = new JFXSnackbar(decorator);
-        Platform.runLater(() -> {
-            bar.enqueue(new JFXSnackbar.SnackbarEvent(msg));
-        });
-    }
-
-    public Stage getStage() {
-        return stage;
-    }
-
 }

src/main/java/seng302/visualiser/controllers/cells/PlayerCell.java

@@ -6,7 +6,6 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
-import seng302.model.ClientYacht;
 import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
 import seng302.visualiser.fxObjects.assets_3D.BoatModel;
 import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
@@ -25,13 +24,11 @@ public class PlayerCell {
     private String name;
     private Color boatColor;
     private Integer playerId;
-    private BoatMeshType boatType;
 
-    public PlayerCell(Integer playerId, ClientYacht yacht) {
+    public PlayerCell(Integer playerId, String playerName, Color color) {
         this.playerId = playerId;
-        this.name = yacht.getBoatName();
-        this.boatColor = yacht.getColour();
-        this.boatType = yacht.getBoatType();
+        this.name = playerName;
+        this.boatColor = color;
     }
 
     public void initialize() {
@@ -40,7 +37,7 @@ public class PlayerCell {
         // Add Rotating Boat to Player Cell with players color on it.
         Group group = new Group();
         boatPane.getChildren().add(group);
-        BoatModel bo = ModelFactory.boatIconView(boatType, boatColor);
+        BoatModel bo = ModelFactory.boatIconView(BoatMeshType.DINGHY, this.boatColor);
         group.getChildren().add(bo.getAssets());
     }
 

src/main/java/seng302/visualiser/controllers/cells/ServerCell.java

@@ -69,6 +69,7 @@ public class ServerCell implements Initializable {
      * Attempts to connect to the chosen server using the button on the serverCell.
      */
     private void joinServer() {
+        System.out.println("Connecting to " + serverName.getText());
         ViewManager.getInstance().getGameClient().runAsClient(hostName, portNumber);
     }
 

src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java

@@ -6,25 +6,15 @@ import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.net.URL;
 import java.util.ResourceBundle;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.geometry.Insets;
-import javafx.scene.Group;
-import javafx.scene.PointLight;
-import javafx.scene.control.ProgressBar;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.CornerRadii;
-import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.ClientToServerThread;
 import seng302.visualiser.controllers.LobbyController;
 import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
-import seng302.visualiser.fxObjects.assets_3D.BoatModel;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
 
@@ -34,35 +24,27 @@ public class BoatCustomizeController implements Initializable{
     @FXML
     private JFXColorPicker colorPicker;
     @FXML
-    private ProgressBar speedBar;
-    @FXML
-    private ProgressBar accelBar;
-    @FXML
-    private ProgressBar handleBar;
-    @FXML
     private JFXButton submitBtn;
     @FXML
     private JFXTextField boatName;
     @FXML
-    private Pane boatPane;
-    @FXML
-    void colorChanged() {
-        refreshBoat();
+    void colorChanged(ActionEvent event) {
+        Color color = colorPicker.getValue();
     }
     //---------FXML END---------//
 
     private ClientToServerThread socketThread;
     private LobbyController lobbyController;
-    private BoatMeshType currentBoat;
-    private Double maxSpeedMultiplier = 1.0;
-    private Double maxTurnRateMultiplier = 1.0;
-    private Double maxAccelerationMultiplier = 1.0;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        submitBtn.setOnMouseReleased(event -> {
+            Sounds.playButtonClick();
+            submitCustomization();
+        });
 
         socketThread = ViewManager.getInstance().getGameClient().getServerThread();
-        findMaxStats();
+
         RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator();
         playerNameReqValidator.setMessage("Player name required.");
 
@@ -70,13 +52,6 @@ public class BoatCustomizeController implements Initializable{
         playerNameLengthValidator.setMessage("Player name too long.");
 
         boatName.setValidators(playerNameLengthValidator, playerNameReqValidator);
-        boatPane.setBackground(
-            new Background(new BackgroundFill(Color.SKYBLUE, CornerRadii.EMPTY, Insets.EMPTY)));
-
-        submitBtn.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            submitCustomization();
-        });
 
         submitBtn.setOnMouseEntered(e -> Sounds.playHoverSound());
     }
@@ -102,10 +77,7 @@ public class BoatCustomizeController implements Initializable{
             colorArray[2] = (byte) blue;
 
             socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR, colorArray);
-            socketThread.sendCustomizationRequest(CustomizeRequestType.SHAPE, currentBoat.toString().getBytes());
             lobbyController.closeCustomizationDialog();
-
-
         }
     }
 
@@ -120,61 +92,4 @@ public class BoatCustomizeController implements Initializable{
     public void setParentController(LobbyController lobbyController){
         this.lobbyController = lobbyController;
     }
-
-    public void setCurrentBoat(String boatType) {
-        currentBoat = BoatMeshType.valueOf(boatType);
-        displayCurrentBoat();
-        refreshStatBars(currentBoat);
-    }
-
-    public void nextBoat() {
-        currentBoat = BoatMeshType.getNextBoatType(currentBoat);
-        displayCurrentBoat();
-        refreshStatBars(currentBoat);
-    }
-
-    public void prevBoat() {
-        currentBoat = BoatMeshType.getPrevBoatType(currentBoat);
-        displayCurrentBoat();
-        refreshStatBars(currentBoat);
-
-    }
-
-    private void displayCurrentBoat() {
-        boatPane.getChildren().clear();
-        Group group = new Group();
-        boatPane.getChildren().add(group);
-        BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());
-        group.getChildren().add(bo.getAssets());
-        group.getChildren().add(new PointLight());
-    }
-
-    private void refreshBoat() {
-        boatPane.getChildren().clear();
-        Group group = new Group();
-        boatPane.getChildren().add(group);
-        BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());
-        group.getChildren().add(bo.getAssets());
-        refreshStatBars(currentBoat);
-    }
-
-    private void findMaxStats() {
-        for (BoatMeshType bmt: BoatMeshType.values()) {
-            if (bmt.turnStep > maxTurnRateMultiplier) {
-                maxTurnRateMultiplier = bmt.turnStep;
-            }
-            if (bmt.maxSpeedMultiplier > maxSpeedMultiplier) {
-                maxSpeedMultiplier = bmt.maxSpeedMultiplier;
-            }
-            if (bmt.accelerationMultiplier > maxAccelerationMultiplier) {
-                maxAccelerationMultiplier = bmt.accelerationMultiplier;
-            }
-        }
-    }
-
-    private void refreshStatBars(BoatMeshType bo) {
-        speedBar.setProgress((bo.maxSpeedMultiplier) / maxSpeedMultiplier);
-        accelBar.setProgress(bo.accelerationMultiplier / maxAccelerationMultiplier);
-        handleBar.setProgress(bo.turnStep / maxTurnRateMultiplier);
-    }
 }

src/main/java/seng302/visualiser/controllers/dialogs/DirectConnectController.java

@@ -1,70 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXSlider;
-import com.jfoenix.controls.JFXTextField;
-import com.jfoenix.validation.RequiredFieldValidator;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseEvent;
-import seng302.gameServer.ServerDescription;
-import seng302.utilities.Sounds;
-import seng302.visualiser.controllers.ViewManager;
-import seng302.visualiser.validators.FieldLengthValidator;
-import seng302.visualiser.validators.ValidationTools;
-
-public class DirectConnectController implements Initializable {
-
-    //--------FXML BEGIN--------//
-    @FXML
-    private JFXTextField serverAddress;
-    @FXML
-    private JFXTextField portNumber;
-    @FXML
-    private JFXButton submitBtn;
-    //---------FXML END---------//
-
-    public void initialize(URL location, ResourceBundle resources) {
-        FieldLengthValidator fieldLengthValidator = new FieldLengthValidator(40);
-        fieldLengthValidator.setMessage("Too long.");
-
-        RequiredFieldValidator fieldRequiredValidator = new RequiredFieldValidator();
-        fieldRequiredValidator.setMessage("Required.");
-
-        serverAddress.setValidators(fieldLengthValidator, fieldRequiredValidator);
-        portNumber.setValidators(fieldLengthValidator, fieldRequiredValidator);
-
-        submitBtn.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            connectToServer();
-        });
-
-    }
-
-    /**
-     * connects to the server
-     */
-    private void connectToServer() {
-        //TODO fix port number validation
-
-        try{
-            Integer.parseInt(portNumber.getText());
-        }
-        catch (NumberFormatException e){
-            ViewManager.getInstance().showErrorSnackBar("You need to enter a valid port number");
-            return;
-        }
-
-        ViewManager.getInstance().getGameClient()
-                .runAsClient(serverAddress.getText(), Integer.parseInt(portNumber.getText()));
-    }
-
-    public void playButtonHoverSound(MouseEvent mouseEvent) {
-        Sounds.playHoverSound();
-    }
-
-}

src/main/java/seng302/visualiser/controllers/dialogs/FinishDialogController.java

@@ -1,38 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXListView;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.ResourceBundle;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import seng302.model.ClientYacht;
-import seng302.visualiser.controllers.ViewManager;
-
-public class FinishDialogController implements Initializable {
-
-    //--------FXML BEGIN--------//
-    @FXML
-    private Label raceFinishLabel;
-    @FXML
-    private JFXListView<Label> finishersList;
-    @FXML
-    private JFXButton playAgain;
-    //---------FXML END---------//
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        playAgain.setOnAction(event -> ViewManager.getInstance().goToStartView());
-    }
-
-    public void setFinishedBoats(ArrayList<ClientYacht> finishedBoats) {
-        finishersList.getItems().clear();
-        for (int i = 0; i < finishedBoats.size(); i++) {
-            finishersList.getItems().add(new Label(Integer.toString(i+1) +".  " + finishedBoats.get(i).getBoatName()));
-        }
-    }
-}

src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java

@@ -1,198 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXToggleButton;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.input.KeyEvent;
-import seng302.model.GameKeyBind;
-import seng302.model.KeyAction;
-import seng302.visualiser.GameClient;
-import seng302.visualiser.controllers.ViewManager;
-
-public class KeyBindingDialogController implements Initializable {
-
-    //--------FXML BEGIN--------//
-    @FXML
-    private Label keyBindingDialogHeader;
-    @FXML
-    private Label closeLabel;
-    @FXML
-    private JFXButton zoomInBtn;
-    @FXML
-    private JFXButton zoomOutBtn;
-    @FXML
-    private JFXButton vmgBtn;
-    @FXML
-    private JFXButton sailInOutBtn;
-    @FXML
-    private JFXButton tackGybeBtn;
-    @FXML
-    private JFXButton upwindBtn;
-    @FXML
-    private JFXButton downwindBtn;
-    @FXML
-    private JFXButton resetBtn;
-    @FXML
-    private JFXButton confirmBtn;
-    @FXML
-    private Label upwindLabel;
-    @FXML
-    private Label downwindLabel;
-    @FXML
-    private JFXToggleButton turningToggle;
-    @FXML
-    private JFXButton viewButton;
-    @FXML
-    private JFXButton rightButton;
-    @FXML
-    private JFXButton leftButton;
-    @FXML
-    private JFXButton forwardButton;
-    @FXML
-    private JFXButton backwardButton;
-    //---------FXML END---------//
-
-    private GameKeyBind gameKeyBind;
-    private List<JFXButton> buttons = new ArrayList<>();
-    private Map<Button, KeyAction> buttonActionMap;
-    private GameClient gameClient; // to send turning mode packet
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        gameKeyBind = GameKeyBind.getInstance();
-        buttons = new ArrayList<>();
-        Collections.addAll(buttons,
-            zoomInBtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
-            viewButton, rightButton, leftButton, forwardButton, backwardButton);
-        bindButtonWithAction();
-        loadKeyBind();
-
-        buttons.forEach(button -> {
-            button.setOnMouseEntered(event -> mouseEnter(button));
-            button.setOnMousePressed(event -> buttonPressed(button));
-            button.setOnMouseExited(event -> mouseExit(button));
-            button.setOnKeyPressed(event -> keyPressed(event, button));
-        });
-
-        turningToggle.setOnMouseClicked(event -> toggleTurningMode());
-
-        resetBtn.setOnMouseClicked(event -> {
-            gameKeyBind.setToDefault();
-            loadKeyBind();
-            showSnackBar("All keys reset!", false);
-        });
-
-        closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
-        confirmBtn.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
-    }
-
-    /**
-     * Set buttons' label according to GameKeyBind settings
-     */
-    private void loadKeyBind() {
-        buttons.forEach(
-            button -> button
-                .setText(gameKeyBind.getKeyCode(buttonActionMap.get(button)).getName()));
-        turningToggle.setSelected(gameKeyBind.isContinuouslyTurning());
-        if (gameKeyBind.isContinuouslyTurning()) {
-            upwindLabel.setText("ClOCKWISE TURNING");
-            downwindLabel.setText("ANTICLOCKWISE TURNING");
-        } else {
-            upwindLabel.setText("UPWIND");
-            downwindLabel.setText("DOWNWIND");
-        }
-    }
-
-    /**
-     * Bind buttons with specific action in a map.
-     */
-    private void bindButtonWithAction() {
-        buttonActionMap = new HashMap<>();
-        for (int i = 0; i < 12; i++) {
-            buttonActionMap.put(buttons.get(i), KeyAction.getType(i + 1));
-        }
-    }
-
-    /**
-     * Prompt success / failure message for reassigning key action
-     */
-    private void showSnackBar(String message, Boolean isWarning) {
-        ViewManager.getInstance().showSnackbar(message, isWarning);
-    }
-
-    /**
-     * When a mouse enters the button, the color and font size should change to highlight
-     * @param button
-     */
-    private void mouseEnter(Button button) {
-        button.setStyle(""
-            + "-fx-background-color: -fx-pp-theme-color;"
-            + "-fx-text-fill: -fx-pp-front-color;"
-            + "-fx-font-size: 15;");
-    }
-
-    /**
-     * Prompt "press key..." to inform users assign a new key bind by pressing a key
-     * @param button
-     */
-    private void buttonPressed(Button button) {
-        button.setText("PRESS KEY...");
-    }
-
-
-    /**
-     * When mouse leaves the button, return the button to the normal state in terms of text,
-     * color and font size
-     * @param button
-     */
-    private void mouseExit(Button button) {
-        button.setText(GameKeyBind.getInstance().getKeyCode(buttonActionMap.get(button)).getName());
-        button.setStyle(""
-            + "-fx-background-color: -fx-pp-front-color; "
-            + "-fx-text-fill: -fx-pp-theme-color; "
-            + "-fx-font-size: 13;");
-        keyBindingDialogHeader.requestFocus();
-    }
-
-    /**
-     * When a key is pressed, check if the new binding conflicts to any existed settings, if not
-     * assign the selected action with the new key binding to GameKeyBind.
-     * @param event
-     * @param button
-     */
-    private void keyPressed(KeyEvent event, Button button) {
-        event.consume();
-        KeyAction buttonAction = buttonActionMap.get(button);
-        if (gameKeyBind.bindKeyToAction(event.getCode(), buttonAction)) {
-            showSnackBar(button.getId() + " is set to " + event.getCode().getName(), false);
-            button.setText(gameKeyBind.getKeyCode(buttonAction).getName());
-        } else {
-            loadKeyBind();
-            showSnackBar(event.getCode().getName() + " is already in use", true);
-        }
-    }
-
-    /**
-     * When the turning mode is toggled, update gameKeyBind and send out packet to notify the server
-     */
-    private void toggleTurningMode() {
-        gameKeyBind.toggleTurningMode();
-        gameClient.sendToggleTurningModePacket();
-        loadKeyBind();
-    }
-
-    public void setGameClient(GameClient gameClient) {
-        this.gameClient = gameClient;
-    }
-
-}

src/main/java/seng302/visualiser/controllers/dialogs/PopupDialogController.java

@@ -1,56 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseEvent;
-
-public class PopupDialogController implements Initializable {
-
-    @FXML
-    private Label headerLabel;
-    @FXML
-    private Label contentLabel;
-    @FXML
-    private Label closeLabel;
-    @FXML
-    private JFXButton optionButton;
-
-    @FXML
-    private JFXDialog popupDialog;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-
-    }
-
-    public void setContent(String content) {
-        this.contentLabel.setText(content);
-    }
-
-    public void setHeader(String header) {
-        this.headerLabel.setText(header);
-    }
-
-    public void setOptionButton(JFXButton jfxButton) {
-        this.optionButton = jfxButton;
-    }
-
-    public void setOptionButtonText(String text) {
-        this.optionButton.setText(text);
-    }
-
-    public void setOptionButtonEventHandler(EventHandler<? super MouseEvent> eventHandler) {
-        this.optionButton.setOnMouseClicked(eventHandler);
-    }
-
-    public void setPopupDialog(JFXDialog popupDialog) {
-        this.popupDialog = popupDialog;
-        this.closeLabel.setOnMouseClicked(event -> this.popupDialog.close());
-    }
-}

src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

@@ -1,21 +1,18 @@
 package seng302.visualiser.controllers.dialogs;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXSlider;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.RequiredFieldValidator;
 import java.net.URL;
-import java.util.List;
 import java.util.ResourceBundle;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
-import javafx.scene.layout.AnchorPane;
+import javafx.scene.input.MouseEvent;
 import seng302.gameServer.ServerDescription;
 import seng302.utilities.Sounds;
-import seng302.visualiser.MapMaker;
-import seng302.visualiser.controllers.ServerListController.ServerCreationDialogListener;
 import seng302.visualiser.controllers.ViewManager;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -28,46 +25,16 @@ public class ServerCreationController implements Initializable {
     @FXML
     private JFXSlider maxPlayersSlider;
     @FXML
-    private JFXButton submitBtn;
-    @FXML
-    private Label closeLabel;
-    @FXML
     private Label maxPlayersLabel;
     @FXML
-    private JFXButton nextMapButton;
-    @FXML
-    private JFXButton lastMapButton;
-    @FXML
-    private Label mapNameLabel;
-    @FXML
-    private JFXSlider legsSlider;
-    @FXML
-    private Label legsSliderLabel;
-    @FXML
-    private JFXCheckBox pickupsCheckBox;
-    @FXML
-    private AnchorPane mapHolder;
+    private JFXButton submitBtn;
     //---------FXML END---------//
 
-    private MapMaker mapMaker = MapMaker.getInstance();
-
-    private List<ServerCreationDialogListener> serverCreationDialogListeners;
-
     public void initialize(URL location, ResourceBundle resources) {
-
-        maxPlayersSlider.valueProperty().addListener(
-            (observable, oldValue, newValue) -> updateMaxPlayerLabel()
-        );
-        maxPlayersSlider.setMax(mapMaker.getMaxPlayers());
-        maxPlayersSlider.setValue(mapMaker.getMaxPlayers());
-
-        legsSlider.valueProperty().addListener(
-            (obs, oldVal, newVal) -> updateLegSliderLabel()
-        );
-        legsSlider.setMax(10);
-
         updateMaxPlayerLabel();
-        updateLegSliderLabel();
+        maxPlayersSlider.valueProperty().addListener((observable, oldValue, newValue) -> {
+            updateMaxPlayerLabel();
+        });
 
         FieldLengthValidator fieldLengthValidator = new FieldLengthValidator(40);
         fieldLengthValidator.setMessage("Server name too long.");
@@ -82,20 +49,6 @@ public class ServerCreationController implements Initializable {
             validateServerSettings();
         });
 
-        nextMapButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            nextMap();
-        });
-
-        lastMapButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            lastMap();
-        });
-
-        mapHolder.getChildren().setAll(mapMaker.getCurrentGameView());
-        mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName());
-        pickupsCheckBox.setSelected(true);
-        closeLabel.setOnMouseClicked(event -> notifyListeners());
     }
 
     /**
@@ -116,13 +69,7 @@ public class ServerCreationController implements Initializable {
     private void createServer() {
         ServerDescription serverDescription = ViewManager.getInstance().getGameClient()
             .runAsHost("localhost", 4941, serverName.getText(), (int) maxPlayersSlider
-                .getValue(), mapMaker.getCurrentRacePath(), (int) legsSlider.getValue(), pickupsCheckBox.isSelected());
-
-        if (serverDescription == null){
-            ViewManager.getInstance().getGameClient().getServerThread().closeSocket();
-            ViewManager.getInstance().getGameClient().stopGame();
-            return;
-        }
+                .getValue());
 
         ViewManager.getInstance().setProperty("serverName", serverDescription.getName());
         ViewManager.getInstance().setProperty("mapName", serverDescription.getMapName());
@@ -133,47 +80,11 @@ public class ServerCreationController implements Initializable {
      */
     private void updateMaxPlayerLabel() {
         maxPlayersSlider.setValue(Math.floor(maxPlayersSlider.getValue()));
-        maxPlayersLabel.setText(String
-            .format("Only %.0f players are allowed into the game", maxPlayersSlider.getValue()));
+        maxPlayersLabel.setText(String.format("YOU SELECTED: %.0f", maxPlayersSlider.getValue()));
     }
 
-    private void updateLegSliderLabel() {
-        legsSlider.setValue(Math.floor(legsSlider.getValue()));
-        legsSliderLabel.setText(
-            String.format("A section of the race will repeat %.0f times", legsSlider.getValue())
-        );
-
-    }
-
-    public void playButtonHoverSound() {
+    public void playButtonHoverSound(MouseEvent mouseEvent) {
         Sounds.playHoverSound();
     }
 
-    private void nextMap() {
-        mapMaker.next();
-        updateMap();
-    }
-
-    private void lastMap() {
-        mapMaker.previous();
-        updateMap();
-    }
-
-    private void updateMap() {
-        mapHolder.getChildren().setAll(mapMaker.getCurrentGameView());
-        mapNameLabel.setText(mapMaker.getCurrentRegatta().getCourseName());
-        maxPlayersSlider.setMax(mapMaker.getMaxPlayers());
-        maxPlayersSlider.setValue(mapMaker.getMaxPlayers());
-    }
-
-    public void setListener(List<ServerCreationDialogListener> serverCreationDialogListeners) {
-        this.serverCreationDialogListeners = serverCreationDialogListeners;
-    }
-
-    public void notifyListeners() {
-        for (ServerCreationDialogListener serverCreationDialogListener : serverCreationDialogListeners) {
-            serverCreationDialogListener.notifyClosure();
-        }
-    }
-
 }

src/main/java/seng302/visualiser/controllers/dialogs/TokenInfoDialogController.java

@@ -1,90 +0,0 @@
-package seng302.visualiser.controllers.dialogs;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXTextArea;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Pane;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Translate;
-import seng302.utilities.Sounds;
-import seng302.visualiser.controllers.LobbyController;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
-
-/**
- * Created by wmu16 on 28/09/17.
- */
-public class TokenInfoDialogController implements Initializable {
-
-    @FXML
-    private Label headerLabel;
-    @FXML
-    private TextArea contentText;
-    @FXML
-    private Pane tokenPane;
-    @FXML
-    private Button optionButton;
-
-    private LobbyController lobbyController;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        optionButton.setOnMouseReleased(event -> {
-            Sounds.playButtonClick();
-            lobbyController.closeTokenInfoDialog();
-        });
-
-        contentText.setEditable(false);
-
-    }
-
-
-    public void setContent(String content) {
-        contentText.setText(content);
-    }
-
-    public void setHeader(String header) {
-        this.headerLabel.setText(header);
-    }
-
-    public void setToken(ModelType token) {
-        tokenPane.getChildren().clear();
-
-        Group tokenObject = ModelFactory.importModel(token).getAssets();
-
-        tokenObject.getTransforms().addAll(
-            new Translate(138 / 2, 138 / 2, 0),
-            new Scale(20, 20, 20));
-
-        if (token == ModelType.WIND_WALKER_PICKUP) {
-            tokenObject.getTransforms().addAll(
-                new Rotate(-70, new Point3D(1, 0, 0)),
-                new Translate(0, 2, 0)
-            );
-        } else if (token == ModelType.RANDOM_PICKUP) {
-            tokenObject.getTransforms().addAll(
-                new Rotate(-90, new Point3D(1, 0, 0)),
-                new Translate(0, 0, 1)
-            );
-        }
-
-        tokenPane.getChildren().add(tokenObject);
-    }
-
-    public void setParentController(LobbyController lobbyController) {
-        this.lobbyController = lobbyController;
-    }
-
-
-}

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

@@ -0,0 +1,460 @@
+package seng302.visualiser.fxObjects.assets_2D;
+
+import javafx.application.Platform;
+import javafx.beans.property.ReadOnlyDoubleWrapper;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.geometry.Point2D;
+import javafx.geometry.Point3D;
+import javafx.scene.AmbientLight;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.PointLight;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.Polygon;
+import javafx.scene.shape.Polyline;
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Scale;
+import javafx.scene.transform.Translate;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+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,
+ * a wake object and two text labels to annotate the boat teams name and the boats velocity. The
+ * boat will update it's position onscreen everytime UpdatePosition is called unless the window is
+ * minimized in which case it attempts to store animations and apply them when the window is
+ * maximised.
+ */
+public class BoatObject extends Group {
+
+
+    private static final double MODEL_SCALE_FACTOR = 400;
+    private static final double MODEL_X_OFFSET = 0; // standard
+    private static final double MODEL_Y_OFFSET = 0; // standard
+
+    private static final int VIEWPORT_SIZE = 800;
+
+    private static final Color lightColor = Color.rgb(244, 255, 250);
+    private static final Color jewelColor = Color.rgb(0, 190, 222);
+
+
+    @FunctionalInterface
+    public interface SelectedBoatListener {
+
+        void notifySelected(BoatObject boatObject, Boolean isSelected);
+    }
+
+    //Constants for drawing
+    private static final float BOAT_HEIGHT = 15f;
+    private static final float BOAT_WIDTH = 10f;
+
+    private double xVelocity;
+    private double yVelocity;
+    private double lastHeading;
+    private double sailState;
+    //Graphical objects
+    private Polyline trail = new Polyline();
+    private BoatModel boatAssets;
+    private Polygon sail;
+    private Group wake;
+    private Line leftLayLine;
+    private Line rightLayline;
+    private double distanceTravelled, lastRotation;
+    private Point2D lastPoint;
+    private Color colour = Color.BLACK;
+    private Boolean isSelected = false, destinationSet;  //All boats are initialised as selected
+    private boolean isPlayer = false;
+    private Rotate rotation = new Rotate(0,0,1);
+
+    private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
+
+    /**
+     * Creates a BoatGroup with the default triangular boat polygon.
+     */
+    public BoatObject() {
+        this(-BOAT_WIDTH / 2, BOAT_HEIGHT / 2,
+            0.0, -BOAT_HEIGHT / 2,
+            BOAT_WIDTH / 2, BOAT_HEIGHT / 2);
+    }
+
+    /**
+     * Creates a BoatGroup with the boat being the default polygon. The head of the boat should be
+     * at point (0,0).
+     *
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
+     */
+    public BoatObject(double... points) {
+        initChildren(points);
+    }
+
+    /**
+     * Creates the javafx objects that will be the in the group by default.
+     *
+     * @param points An array of co-ordinates x1,y1,x2,y2,x3,y3... that will make up the boat
+     * polygon.
+     */
+    private void initChildren(double... points) {
+        boatAssets = ModelFactory.boatGameView(BoatMeshType.DINGHY, colour);
+        boatAssets.hideSail();
+        boatAssets.getAssets().getTransforms().addAll(
+//            new Rotate(-40, new Point3D(1,0,0)),
+            rotation
+//            new Rotate(-90, new Point3D(0,0,1))
+        );
+        boatAssets.getAssets().getTransforms().add(new Scale(5, 5, 5));
+//        boatAssets.setDrawMode(DrawMode.FILL);
+//        boatAssets.setFill(colour);
+//        boatAssets.setFill(this.colour);
+//        boatAssets.setMaterial(new PhongMaterial(this.colour));
+        boatAssets.getAssets().setOnMouseEntered(event -> {
+//            boatAssets.setFill(Color.FLORALWHITE);
+//            boatAssets.setStroke(Color.RED);
+//            boatAssets.setMaterial(new PhongMaterial(Color.FLORALWHITE));
+        });
+        boatAssets.getAssets().setOnMouseExited(event -> {
+//            boatAssets.setMaterial(new PhongMaterial(this.colour));
+//            boatAssets.setFill(colour);
+//            boatAssets.setFill(this.colour);
+//            boatAssets.setStroke(Color.BLACK);
+        });
+        boatAssets.getAssets().setOnMouseClicked(event -> setIsSelected(!isSelected));
+        boatAssets.getAssets().setCache(true);
+//        boatAssets.setCacheHint(CacheHint.SPEED);
+
+//        annotationBox = new AnnotationBox();
+//        annotationBox.setFill(colour);
+
+        leftLayLine = new Line();
+        rightLayline = new Line();
+        trail.getStrokeDashArray().setAll(5d, 10d);
+        trail.setCache(true);
+
+        wake = ModelFactory.importModel(ModelType.WAKE).getAssets();
+
+        sail = new Polygon(0.0,BOAT_HEIGHT / 4,
+            0.0, BOAT_HEIGHT);
+        sailState = 0;
+        sail.setStrokeWidth(2.0);
+        sail.setStroke(Color.BLACK);
+        sail.setFill(Color.TRANSPARENT);
+        sail.setCache(true);
+        super.getChildren().clear();
+        PointLight pointLight = new PointLight(Color.WHITE);
+//        pointLight.setLightOn(true);
+        pointLight.getTransforms().add(new Translate(0, 0, -30));
+        super.getChildren().add(pointLight);
+//        pointLight = new PointLight(Color.WHITE);
+////        pointLight.setLightOn(true);
+//        pointLight.getTransforms().add(new Translate(50, 50, -20));
+//        super.getChildren().add(pointLight);
+//        pointLight = new PointLight(Color.WHITE);
+////        pointLight.setLightOn(true);
+//        pointLight.getTransforms().add(new Translate(50, -50, -20));
+//        super.getChildren().add(pointLight);
+//        pointLight = new PointLight(Color.WHITE);
+////        pointLight.setLightOn(true);
+//        pointLight.getTransforms().add(new Translate(-50, -50, -20));
+//        super.getChildren().add(pointLight);
+        AmbientLight light = new AmbientLight(new Color(0.5,0.5,0.5,1));
+        super.getChildren().add(light);
+        super.getChildren().addAll(boatAssets.getAssets());
+    }
+
+    public void setFill (Color value) {
+        this.colour = value;
+        PhongMaterial pm = new PhongMaterial(this.colour);
+        pm.setSpecularPower(0.5);
+        pm.setSpecularColor(Color.BLACK);
+        for (int i=0;i<2;i++) {
+            Shape3D s = (Shape3D) boatAssets.getAssets().getChildren().get(i);
+            s.setMaterial(pm);
+        }
+        trail.setStroke(colour);
+    }
+
+
+    /**
+     * Moves the boat and its children annotations to coordinates specified
+     *  @param x The X coordinate to move the boat to
+     * @param y The Y coordinate to move the boat to
+     * @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);
+        Double dy = Math.abs(boatAssets.getAssets().getLayoutY() - y);
+        Platform.runLater(() -> {
+            rotateTo(rotation, sailIn, windDir);
+            boatAssets.getAssets().setLayoutX(x);
+            boatAssets.getAssets().setLayoutY(y);
+//            if (sailIn) {
+////                sail.getPoints().clear();
+////                sail.getPoints().addAll(0.0, 0.0, 4.0, 1.5, 8.0, 3.0, 12.0, 3.5, 16.0, 3.0, 20.0, 1.5, 24.0, 0.0);
+////                sail.getPoints().addAll(0.0, 0.0, 24.0, 0.0);
+//                sail.setLayoutX(x);
+//                sail.setLayoutY(y);
+//            } else {
+////                animateSail();
+//                sail.setLayoutX(x);
+//                sail.setLayoutY(y);
+//            }
+            wake.setLayoutX(x);
+            wake.setLayoutY(y);
+        });
+//        wake.setRotation(rotation, velocity);
+//        rotateTo(rotation);
+//        boatAssets.setLayoutX(x);
+//        boatAssets.setLayoutY(y);
+//        wake.setLayoutX(x);
+//        wake.setLayoutY(y);
+//        wake.rotate(rotation);
+
+//        wake.setRotation(rotation, groundSpeed);
+//        isStopped = false;
+//        destinationSet = true;
+        lastRotation = rotation;
+
+        distanceTravelled += Math.sqrt((dx * dx) + (dy * dy));
+
+        if (distanceTravelled > 15 && isPlayer) {
+            distanceTravelled = 0d;
+            Platform.runLater(() -> trail.getPoints().addAll(x, y));
+        }
+    }
+
+    private Double normalizeHeading(double heading, double windDirection) {
+        Double normalizedHeading = heading - windDirection;
+        normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
+        return normalizedHeading;
+    }
+
+
+    private void rotateTo(double heading, boolean sailsIn, double windDir) {
+        rotation.setAngle(heading);
+        wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1)));
+        if (sailsIn) {
+            boatAssets.showSail();
+            Double sailWindOffset = 30.0;
+            Double upwindAngleLimit = 15.0;
+            Double downwindAngleLimit = 10.0; //Upwind from normalised horizontal
+            Double normalizedHeading = normalizeHeading(heading, windDir);
+            if (normalizedHeading < 180) {
+                if (normalizedHeading < sailWindOffset + upwindAngleLimit){
+                    boatAssets.rotateSail(-heading + 90 - upwindAngleLimit);
+                } else if (normalizedHeading > 90 + sailWindOffset){
+                    boatAssets.rotateSail(-heading + downwindAngleLimit);
+                } else {
+                    boatAssets.rotateSail(-heading + 90 + sailWindOffset);
+                }
+            } else {
+//                if (normalizedHeading > 360 - (sailWindOffset + upwindAngleLimit)){
+//                    boatAssets.rotateSail(-heading + 90 + upwindAngleLimit);
+//                } else if (normalizedHeading < 270 - sailWindOffset){
+//                    boatAssets.rotateSail(-heading + 180 - downwindAngleLimit);
+//                } else {
+//                    boatAssets.rotateSail(-heading + 90 - sailWindOffset);
+//                }
+            }
+        } else {
+            boatAssets.hideSail();
+        }
+    }
+
+
+    private void animateSail(){
+        Double[] points = new Double[200];
+        double amplitude = 2.0;
+        double period = 10;
+        for (int i = 0; i < 50; i++) {
+            points[i * 2] = amplitude * Math.sin(((Math.PI * i) / period + sailState));
+            points[i * 2 + 1] = (double) (BOAT_HEIGHT * i) / BOAT_HEIGHT / 2;
+            points[199 - (i * 2)] = (double) (BOAT_HEIGHT * i) / BOAT_HEIGHT / 2;
+            points[199 - (i * 2 + 1)] = amplitude * Math.sin(((Math.PI * i) / period + sailState));
+        }
+        if (sailState == - 2 * Math.PI) {
+            sailState = 0;
+        } else {
+            sailState = sailState - Math.PI / 5;
+        }
+        sail.getPoints().clear();
+        sail.getPoints().addAll(points);
+
+    }
+
+    public void updateLocation() {
+//        boatAssets.getTransforms().add(new Rotate(2, new Point3D(1,1,1)));
+//        double dx = xVelocity / 60;
+//        double dy = yVelocity / 60;
+//
+//        distanceTravelled += Math.abs(dx) + Math.abs(dy);
+//        moveGroupBy(dx, dy);
+//
+//        if (distanceTravelled > 70) {
+//            distanceTravelled = 0d;
+//
+//            if (lastPoint != null) {
+//                Line l = new Line(
+//                    lastPoint.getX(),
+//                    lastPoint.getY(),
+//                    boatAssets.getLayoutX(),
+//                    boatAssets.getLayoutY()
+//                );
+//                l.getStrokeDashArray().setAll(3d, 7d);
+//                l.setStroke(colour);
+//                l.setCache(true);
+//                l.setCacheHint(CacheHint.SPEED);
+//                lineGroup.getChildren().add(l);
+//            }
+//            lastPoint = new Point2D(boatAssets.getLayoutX(), boatAssets.getLayoutY());
+//        }
+//        wake.updatePosition();
+    }
+
+//    /**
+//     * This function works out if a boat is going upwind or down wind. It looks at the boats current position, the next
+//     * gates position and the current wind
+//     * If bot the wind vector from the next gate and the boat from the next gate lay on the same side, then the boat is
+//     * going up wind, if they are on different sides of the gate, then the boat is going downwind
+//     * @param canvasController
+//     */
+//    public Boolean isUpwindLeg(GameViewController canvasController, Mark nextMark) {
+//
+//        Double windAngle = StreamParser.getWindDirection();
+//        GateMark thisGateMark = (GateMark) nextMark;
+//        SingleMark nextMark1 = thisGateMark.getSingleMark1();
+//        SingleMark nextMark2 = thisGateMark.getSingleMark2();
+//        Point2D nextMarkPoint1 = canvasController.findScaledXY(nextMark1.getLatitude(), nextMark1.getLongitude());
+//        Point2D nextMarkPoint2 = canvasController.findScaledXY(nextMark2.getLatitude(), nextMark2.getLongitude());
+//
+//        Point2D boatCurrentPoint = new Point2D(boatAssets.getLayoutX(), boatAssets.getLayoutY());
+//        Point2D windTestPoint = GeoUtility.makeArbitraryVectorPoint(nextMarkPoint1, windAngle, 10d);
+//
+//
+//        Integer boatLineFuncResult = GeoUtility.lineFunction(nextMarkPoint1, nextMarkPoint2, boatCurrentPoint);
+//        Integer windLineFuncResult = GeoUtility.lineFunction(nextMarkPoint1, nextMarkPoint2, windTestPoint);
+//
+//
+//        /*
+//        If both the wind vector from the gate and the boat from the gate are on the same side of that gate, then the
+//        boat is travelling into the wind. thus upwind. Otherwise if they are on different sides, then the boat is going
+//        with the wind.
+//         */
+//        return boatLineFuncResult.equals(windLineFuncResult);
+//        return true;
+//    }
+
+    public void setIsSelected(Boolean isSelected) {
+        updateListener(isSelected);
+        this.isSelected = isSelected;
+        setLineGroupVisible(isSelected);
+        setWakeVisible(isSelected);
+        setLayLinesVisible(isSelected);
+    }
+
+    public void setVisibility (boolean teamName, boolean velocity, boolean estTime, boolean legTime,
+        boolean trail, boolean wake) {
+//        boatAnnotations.setVisible(teamName, velocity, estTime, legTime);
+//        this.wake.setVisible(wake);
+        this.trail.setVisible(trail);
+    }
+
+    public void setLineGroupVisible(Boolean visible) {
+        trail.setVisible(visible);
+    }
+
+    public void setWakeVisible(Boolean visible) {
+//        wake.setVisible(visible);
+    }
+
+    public void setLayLinesVisible(Boolean visible) {
+        leftLayLine.setVisible(visible);
+        rightLayline.setVisible(visible);
+    }
+
+    public void setLaylines(Line line1, Line line2) {
+        this.leftLayLine = line1;
+        this.rightLayline = line2;
+    }
+
+    public ArrayList<Line> getLaylines() {
+        ArrayList<Line> laylines = new ArrayList<>();
+        laylines.add(leftLayLine);
+        laylines.add(rightLayline);
+        return laylines;
+    }
+
+    public Group getWake () {
+        return wake;
+    }
+
+    public Node getTrail() {
+        return trail;
+    }
+
+    public Double getBoatLayoutX() {
+        return boatAssets.getAssets().getLayoutX();
+    }
+
+
+    public Double getBoatLayoutY() {
+        return boatAssets.getAssets().getLayoutY();
+    }
+
+    /**
+     * Sets this boat to appear highlighted
+     */
+    public void setAsPlayer() {
+//        boatAssets.getPoints().setAll(
+//            -BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75,
+//            0.0, -BOAT_HEIGHT / 1.75,
+//            BOAT_WIDTH / 1.75, BOAT_HEIGHT / 1.75
+//        );
+//        boatAssets.setStroke(Color.BLACK);
+//        boatAssets.setStrokeWidth(2);
+//        boatAssets.setStrokeLineCap(StrokeLineCap.ROUND);
+        isPlayer = true;
+        animateSail();
+    }
+
+    public void setTrajectory(double heading, double velocity, double windDir) {
+//        wake.r(lastHeading - heading, velocity);
+//        rotateTo(heading, false, windDir);
+        xVelocity = Math.cos(Math.toRadians(heading)) * velocity;
+        yVelocity = Math.sin(Math.toRadians(heading)) * velocity;
+        lastHeading = heading;
+    }
+
+    public Boolean getSelected() {
+        return isSelected;
+    }
+
+    public void setTrajectory(double heading, double velocity, double scaleFactorX, double scaleFactorY) {
+//        wake.setRotation(lastHeading - heading, velocity);
+//        rotateTo(heading);
+//        xVelocity = Math.cos(Math.toRadians(heading)) * velocity * scaleFactorX;
+//        yVelocity = Math.sin(Math.toRadians(heading)) * velocity * scaleFactorY;
+        lastHeading = heading;
+    }
+
+    private void updateListener(Boolean isSelected) {
+        for (SelectedBoatListener sbl : selectedBoatListenerListeners) {
+            sbl.notifySelected(this, isSelected);
+        }
+    }
+
+    public void addSelectedBoatListener(SelectedBoatListener sbl) {
+        selectedBoatListenerListeners.add(sbl);
+    }
+}

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

@@ -1,19 +1,10 @@
-package seng302.visualiser.fxObjects;
+package seng302.visualiser.fxObjects.assets_2D;
 
-import javafx.geometry.Point3D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
-import javafx.scene.shape.Arc;
-import javafx.scene.shape.ArcType;
-import javafx.scene.shape.Polygon;
-import javafx.scene.shape.Polyline;
-import javafx.scene.shape.StrokeLineCap;
+import javafx.scene.shape.*;
 import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Translate;
-import seng302.visualiser.fxObjects.assets_3D.Model;
-import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
-import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
 // TODO: 16/08/17 this class used to be well written... FeelsBadMan. Maybe lose the ternary operators.
 /**
@@ -29,52 +20,11 @@ public class MarkArrowFactory {
         STARBOARD,
     }
 
-    public static final double MARK_ARROW_SEPARATION = 8;
-    public static final double ARROW_LENGTH = 20;
-    public static final double ARROW_HEAD_DEPTH = 5;
-    public static final double ARROW_HEAD_WIDTH = 3;
-    public static final double STROKE_WIDTH = 1;
-
-    public static Model constructEntryArrow3D (
-        RoundingSide roundingSide, double angle, ModelType type) {
-        Model entryArrow = ModelFactory.importModel(type);
-
-        double angleDeg = angle;
-        angle = 180 - angle;
-        angle = Math.toRadians(angle);
-
-        int multiplier = roundingSide == RoundingSide.STARBOARD ? 1 : -1;
-        double relativeX = multiplier * 5.7 * Math.sin(angle + Math.PI / 2);
-        double relativeY = multiplier * 5.7 * Math.cos(angle + Math.PI / 2);
-        double xStart = relativeX + -10 * Math.sin(angle);
-        double yStart = relativeY + -10 * Math.cos(angle);
-        entryArrow.getAssets().getTransforms().addAll(
-            new Translate(xStart, yStart, 0),
-            new Rotate(angleDeg, new Point3D(0,0,1))
-        );
-        return entryArrow;
-    }
-
-    public static Model constructExitArrow3D (
-        RoundingSide roundingSide, double angle, ModelType type) {
-        Model exitArrow = ModelFactory.importModel(type);
-
-        double angleDeg = angle;
-        angle = 180 - angle;
-        angle = Math.toRadians(angle);
-
-        int multiplier = roundingSide == RoundingSide.STARBOARD ? 1 : -1;
-        double xStart = multiplier * 5.7 * Math.sin(angle + Math.PI / 2);
-        double yStart = multiplier * 5.7 * Math.cos(angle + Math.PI / 2);
-
-        exitArrow.getAssets().getTransforms().addAll(
-            new Translate(xStart, yStart, 0),
-            new Rotate(angleDeg, new Point3D(0,0,1))
-        );
-
-        return exitArrow;
-    }
-
+    public static final double MARK_ARROW_SEPARATION = 15;
+    public static final double ARROW_LENGTH = 75;
+    public static final double ARROW_HEAD_DEPTH = 10;
+    public static final double ARROW_HEAD_WIDTH = 6;
+    public static final double STROKE_WIDTH = 3;
 
     /**
      * Creates an entry arrow group showing an arrow into and out of the rounding area. It is centered on (0, 0).
@@ -86,71 +36,47 @@ public class MarkArrowFactory {
      */
     public static Group constructEntryArrow (RoundingSide roundingSide, double angleOfEntry,
                                              double angleOfExit, Paint colour) {
-        // Check to see if the the angle around mark would take you inside of it. (less than 180)
-        // If so make interior angle.
-        if (roundingSide == RoundingSide.PORT && angleOfEntry < angleOfExit &&
-            Math.abs(angleOfExit - angleOfEntry) < 180) {
+        if (roundingSide == RoundingSide.PORT && angleOfEntry < angleOfExit && Math.abs(angleOfExit - angleOfEntry) < 180) {
             return makeInteriorAngle(roundingSide, angleOfExit, angleOfEntry, colour);
-
-        } else if (roundingSide == RoundingSide.STARBOARD && angleOfEntry > angleOfExit &&
-            -Math.abs(angleOfEntry - angleOfExit) > -180) {
+        } else if (roundingSide == RoundingSide.STARBOARD && angleOfEntry > angleOfExit && -Math.abs(angleOfEntry - angleOfExit) > -180) {
             return makeInteriorAngle(roundingSide, angleOfExit, angleOfEntry, colour);
         }
-        //Create regular exit arrow.
+
+        angleOfEntry = 180 - angleOfEntry;
         Group arrow = new Group();
         Group exitSection = constructExitArrow(roundingSide, angleOfExit, colour);
-        //Reverse angles to make arc
-        angleOfEntry = 180 - angleOfEntry;
         angleOfExit = 180 - angleOfExit;
-        //Maker the arc
         Arc roundSection = new Arc(
             0, 0, MARK_ARROW_SEPARATION, MARK_ARROW_SEPARATION,
-            //Where to start drawing arc from
-            (roundingSide == RoundingSide.PORT ? 180 + angleOfEntry : angleOfEntry),
-            //Which way to go around the mark. (clockwise vs anticlockwise)
+            (roundingSide == RoundingSide.PORT ? -180 : 0) + angleOfEntry,
             roundingSide == RoundingSide.PORT ? Math.abs(angleOfExit - angleOfEntry) : -Math.abs(angleOfEntry - angleOfExit)
         );
         roundSection.setStrokeWidth(STROKE_WIDTH);
         roundSection.setType(ArcType.OPEN);
         roundSection.setStroke(colour);
         roundSection.setFill(new Color(0,0,0,0));
-        //Revert angle to normal for line segment. Invert Port/Starboard since it is an entry arrow.
         Polygon entrySection = constructLineSegment(
-            roundingSide == RoundingSide.PORT ? RoundingSide.STARBOARD : RoundingSide.PORT,
-            180 + angleOfEntry, colour
+                roundingSide == RoundingSide.PORT ? RoundingSide.STARBOARD : RoundingSide.PORT, 180 + angleOfEntry, colour
         );
         arrow.getChildren().addAll(exitSection, roundSection, entrySection);
         return arrow;
     }
 
-    /**
-     * Make an arrow when the turning is not around the outside of the mark.
-     *
-     * @param roundingSide side to round on.
-     * @param angleOfExit angle of entry
-     * @param angleOfEntry angle of exit
-     * @param colour colour of arrow
-     * @return the arrow.
-     */
     private static Group makeInteriorAngle (RoundingSide roundingSide, double angleOfExit, double angleOfEntry, Paint colour) {
         Group arrow = new Group();
         Polygon lineSegment;
-        //Reverse angle of exit/entry to find position between them
         angleOfEntry = Math.toRadians(360 - angleOfEntry);
         angleOfExit = Math.toRadians(180 - angleOfExit);
-        //Find start of entry arrow if it was a regular arrow.
         int multiplier = roundingSide == RoundingSide.STARBOARD ? -1 : 1;
         double xStart = multiplier * MARK_ARROW_SEPARATION * Math.sin(angleOfEntry + Math.PI / 2);
         double yStart = multiplier * MARK_ARROW_SEPARATION * Math.cos(angleOfEntry + Math.PI / 2);
         xStart = xStart + (ARROW_LENGTH * Math.sin(angleOfEntry));
         yStart = yStart + (ARROW_LENGTH * Math.cos(angleOfEntry));
-        //Find of end exit arrow if it was a regular arrow.
         multiplier = roundingSide == RoundingSide.STARBOARD ? 1 : -1;
         double xEnd = multiplier * MARK_ARROW_SEPARATION * Math.sin(angleOfExit + Math.PI / 2);
         double yEnd = multiplier * MARK_ARROW_SEPARATION * Math.cos(angleOfExit + Math.PI / 2);
         xEnd = xEnd + (ARROW_LENGTH * Math.sin(angleOfExit));
         yEnd = yEnd + (ARROW_LENGTH * Math.cos(angleOfExit));
-        //Make line between these points.
         lineSegment = new Polygon(
             xStart, yStart,
             xEnd, yEnd
@@ -159,14 +85,12 @@ public class MarkArrowFactory {
         lineSegment.setFill(Color.BLUE);
         lineSegment.setStrokeWidth(STROKE_WIDTH);
         lineSegment.setStrokeLineCap(StrokeLineCap.ROUND);
-        //Make arrow head at the angle between these points.
         Polyline arrowHead = constructArrowHead(
             90 + Math.toDegrees(Math.atan2(yStart - yEnd, xEnd - xStart)),
             colour
         );
         arrowHead.setLayoutX(xEnd);
         arrowHead.setLayoutY(yEnd);
-        //Construct arrow.
         arrow.getChildren().addAll(lineSegment, arrowHead);
         return arrow;
     }
@@ -189,15 +113,6 @@ public class MarkArrowFactory {
         return arrow;
     }
 
-    /**
-     * Constructs a line rotated to the correct angle and and in the correct position for a mark at
-     * position 0,0. Note that a line segment is assumed to be facing away from the mark so for
-     * entry Starboard make the RoundingSide Port and vice versa.
-     * @param roundingSide Rounding side of an exit arrow. (Reversed for entry)
-     * @param angle Angle of line segment.
-     * @param colour the desired colour of the line.
-     * @return Line segmented at correct rotation centered at (0,0)
-     */
     private static Polygon constructLineSegment (RoundingSide roundingSide, double angle, Paint colour) {
         Polygon lineSegment;
         angle = Math.toRadians(angle);
@@ -217,12 +132,6 @@ public class MarkArrowFactory {
         return lineSegment;
     }
 
-    /**
-     * Constructs a PolyLine in the shape of an arrow head.
-     * @param rotation direction for the arrow head to point.
-     * @param colour colour of the arrow head
-     * @return the arrowhead shaped PolyLine.
-     */
     private static Polyline constructArrowHead (double rotation, Paint colour) {
         Polyline arrow = new Polyline(
             -ARROW_HEAD_WIDTH, -ARROW_HEAD_DEPTH,

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

@@ -7,7 +7,6 @@ import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Circle;
-import seng302.visualiser.fxObjects.MarkArrowFactory;
 
 /**
  * Visual object for a mark. Contains a coloured circle and any specified arrows.
@@ -28,7 +27,8 @@ public class Marker2D extends Group {
         mark.setRadius(5);
         mark.setCenterX(0);
         mark.setCenterY(0);
-        Platform.runLater(() -> this.getChildren().add(mark));
+        Platform.runLater(() -> this.getChildren()
+            .addAll(mark, new Group())); //Empty group placeholder or arrows.
     }
 
     /**
@@ -81,9 +81,13 @@ public class Marker2D extends Group {
 
     private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
-            Platform.runLater(() ->
-                this.getChildren().setAll(mark, arrowList.get(arrowListIndex))
-            );
+            if (arrowListIndex == 1) {
+                ;
+            }
+            Platform.runLater(() -> {
+                this.getChildren().remove(1);
+                this.getChildren().add(arrowList.get(arrowListIndex));
+            });
         }
     }
 

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

@@ -2,62 +2,21 @@ package seng302.visualiser.fxObjects.assets_3D;
 
 /**
  * Enum for boat meshes. Enum values should be of the form :
- * ENUM_VALUE (hull file, mast file, Y offset of mast CoR from origin, sail file, Y offset of sail CoR from origin, jib file, fixed sail)
+ * ENUM_VALUE (hull file, mast file, X offset of mast CoR from origin, sail file, X offset of sail CoR from origin)
  * Files must be valid .stl files.
  */
 public enum BoatMeshType {
 
-    DINGHY("dinghy_hull.stl", "dinghy_mast.stl", 1.36653, "dinghy_sail.stl", 1.36653, null, false, 1.8, 1.0, 1.0),
-    CATAMARAN("catamaran_hull.stl", "catamaran_mast.stl", 0.997, "catamaran_sail.stl",
-        0.997, null, false, 1.0, 1.4, 2.0),
-    PIRATE_SHIP("pirateship_hull.stl", "pirateship_mast.stl", -0.5415, "pirateship_mainsail.stl",
-        -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 1.2),
-    DUCKY("ducky_hull.stl", "ducky_mast.stl", -2.18539, "ducky_sail.stl", -2.18539, "ducky_eyes.stl", false, 1.2, 1.1, 1.4),
-    PARROT("parrot_hull.stl", null, 0, "parrot_sail.stl", 0, "parrot_features.stl", true, 1, 1, 1),
-    WAKA("waka_hull.stl", "waka_mast.stl", 0, "waka_sail.stl", 0, null, true, 1.7, 0.5, 1.5);
+    DINGHY ("dinghy_hull.stl", "dinghy_mast.stl", -1.36653, "dinghy_sail.stl", -1.36653);
 
-    final String hullFile, mastFile, sailFile, jibFile;
+    final String hullFile, mastFile, sailFile;
     final double mastOffset, sailOffset;
-    public final double maxSpeedMultiplier;
-    public final double accelerationMultiplier;
-    public final double turnStep;
-    final boolean fixedSail;
-    final static BoatMeshType[] boatTypes = new BoatMeshType[]{DINGHY, CATAMARAN, PIRATE_SHIP, DUCKY, PARROT, WAKA};
 
-    BoatMeshType(String hullFile, String mastFile, double mastOffset, String sailFile,
-        double sailOffset, String jibFile, boolean fixedSail, double maxSpeedMultiplier, double accelerationMultiplier, double turnStep) {
+    BoatMeshType(String hullFile, String mastFile, double mastOffset, String sailFile, double sailOffset) {
         this.hullFile = hullFile;
         this.mastFile = mastFile;
         this.mastOffset = mastOffset;
         this.sailFile = sailFile;
         this.sailOffset = sailOffset;
-        this.jibFile = jibFile;
-        this.fixedSail = fixedSail;
-        this.maxSpeedMultiplier = maxSpeedMultiplier;
-        this.accelerationMultiplier = accelerationMultiplier;
-        this.turnStep = turnStep;
-    }
-
-
-    public static BoatMeshType getNextBoatType(BoatMeshType boatType) {
-        for (int i = 0; i < boatTypes.length; i++) {
-            if (i == boatTypes.length -1) {
-                return boatTypes[0];
-            } else if (boatType == boatTypes[i]) {
-                return boatTypes[i+1];
-            }
-        }
-        return boatType;
-    }
-
-    public static BoatMeshType getPrevBoatType(BoatMeshType boatType) {
-        for (int i = 0; i < boatTypes.length; i++) {
-            if (i == 0 && boatType == boatTypes[i]) {
-                return boatTypes[boatTypes.length -1];
-            } else if (boatType == boatTypes[i]) {
-                return boatTypes[i-1];
-            }
-        }
-        return boatType;
     }
 }

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

@@ -34,17 +34,15 @@ public class BoatModel extends Model {
      * @param degrees The rotation of the sail in degrees
      */
     public void rotateSail(double degrees) {
-        if (!meshType.fixedSail) {
         MeshView mast = getMeshViewChild(MAST_INDEX);
         MeshView sail = getMeshViewChild(SAIL_INDEX);
         mast.getTransforms().setAll(
-                new Rotate(degrees, 0, -meshType.mastOffset, 0, new Point3D(0, 0, 1))
+                new Rotate(degrees, -meshType.mastOffset, 0,0, new Point3D(0, 0, 1))
         );
         sail.getTransforms().setAll(
-                new Rotate(degrees, 0, -meshType.sailOffset,0, new Point3D(0, 0, 1))
+                new Rotate(degrees, -meshType.sailOffset, 0,0, new Point3D(0, 0, 1))
         );
     }
-    }
 
     public void hideSail() {
         getMeshViewChild(SAIL_INDEX).setVisible(false);
@@ -60,9 +58,7 @@ public class BoatModel extends Model {
      */
     public void changeColour(Color newColour) {
         changeColourChild(HULL_INDEX, newColour);
-        if (meshType != BoatMeshType.PARROT) {
-            changeColourChild(MAST_INDEX, newColour);
-        }
+        changeColourChild(SAIL_INDEX, newColour);
     }
 
     private void changeColourChild(int index, Color newColour) {
@@ -73,8 +69,4 @@ public class BoatModel extends Model {
     private MeshView getMeshViewChild(int index) {
         return (MeshView) assets.getChildren().get(index);
     }
-
-    public BoatMeshType getMeshType() {
-        return meshType;
-    }
 }

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

@@ -1,182 +0,0 @@
-package seng302.visualiser.fxObjects.assets_3D;
-
-import java.util.ArrayList;
-import java.util.List;
-import javafx.application.Platform;
-import javafx.beans.property.ReadOnlyDoubleWrapper;
-import javafx.geometry.Point2D;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.MeshView;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Translate;
-
-/**
- * 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,
- * a wake object and two text labels to annotate the boat teams name and the boatTypes velocity. The
- * boat will update it's position onscreen everytime UpdatePosition is called unless the window is
- * minimized in which case it attempts to store animations and apply them when the window is
- * maximised.
- */
-public class BoatObject extends Group {
-
-    @FunctionalInterface
-    public interface SelectedBoatListener {
-
-        void notifySelected(BoatObject boatObject, Boolean isSelected);
-    }
-
-    private BoatModel boatAssets;
-    private Group wake;
-    private Color colour = Color.BLACK;
-    private Boolean isSelected = false;
-    private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
-
-    // This stuff only matters to the players boat object.
-    private MeshView markIndicator;
-    private MeshView playerIndicator;
-    private ReadOnlyDoubleWrapper rotationProperty;
-
-    private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
-
-    /**
-     * Creates a BoatGroup with the default triangular boat polygon.
-     */
-    public BoatObject(BoatMeshType boatMeshType) {
-        rotationProperty = new ReadOnlyDoubleWrapper(0.0);
-        boatAssets = ModelFactory.boatGameView(boatMeshType, colour);
-        boatAssets.hideSail();
-        boatAssets.getAssets().getTransforms().addAll(
-            rotation
-        );
-        boatAssets.getAssets().setOnMouseClicked(event -> {
-            setIsSelected(!isSelected);
-            updateListeners();
-        });
-        boatAssets.getAssets().setCache(true);
-        wake = ModelFactory.importModel(ModelType.WAKE).getAssets();
-        super.getChildren().addAll(boatAssets.getAssets());
-    }
-
-    public void setFill (Color value) {
-        this.colour = value;
-        boatAssets.changeColour(colour);
-    }
-
-
-    /**
-     * Moves the boat and its children annotations to coordinates specified
-     *  @param x The X coordinate to move the boat to
-     * @param y The Y coordinate to move the boat to
-     * @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) {
-        Platform.runLater(() -> {
-            rotateTo(rotation, sailIn, windDir);
-            this.layoutXProperty().setValue(x);
-            this.layoutYProperty().setValue(y);
-            wake.setLayoutX(x);
-            wake.setLayoutY(y);
-        });
-    }
-
-    public void updateMarkIndicator(Point2D markPoint) {
-        Point2D boatLoc = new Point2D(this.getLayoutX(), this.getLayoutY());
-        Double angle = Math.toDegrees(
-            Math.atan2(boatLoc.getY() - markPoint.getY(), boatLoc.getX() - markPoint.getX())) - 90;
-
-        Double radius = 0.5;
-        markIndicator.getTransforms().clear();
-        markIndicator.getTransforms().addAll(
-            new Rotate(angle, new Point3D(0, 0, 1)),
-            new Translate(0, -radius, 0)
-        );
-    }
-
-    private Double normalizeHeading(double heading, double windDirection) {
-        Double normalizedHeading = heading - windDirection;
-        normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
-        return normalizedHeading;
-    }
-
-
-    private void rotateTo(double heading, boolean sailsIn, double windDir) {
-        rotationProperty.set(heading);
-        rotation.setAngle(heading);
-        wake.getTransforms().setAll(new Rotate(heading, new Point3D(0,0,1)));
-        if (sailsIn) {
-            boatAssets.showSail();
-            Double sailWindOffset = 30.0;
-            Double upwindAngleLimit = 15.0;
-            Double downwindAngleLimit = 10.0; //Upwind from normalised horizontal
-            Double normalizedHeading = normalizeHeading(heading, windDir);
-            if (normalizedHeading < 180) {
-                if (normalizedHeading < sailWindOffset + upwindAngleLimit){
-                    boatAssets.rotateSail(-upwindAngleLimit);
-                } else if (normalizedHeading > 90 + sailWindOffset){
-                    boatAssets.rotateSail(-90 + downwindAngleLimit);
-                } else {
-                    boatAssets.rotateSail(-heading + windDir + sailWindOffset);
-                }
-            } else {
-                if (normalizedHeading > 360 - (sailWindOffset + upwindAngleLimit)) {
-                    boatAssets.rotateSail(upwindAngleLimit);
-                } else if (normalizedHeading < 270 - sailWindOffset) {
-                    boatAssets.rotateSail(90 - downwindAngleLimit);
-                } else {
-                    boatAssets.rotateSail(-heading + windDir - sailWindOffset);
-                }
-            }
-        } else {
-            boatAssets.hideSail();
-        }
-    }
-
-    public void setMarkIndicator(MeshView indicator) {
-        this.markIndicator = indicator;
-        this.getChildren().add(markIndicator);
-        createPlayerIndicator();
-        setIndicatorColor();
-    }
-
-    private void createPlayerIndicator() {
-        MeshView torus = ModelFactory.importSTL("player_circle.stl");
-        playerIndicator = torus;
-        this.getChildren().add(torus);
-    }
-
-    public void setIndicatorColor() {
-        Platform.runLater(() -> {
-            markIndicator.setMaterial(new PhongMaterial(Color.DARKORANGE));
-            playerIndicator.setMaterial(new PhongMaterial(colour));
-        });
-    }
-
-    public Group getWake () {
-        return wake;
-    }
-
-    public void setIsSelected(Boolean isSelected) {
-        this.isSelected = isSelected;
-    }
-
-    private void updateListeners() {
-        for (SelectedBoatListener sbl : selectedBoatListenerListeners) {
-            sbl.notifySelected(this, this.isSelected);
-        }
-    }
-
-    public void addSelectedBoatListener(SelectedBoatListener sbl) {
-        selectedBoatListenerListeners.add(sbl);
-    }
-
-    public ReadOnlyDoubleWrapper getRotationProperty() {
-        return rotationProperty;
-    }
-}

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

@@ -4,42 +4,45 @@ import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
 import javafx.scene.Group;
-import seng302.visualiser.fxObjects.MarkArrowFactory;
-import seng302.visualiser.fxObjects.MarkArrowFactory.RoundingSide;
+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 Model mark;
+    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;
-    private ModelType markType;
-    private ModelType arrowType;
 
     /**
      * Creates a new Marker containing only a circle. The default colour is black.
      */
-    public Marker3D(ModelType modelType) {
-        markType = modelType;
-        switch (markType) {
-            case PLAIN_MARKER:
-                arrowType = ModelType.PLAIN_ARROW;
-                break;
-            case FINISH_MARKER:
-                arrowType = ModelType.FINISH_ARROW;
-                break;
-            case START_MARKER:
-                arrowType = ModelType.START_ARROW;
-                break;
+    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.
     }
-        mark = ModelFactory.importModel(modelType);
-        Platform.runLater(() ->
-            this.getChildren().addAll(mark.getAssets())
-        );
+
+    /**
+     * 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);
     }
 
     /**
@@ -53,10 +56,10 @@ public class Marker3D extends Group {
                           double exitAngle) {
         //Change Color.GRAY to this.colour to revert all gray arrows.
         enterArrows.add(
-            MarkArrowFactory.constructEntryArrow3D(roundingSide, entryAngle, arrowType).getAssets()
+            MarkArrowFactory.constructEntryArrow(roundingSide, entryAngle, exitAngle, Color.GRAY)
         );
         exitArrows.add(
-            MarkArrowFactory.constructExitArrow3D(roundingSide, exitAngle, arrowType).getAssets()
+            MarkArrowFactory.constructExitArrow(roundingSide, exitAngle, Color.GRAY)
         );
     }
 
@@ -78,9 +81,12 @@ public class Marker3D extends Group {
 
     private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
-            Platform.runLater(() ->
-                this.getChildren().setAll(mark.getAssets(), arrowList.get(arrowListIndex))
-            );
+            if (arrowListIndex == 1) {;
+            }
+            Platform.runLater(() -> {
+                this.getChildren().remove(1);
+                this.getChildren().add(arrowList.get(arrowListIndex));
+            });
         }
     }
 
@@ -88,6 +94,6 @@ public class Marker3D extends Group {
      * Hides all arrows.
      */
     public void hideAllArrows() {
-        Platform.runLater(() -> this.getChildren().setAll(mark.getAssets()));
+        Platform.runLater(() -> this.getChildren().setAll(mark, new Group()));
     }
 }

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

@@ -8,10 +8,10 @@ import javafx.scene.Group;
  */
 public class Model {
 
-    protected AnimationTimer animationTimer;
-    protected Group assets;
+    AnimationTimer animationTimer;
+    Group assets;
 
-    public Model (Group assets, AnimationTimer animation) {
+    Model (Group assets, AnimationTimer animation) {
         this.assets = assets;
         this.animationTimer = animation;
         if (animation != null) {
@@ -25,7 +25,7 @@ public class Model {
         }
     }
 
-    void setAnimation(AnimationTimer animation) {
+    public void setAnimation(AnimationTimer animation) {
         animationTimer = animation;
         if (animation != null) {
             animation.start();

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

@@ -9,7 +9,6 @@ import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.Circle;
 import javafx.scene.shape.MeshView;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
@@ -18,7 +17,7 @@ import javafx.scene.transform.Translate;
 
 
 /**
- * Factory class for creating 3D models of boatTypes.
+ * Factory class for creating 3D models of boats.
  */
 public class ModelFactory {
 
@@ -51,80 +50,52 @@ public class ModelFactory {
         return bo;
     }
 
-    public static BoatModel boatCustomiseView(BoatMeshType boatType, Color primaryColour) {
+    public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
-        final Rotate animationRotate = new Rotate(0, new Point3D(0,0,1));
         boatAssets.getTransforms().addAll(
-            new Scale(8.0, 8.0, 8.0),
-            new Rotate(-70, new Point3D(1,0,0)),
-            new Translate(16,50, 1),
-            animationRotate
+            new Scale(40, 40, 40),
+            new Rotate(90, new Point3D(0,0,1)),
+            new Rotate(90, new Point3D(0, 1, 0))
         );
 
+        final Rotate animationRotate = new Rotate(0, new Point3D(1,1,1));
         boatAssets.getTransforms().add(animationRotate);
-        BoatModel bo = new BoatModel(boatAssets, null, boatType);
-        bo.rotateSail(45);
 
-        bo.setAnimation(new AnimationTimer() {
-            double boatAngle = 0;
-            Rotate rotate = animationRotate;
+        return new BoatModel(boatAssets, new AnimationTimer() {
+
+            private double rotation = 0;
+            private Rotate rotate = animationRotate;
+
             @Override
             public void handle(long now) {
-                boatAngle += 0.5;
-                rotate.setAngle(boatAngle);
+                rotation += 0.5;
+                rotate.setAngle(rotation);
             }
-        });
-        boatAssets.getChildren().addAll(
-            new AmbientLight()
-        );
-        return bo;
+        }, boatType);
     }
 
     public static BoatModel boatGameView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().setAll(
-            new Scale(0.3, 0.3, 0.3)
+            new Rotate(-90, new Point3D(0,0,1)),
+            new Scale(0.06, 0.06, 0.06)
         );
         return new BoatModel(boatAssets, null, boatType);
     }
 
     private static Group getUnmodifiedBoatModel(BoatMeshType boatType, Color primaryColour) {
-
         Group boatAssets = new Group();
-        MeshView hull = importBoatSTL(boatType.hullFile);
+        MeshView hull = importFile(boatType.hullFile);
         hull.setMaterial(new PhongMaterial(primaryColour));
-        boatAssets.getChildren().add(hull);
-
-        if (boatType.mastFile != null) {
-            MeshView mast = importBoatSTL(boatType.mastFile);
+        MeshView mast = importFile(boatType.mastFile);
         mast.setMaterial(new PhongMaterial(primaryColour));
-            boatAssets.getChildren().add(mast);
-        } else {
-            boatAssets.getChildren().add(new Group());
-        }
-
-        MeshView sail = importBoatSTL(boatType.sailFile);
-        sail.setMaterial(
-            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
-        );
-        boatAssets.getChildren().add(sail);
-
-        if (boatType.jibFile != null) {
-            MeshView jib = importBoatSTL(boatType.jibFile);
-            jib.setMaterial(
-                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
-            );
-            boatAssets.getChildren().add(jib);
-        }
-
+        MeshView sail = importFile(boatType.sailFile);
+        sail.setMaterial(new PhongMaterial(Color.WHITE));
+        boatAssets.getChildren().addAll(hull, mast, sail);
         return boatAssets;
     }
 
-    private static MeshView importBoatSTL(String fileName) {
-        return importSTL("boatSTLs/" + fileName);
-    }
-
-    public static MeshView importSTL(String fileName) {
+    private static MeshView importFile(String fileName) {
         StlMeshImporter importer = new StlMeshImporter();
         importer.read(ModelFactory.class.getResource("/meshes/" + fileName));
         MeshView importedFile = new MeshView(importer.getImport());
@@ -145,16 +116,8 @@ public class ModelFactory {
             assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         }
         switch (tokenType) {
-            case PLAYER_IDENTIFIER_TORUS:
-                return makeIdentifierTorus(assets);
-            case NEXT_MARK_INDICATOR:
-                return makeNextMarkIndicator(assets);
             case VELOCITY_PICKUP:
-            case BUMPER_PICKUP:
-            case RANDOM_PICKUP:
-            case HANDLING_PICKUP:
-            case WIND_WALKER_PICKUP:
-                return makeTokenPickup(assets);
+                return makeCoinPickup(assets);
             case FINISH_MARKER:
             case PLAIN_MARKER:
             case START_MARKER:
@@ -174,41 +137,29 @@ public class ModelFactory {
                 return makeTrail(assets);
             case PLAYER_IDENTIFIER:
                 return makeIdentifierIcon(assets);
-            case START_ARROW:
-            case FINISH_ARROW:
-            case PLAIN_ARROW:
-                makeArrow(assets);
             default:
                 return new Model(new Group(assets), null);
         }
     }
 
-    private static Model makeIdentifierTorus(Group assets) {
-//        assets.getChildren().add(new AmbientLight());
-        return new Model(new Group(assets), null);
-    }
-
-    private static Model makeNextMarkIndicator(Group assets) {
-//        assets.getChildren().add(new AmbientLight());
-        return new Model(new Group(assets), null);
-    }
-
-    private static Model makeTokenPickup(Group assets) {
-        Rotate animationRotate = new Rotate(0, new Point3D(0, 0, 1));
+    private static Model makeCoinPickup(Group assets){
+        assets.setRotationAxis(new Point3D(1,0,0));
+        assets.setRotate(90);
+        assets.setTranslateX(0.2);
+        assets.setTranslateY(1);
         assets.getTransforms().addAll(
-            animationRotate,
-            new Translate(0, 0, -1)
+            new Translate(0,-1,0),
+            new Rotate(0 ,new Point3D(1,1,1))
         );
-
         return new Model(new Group(assets), new AnimationTimer() {
 
             private double rotation = 0;
-            private Rotate rotate = animationRotate;
+            private Group group = assets;
 
             @Override
             public void handle(long now) {
                 rotation += 1;
-                rotate.setAngle(rotation);
+                ((Rotate) group.getTransforms().get(1)).setAngle(rotation);
             }
         });
     }
@@ -223,17 +174,23 @@ public class ModelFactory {
     }
 
     private static Model makeOcean(Group group) {
-        Circle ocean = new Circle(
-            0,0,250, Color.SKYBLUE
+//        group.setScaleY(Double.MAX_VALUE);
+//        group.setScaleX(Double.MAX_VALUE);
+        group.getTransforms().addAll(
+            new Rotate(90, new Point3D(1, 0, 0)),
+            new Scale(10,4,10)
         );
-        ocean.setStroke(Color.TRANSPARENT);
-        group.getChildren().add(ocean);
+//        group.getChildren().add(new AmbientLight());
+//        Circle ocean = new Circle(0,0,500, Color.SKYBLUE);
+//        ocean.setStroke(Color.TRANSPARENT);
+//        group.getChildren().add(ocean);
         return new Model(new Group(group), null);
     }
 
     private static Model makeBarrier(Group assets) {
         assets.getTransforms().addAll(
-            new Rotate(90, new Point3D(1,0,0))
+            new Rotate(90, new Point3D(1,0,0)),
+            new Scale(1.5,1.5,1.5)
         );
         return new Model(new Group(assets), null);
     }
@@ -256,8 +213,7 @@ public class ModelFactory {
 
     private static Model makeTrail(Group trailPiece) {
         trailPiece.getTransforms().addAll(
-            new Rotate(-90, new Point3D(0,0,1)),
-            new Rotate(90, new Point3D(1,0,0))
+            new Rotate(90, new Point3D(0,0,1))
         );
         return new Model(new Group(trailPiece), null);
     }
@@ -269,11 +225,4 @@ public class ModelFactory {
         );
         return new Model(assets, null);
     }
-
-    private static Model makeArrow(Group assets) {
-        assets.getTransforms().addAll(
-            new Rotate(90, new Point3D(1,0,0))
-        );
-        return new Model(new Group(assets), null);
-    }
 }

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

@@ -7,15 +7,11 @@ package seng302.visualiser.fxObjects.assets_3D;
 public enum ModelType {
 
     VELOCITY_PICKUP("velocity_pickup.dae"),
-    HANDLING_PICKUP("turning_pickup.dae"),
-    WIND_WALKER_PICKUP("wind_walker_pickup.dae"),
-    BUMPER_PICKUP("bumper_pickup.dae"),
-    RANDOM_PICKUP("random_pickup.dae"),
     FINISH_MARKER ("finish_marker.dae"),
     START_MARKER ("start_marker.dae"),
     PLAIN_MARKER ("plain_marker.dae"),
     MARK_AREA ("mark_area.dae"),
-    OCEAN (null),
+    OCEAN ("ocean.dae"),
     BORDER_PYLON ("barrier_pole.dae"),
     BORDER_BARRIER ("barrier_segment.dae"),
     FINISH_LINE ("finish_line.dae"),
@@ -23,14 +19,7 @@ public enum ModelType {
     GATE_LINE ("gate_line.dae"),
     WAKE ("wake.dae"),
     TRAIL_SEGMENT ("trail_segment.dae"),
-    PLAYER_IDENTIFIER ("player_identifier.dae"),
-    PLAIN_ARROW ("arrow.dae"),
-    START_ARROW ("start_arrow.dae"),
-    FINISH_ARROW ("finish_arrow.dae"),
-    LAND("land.dae"),
-    LAND_SMOOTH("land_smooth.dae"),
-    NEXT_MARK_INDICATOR("indicator_arrow.dae"),
-    PLAYER_IDENTIFIER_TORUS("torus.dae");
+    PLAYER_IDENTIFIER ("player_identifier.dae");
 
     final String filename;
 
@@ -38,3 +27,4 @@ public enum ModelType {
         this.filename = filename;
     }
 }
+

src/main/java/seng302/visualiser/test3d.java

@@ -0,0 +1,108 @@
+package seng302.visualiser;
+
+import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.animation.AnimationTimer;
+import javafx.application.Application;
+import javafx.geometry.Point3D;
+import javafx.scene.Camera;
+import javafx.scene.Group;
+import javafx.scene.PerspectiveCamera;
+import javafx.scene.Scene;
+import javafx.scene.SceneAntialiasing;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.MeshView;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Scale;
+import javafx.scene.transform.Translate;
+import javafx.stage.Stage;
+
+/**
+ * Created by cir27 on 7/09/17.
+ */
+public class test3d extends Application {
+
+    Group root = new Group();
+    Scene scene;
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+//        camera = new PerspectiveCamera();
+//        gameObjects = new Group();
+//        root3D = new Group(camera, gameObjects);
+        scene = new Scene(
+            root, 1000, 1000, true, SceneAntialiasing.BALANCED
+        );
+        gameView3DTest();
+        primaryStage.setScene(scene);
+        primaryStage.show();
+//        scene.setCamera(camera);
+//        primaryStage.setScene(scene);
+//        primaryStage.show();
+//
+//        StlMeshImporter importer = new StlMeshImporter();
+//        importer.read(test3d.class.getResource("/meshes/dinghy_hull.stl").toString());
+//        MeshView boat = new MeshView(importer.getImport());
+//        boat.setMaterial(new PhongMaterial(Color.GREENYELLOW));
+//
+//        importer = new StlMeshImporter();
+//        importer.read(getClass().getResource("/meshes/dinghy_mast.stl").toString());
+//        MeshView mast = new MeshView(importer.getImport());
+//        mast.setMaterial(new PhongMaterial(Color.GREENYELLOW));
+//
+//        importer = new StlMeshImporter();
+//        importer.read(getClass().getResource("/meshes/dinghy_sail.stl").toString());
+//        MeshView sail = new MeshView(importer.getImport());
+//        sail.setMaterial(new PhongMaterial(Color.LIGHTGREY));
+//
+//        gameObjects.getChildren().addAll(boat, mast, sail);
+//
+//        gameObjects.getTransforms().add(new Scale(25, 25,25));
+//        gameObjects.getTransforms().add(new Translate(15, 20,0));
+//        gameObjects.getTransforms().addAll(
+//            new Rotate(90, new Point3D(0,0,1)),
+//            new Rotate(90, new Point3D(0, 1, 0))
+//        );
+//
+////        PointLight light = new PointLight();
+////        light.setLightOn(true);
+////        light.getTransforms().add(new Translate(15, 20, 0));
+////
+////        PointLight light2 = new PointLight();
+////        light2.setLightOn(true);
+////        light2.getTransforms().add(new Translate(30, 40, 0));
+//
+////        root3D.getChildren().addAll(light);
+//
+//        scene.setOnKeyPressed(event -> {
+//            switch (event.getCode()) {
+//                case UP:
+//                    gameObjects.getTransforms().add(new Rotate(5, new Point3D(0,0,1)));
+//                    break;
+//                case DOWN:
+//                    gameObjects.getTransforms().add(new Rotate(-5, new Point3D(0,0,1)));
+//                    break;
+//                case LEFT:
+//                    gameObjects.getTransforms().add(new Rotate(-5, new Point3D(0,1,0)));
+//                    break;
+//                case RIGHT:
+//                    gameObjects.getTransforms().add(new Rotate(5, new Point3D(0,1,0)));
+//                    break;
+//            }
+//        });
+//
+//        AnimationTimer animationTimer = new AnimationTimer() {
+//            @Override
+//            public void handle(long now) {
+//                sail.getTransforms().add(new Rotate(0.5, 0, -1.36653, 0, new Point3D(0, 0, 1)));
+//            }
+//        };
+//
+////        animationTimer.start();
+    }
+
+    private void gameView3DTest() {
+        GameView3D gameView3D = new GameView3D();
+        root.getChildren().add(gameView3D.getAssets());
+    }
+}

src/main/resources/config/config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+
+<configurations>
+    <race-name>AC35</race-name>
+    <race-size>6</race-size>
+    <time-scale>10.0</time-scale>
+    <windDir-direction>135</windDir-direction>
+</configurations>
+

src/main/resources/config/course.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" ?>
+
+<markers>
+    <marks>
+        <gate>
+            <name type="start-line">Start</name>
+            <mark>
+                <name>Start1</name>
+                <latitude>57.6703330</latitude>
+                <longitude>11.8278330</longitude>
+                <id>122</id>
+            </mark>
+            <mark>
+                <name>Start2</name>
+                <latitude>57.6703330</latitude>
+                <longitude>11.8271333</longitude>
+                <id>123</id>
+            </mark>
+        </gate>
+        <mark>
+            <name>Mid Mark</name>
+            <latitude>57.6675700</latitude>
+            <longitude>11.8359880</longitude>
+            <id>131</id>
+        </mark>
+        <gate>
+            <name>Leeward Gate</name>
+            <mark>
+                <name>Leeward Gate1</name>
+                <latitude>57.6708220</latitude>
+                <longitude>11.8433900</longitude>
+                <id>124</id>
+            </mark>
+            <mark>
+                <name>Leeward Gate2</name>
+                <latitude>57.6711220</latitude>
+                <longitude>11.8436900</longitude>
+                <id>125</id>
+            </mark>
+        </gate>
+        <gate>
+            <name>Windward Gate</name>
+            <mark>
+                <name>Windward Gate1</name>
+                <latitude>57.6650170</latitude>
+                <longitude>11.8279170</longitude>
+                <id>126</id>
+            </mark>
+            <mark>
+                <name>Windward Gate2</name>
+                <latitude>57.6653170</latitude>
+                <longitude>11.8282170</longitude>
+                <id>127</id>
+            </mark>
+        </gate>
+        <gate type="finish-line">
+            <name>Finish</name>
+            <mark>
+                <name>Finish1</name>
+                <latitude>57.6715240</latitude>
+                <longitude>11.8444950</longitude>
+                <id>128</id>
+            </mark>
+            <mark>
+                <name>Finish2</name>
+                <latitude>57.6718240</latitude>
+                <longitude>11.8447950</longitude>
+                <id>129</id>
+            </mark>
+        </gate>
+    </marks>
+    <order>
+        <one>Start</one>
+        <two>Mid Mark</two>
+        <three>Leeward Gate</three>
+        <four>Windward Gate</four>
+        <five>Leeward Gate</five>
+        <six>Finish</six>
+    </order>
+</markers>

src/main/resources/config/courseAlt.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" ?>
+
+<course>
+    <marks>
+        <gate>
+            <name type="start-line">Start</name>
+            <mark>
+                <name>Start1</name>
+                <latitude>32.296577</latitude>
+                <longitude>-64.854304</longitude>
+            </mark>
+            <mark>
+                <name>Start2</name>
+                <latitude>32.293771</latitude>
+                <longitude>-64.855242</longitude>
+            </mark>
+        </gate>
+        <mark>
+            <name>Mid Mark</name>
+            <latitude>32.293039</latitude>
+            <longitude>-64.843983</longitude>
+        </mark>
+        <gate>
+            <name>Leeward Gate</name>
+            <mark>
+                <name>Leeward Gate1</name>
+                <latitude>32.284680</latitude>
+                <longitude>-64.850045</longitude>
+            </mark>
+            <mark>
+                <name>Leeward Gate2</name>
+                <latitude>32.280164</latitude>
+                <longitude>-64.847591</longitude>
+            </mark>
+        </gate>
+        <gate>
+            <name>Windward Gate</name>
+            <mark>
+                <name>Windward Gate1</name>
+                <latitude>32.309693</latitude>
+                <longitude>-64.835249</longitude>
+            </mark>
+            <mark>
+                <name>Windward Gate2</name>
+                <latitude>32.308046</latitude>
+                <longitude>-64.831785</longitude>
+            </mark>
+        </gate>
+        <gate type="finish-line">
+            <name>Finish</name>
+            <mark>
+                <name>Finish1</name>
+                <latitude>32.317379</latitude>
+                <longitude>-64.839291</longitude>
+            </mark>
+            <mark>
+                <name>Finish2</name>
+                <latitude>32.317257</latitude>
+                <longitude>-64.836260</longitude>
+            </mark>
+        </gate>
+    </marks>
+    <order>
+        <one>Start</one>
+        <two>Mid Mark</two>
+        <three>Leeward Gate</three>
+        <four>Windward Gate</four>
+        <five>Leeward Gate</five>
+        <six>Finish</six>
+    </order>
+</course>
+

src/main/resources/config/teams.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+
+<teams>
+    <team>
+        <name>Oracle Team USA</name>
+        <alias>USA</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>102</id>
+    </team>
+    <team>
+        <name>Artemis Racing</name>
+        <alias>ART</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>101</id>
+    </team>
+    <team>
+        <name>Emirates Team New Zealand</name>
+        <alias>NZL</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>103</id>
+    </team>
+    <team>
+        <name>Land Rover BAR</name>
+        <alias>BAR</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>104</id>
+    </team>
+    <team>
+        <name>SoftBank Team Japan</name>
+        <alias>JAP</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>105</id>
+    </team>
+    <team>
+        <name>Groupama Team France</name>
+        <alias>FRC</alias>
+        <currentVelocity>0.0</currentVelocity>
+        <id>106</id>
+    </team>
+</teams>

src/main/resources/css/LobbyView.css

@@ -66,11 +66,3 @@
     /*-fx-background-size: cover;*/
     -fx-background-color: dodgerblue;
 }
-
-.tokenView {
-    -fx-cursor: hand;
-}
-
-.tokenGridView StackPane {
-    -fx-background-color: white;
-}

src/main/resources/css/Master.css

@@ -44,18 +44,8 @@
     -fx-border-color: -fx-decorator-color;
     -fx-border-width: 0 4 4 4;
 }
-
-.jfx-decorator-button {
-    -fx-focus-traversable: false; /* so decorator button will not be focused */
-}
-
 /********* customised scroll bar for scroll pane ***********/
 
-.scroll-pane {
-    -fx-focus-traversable: false;
-    -fx-border-style: none;
-}
-
 /* The main scrollbar **track** CSS class  */
 .scroll-bar:horizontal .track,
 .scroll-bar:vertical .track {
@@ -110,15 +100,3 @@
 .slider .track {
     -fx-background-color: -fx-pp-dark-text-color;
 }
-
-.jfx-snackbar-content {
-    -fx-background-color: -fx-pp-front-color;
-    -fx-padding: 0 5 0 5;
-    -fx-spacing: 0 5 0 5;
-    -fx-font-size: 15;
-}
-
-.jfx-snackbar-toast {
-    -fx-text-fill: -fx-pp-theme-color;
-    -fx-font-size: 15;
-}

src/main/resources/css/RaceView.css

@@ -1,15 +1,13 @@
 @font-face {
-    src: url("digital-7-mono.ttf");
+    src: url("DJB-Get-Digital.ttf");
 }
 
 #timerGrid{
     -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-effect: -fx-pp-dropshadow-light;
 }
 
-GridPane .timer * {
-    -fx-font-family: "Digital-7 Mono" !important;
-    -fx-font-size: 30;
+.timer Label {
+    -fx-font-family: "DJB Get Digital" !important;
 }
 
 #timerLabel{
@@ -21,26 +19,19 @@ GridPane .timer * {
 }
 
 #chatGridPane {
-    -fx-background-color: transparent;
+    -fx-background-color: rgba(255, 255, 255, 0.6);
 }
 
 #chatHistoryHolder {
-    -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-effect: -fx-pp-dropshadow-light;
-}
 
-#chatInputHolder {
-    -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-effect: -fx-pp-dropshadow-light;
 }
 
 #windGridPane {
     -fx-background-color: rgba(255, 255, 255, 0.6);
-    -fx-effect: -fx-pp-dropshadow-light;
 }
 
 #windHolder {
-    -fx-background-color: rgba(255, 255, 255, 0.5);
+    -fx-background-color: -fx-pp-front-color;
 }
 
 #chatSend {
@@ -48,7 +39,6 @@ GridPane .timer * {
     -fx-text-fill: -fx-pp-theme-color;
     -fx-font-size: 13px;
     -fx-pref-height: 35px;
-    -fx-focus-traversable: false;
 }
 
 #chatSend:hover {
@@ -62,5 +52,5 @@ GridPane .timer * {
 }
 
 #windImageView {
-    -fx-image: url("/images/wind-180.png");
+    -fx-image: url("/images/wind.png");
 }

src/main/resources/css/ServerListView.css

@@ -38,31 +38,30 @@
     -fx-font-size: 23px;
 }
 
-#connectButton, #roomConnectButton, #directConnectButton, #autoSelectGame {
+#connectButton {
     -fx-background-color: -fx-pp-light-text-color; /* inverted */
     -fx-text-fill: -fx-pp-theme-color; /* inverted */
     -fx-font-size: 20px;
-    -fx-pref-height: 45px;
-    -fx-effect: -fx-pp-dropshadow-dark;
+    -fx-pref-height: 65px;
 }
 
-#connectButton:hover, #roomConnectButton:hover, #directConnectButton:hover, #autoSelectGame:hover {
-    -fx-font-size: 21px;
+#connectButton:hover {
+    -fx-font-size: 23px;
 }
 
-#connectLabel, #connectLabel1, #serverPortNumber, #roomNumber, #serverHostName {
+#connectLabel, #serverPortNumber, #serverHostName {
     -fx-text-fill: -fx-pp-light-text-color;
     -fx-font-size: 18px;
 }
 
-#serverHostName, #serverPortNumber, #roomNumber {
+#serverHostName, #serverPortNumber {
     -jfx-focus-color: -fx-pp-light-text-color;
     -jfx-unfocus-color: -fx-pp-light-text-color;
     -fx-prompt-text-fill: -fx-pp-light-text-color;
 }
 
 
-#serverHostName .error-label, #serverPortNumber .error-label, #roomNumber .error-label {
+#serverHostName .error-label, #serverPortNumber .error-label {
     -fx-font-size: 12px;
     -fx-text-fill: lightblue;
 }

src/main/resources/css/SplashScreenView.css

@@ -1,50 +0,0 @@
-.root {
-    -fx-effect: -fx-pp-dropshadow-dark;
-    -fx-background-radius: 5;
-    -fx-padding: 10;
-}
-
-#rootPane {
-    -fx-background-image: url("/images/waves.png");
-
-}
-
-#headText {
-    -fx-font-size: 52px;
-    -fx-text-fill: rgb(30, 30, 30);
-    -fx-effect: -fx-pp-dropshadow-dark;
-}
-
-#subHeadLabel {
-    -fx-text-fill: rgb(30, 30, 30);
-    -fx-effect: -fx-pp-dropshadow-dark;
-    -fx-font-size: 12px;
-}
-
-.materialDesign-purple .arc {
-    -fx-stroke: #ab47bc;
-}
-
-.materialDesign-blue .arc {
-    -fx-stroke: #2962ff;
-}
-
-.materialDesign-cyan .arc {
-    -fx-stroke: #00b8d4;
-}
-
-.materialDesign-green .arc {
-    -fx-stroke: #00c853;
-}
-
-.materialDesign-yellow .arc {
-    -fx-stroke: #ffd600;
-}
-
-.materialDesign-orange .arc {
-    -fx-stroke: #ff6d00;
-}
-
-.materialDesign-red .arc {
-    -fx-stroke: #d50000;
-}

src/main/resources/css/StartScreenView.css

@@ -2,7 +2,6 @@
     -fx-font-size: 20px;
     -fx-text-fill: -fx-pp-light-text-color;
     -fx-background-color: -fx-pp-theme-color;
-    -fx-focus-traversable: false;
 }
 
 .jfx-rippler {

src/main/resources/css/TokenInfoDialog.css

@@ -1,22 +0,0 @@
-.text-area {
-    -fx-background-insets: 0;
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area .content {
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area:focused .content {
-    -fx-background-color: transparent, white, transparent, white;
-}
-
-.text-area:focused {
-    -fx-highlight-fill: #7ecfff;
-}
-
-.text-area .content {
-    -fx-padding: 10px;
-    -fx-text-fill: gray;
-    -fx-highlight-fill: #7ecfff;
-}

src/main/resources/css/dialogs/BoatCustomize.css

@@ -1,3 +1,6 @@
+* {
+    -fx-text-fill: -fx-pp-dark-text-color;
+}
 
 #submitBtn {
     -fx-background-color: -fx-pp-theme-color;
@@ -20,15 +23,7 @@
     -fx-font-size: 18px;
 }
 
-#boatName, #boatColorLabel, #hostDialogHeader {
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
 #boatName {
     -fx-font-size: 18px;
     -fx-prompt-text-fill: -fx-pp-dark-text-color;
 }
-
-#boatName .error-label {
-    -fx-font-size: 13px;
-}

src/main/resources/css/dialogs/DirectConnect.css

@@ -1,47 +0,0 @@
-#maxPlayersGridPane VBox * {
-    -fx-font-family: monospace !important;
-}
-
-#submitBtn {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-light-text-color;
-    -fx-font-size: 20px;
-    -fx-effect: -fx-pp-dropshadow-dark;
-}
-
-.jfx-rippler {
-    -jfx-rippler-fill: -fx-pp-light-theme-color; /* set rippler color for button */
-}
-
-#submitBtn:hover {
-    -fx-font-size: 23px;
-    -fx-background-color: -fx-pp-light-theme-color;
-}
-
-#hostDialogHeader {
-    -fx-font-size: 30px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-
-#serverName {
-    -jfx-focus-color: -fx-pp-dark-text-color;
-    -jfx-unfocus-color: -fx-pp-dark-text-color;
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-prompt-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-#maxPlayersLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-#maxPlayerPromptLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 16px;
-}
-
-.maxPlayers {
-    -fx-font-size: 13px;
-}

src/main/resources/css/dialogs/FinishScreen.css

@@ -1,21 +0,0 @@
-#raceFinishLabel {
-    -fx-font-size: 23px !important;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#finishersList {
-
-}
-
-#playAgain {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-light-text-color;
-    -fx-font-size: 20px !important;
-    -fx-effect: -fx-pp-dropshadow-dark;
-    -fx-min-width: 130px;
-}
-
-#playAgain:hover {
-    -fx-font-size: 23px !important;
-    -fx-background-color: -fx-pp-light-theme-color;
-}

src/main/resources/css/dialogs/KeyBindingDialog.css

@@ -1,59 +0,0 @@
-#keyBindingDialogHeader {
-    -fx-font-size: 27px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel {
-    -fx-font-size: 30;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel:hover {
-    -fx-text-fill: red;
-    -fx-font-size: 33px;
-}
-
-.sectionLabel {
-    -fx-text-fill: -fx-pp-dark-text-color;
-    -fx-font-size: 20px;
-}
-
-JFXButton {
-    -fx-background-color: -fx-pp-light-text-color;
-    -fx-text-fill: -fx-pp-theme-color;
-    -fx-font-size: 13px;
-}
-
-Label {
-    -fx-font-size: 15px;
-    -fx-text-fill: -fx-pp-theme-color;
-    -fx-effect: -fx-pp-dropshadow-light;
-}
-
-JFXToggleButton {
-    -jfx-toggle-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-theme-color;
-}
-
-#resetBtn, #confirmBtn {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-front-color;
-    -fx-effect: -fx-pp-dropshadow-light;
-    -fx-font-size: 18;
-}
-
-#resetBtn:hover, #confirmBtn:hover {
-    -fx-font-size: 20;
-}
-
-.jfx-snackbar-content {
-    -fx-background-color: #323232;
-}
-
-.jfx-snackbar-toast {
-    -fx-text-fill: WHITE;
-}
-
-.jfx-snackbar-action {
-    -fx-text-fill: #ff4081;
-}