Fixed alignment on room code label, and room code input

Tags: #story[1281]

src/main/java/seng302/App.java

@@ -10,11 +10,13 @@ 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;
 
 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();
@@ -25,40 +27,52 @@ 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")) {
-                case "DEBUG":
-                    rootLogger.setLevel(Level.DEBUG);
-                    break;
+        switch (cmd.getOptionValue("debugLevel")) {
+            case "DEBUG":
+                rootLogger.setLevel(Level.DEBUG);
+                break;
 
-                case "ALL":
-                    rootLogger.setLevel(Level.ALL);
-                    break;
+            case "ALL":
+                rootLogger.setLevel(Level.ALL);
+                break;
 
-                case "WARNING":
-                    rootLogger.setLevel(Level.WARN);
-                    break;
+            case "WARNING":
+                rootLogger.setLevel(Level.WARN);
+                break;
 
-                case "ERROR":
-                    rootLogger.setLevel(Level.ERROR);
-                    break;
+            case "ERROR":
+                rootLogger.setLevel(Level.ERROR);
+                break;
 
-                case "INFO":
-                    rootLogger.setLevel(Level.INFO);
+            case "INFO":
+                rootLogger.setLevel(Level.INFO);
 
-                case "TRACE":
-                    rootLogger.setLevel(Level.TRACE);
+            case "TRACE":
+                rootLogger.setLevel(Level.TRACE);
 
-                default:
-                    rootLogger.setLevel(Level.ALL);
-            }
-        } else {
-            rootLogger.setLevel(Level.WARN);
+            default:
+                rootLogger.setLevel(Level.ALL);
         }
+    } else {
+        rootLogger.setLevel(Level.WARN);
+    }
     }
 
     @Override
@@ -67,14 +81,19 @@ public class App extends Application {
     }
 
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         try {
             parseArgs(args);
         } catch (ParseException e) {
             logger.error("Could not parse command line arguments");
         }
 
-        launch(args);
+        if (!isRunningAsCache){
+            launch(args);
+        }
+        else{
+            new DiscoveryServer();
+        }
     }
 }
 

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

@@ -0,0 +1,117 @@
+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 java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.Random;
+
+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";
+    public static String DISCOVERY_SERVER = "party.sydney.srv.michaelrausch.nz";
+
+    private ServerTable serverTable;
+    public static final Integer PORT_NUMBER = 9969;
+
+    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();
+
+        ServerSocket serverSocket;
+
+        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");
+
+        while (true){
+            Socket clientSocket = serverSocket.accept();
+
+            parseRequest(clientSocket);
+
+            clientSocket.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 = serverTable.getServerByRoomCode(desiredRoomCode);
+                    Message response;
+
+                    if (serverListing != null){
+                        response = new ServerRegistrationMessage(serverListing.getServerName(), serverListing.getMapName(), serverListing.getAddress(), serverListing.getPortNumber(), 0, 0, desiredRoomCode);
+                    }
+                    else{
+                        response = new ServerRegistrationMessage("", "", "", 0, 0, 0, "");
+                    }
+
+                    clientSocket.getOutputStream().write(response.getBuffer());
+                    break;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,121 @@
+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 java.net.Socket;
+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);
+
+    public DiscoveryServerClient() {
+
+    }
+
+    /**
+     * Register the server with the discovery server
+     * @param serverListing The listing to register
+     */
+    public void register(ServerListing serverListing){
+        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(){
+        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();
+    }
+
+    /**
+     * 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;
+    }
+}
+

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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,113 @@
+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;
+    }
+}

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

@@ -0,0 +1,109 @@
+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

@@ -0,0 +1,97 @@
+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());
+        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,40 +1,23 @@
 package seng302.gameServer;
 
-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 javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.BoatAction;
-import seng302.gameServer.messages.BoatStatus;
-import seng302.gameServer.messages.ChatterMessage;
-import seng302.gameServer.messages.CustomizeRequestType;
-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;
-import seng302.model.PolarTable;
-import seng302.model.ServerYacht;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import seng302.gameServer.messages.*;
+import seng302.model.*;
 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.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.utilities.XMLParser;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.*;
 
 /**
  * A Static class to hold information about the current state of the game (model)
@@ -64,6 +47,7 @@ public class GameState implements Runnable {
     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;
+    private static final Integer VELOCITY_BOOST_MULTIPLIER = 2;
 
     private static Long previousUpdateTime;
     public static Double windDirection;
@@ -73,6 +57,7 @@ public class GameState implements Runnable {
     private static Boolean customizationFlag; // dirty flag to tell if a player has customized their boat.
     private static Boolean playerHasLeftFlag;
 
+    private static String hostIpAddress;
     private static List<Player> players;
     private static Map<Integer, ServerYacht> yachts;
     private static Boolean isRaceStarted;
@@ -91,13 +76,14 @@ public class GameState implements Runnable {
 
     private static Map<Player, String> playerStringMap = new HashMap<>();
 
-    public GameState() {
+    public GameState(String hostIpAddress) {
         windDirection = 180d;
         windSpeed = 10000d;
         yachts = new HashMap<>();
         tokensInPlay = new ArrayList<>();
-        marks = new HashSet<>();
+
         players = new ArrayList<>();
+        GameState.hostIpAddress = hostIpAddress;
         customizationFlag = false;
         playerHasLeftFlag = false;
         speedMultiplier = 1.0;
@@ -105,20 +91,34 @@ public class GameState implements Runnable {
         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();
+
         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);
         }
-        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
@@ -133,6 +133,10 @@ public class GameState implements Runnable {
         return new ArrayList<>(Arrays.asList(token1, token2, token3, token4));
     }
 
+    public static String getHostIpAddress() {
+        return hostIpAddress;
+    }
+
     public static Set<Mark> getMarks() {
         return Collections.unmodifiableSet(marks);
     }
@@ -240,6 +244,10 @@ public class GameState implements Runnable {
             if (currentStage == GameStages.PRE_RACE || currentStage == GameStages.RACING) {
                 update();
             }
+
+            if (currentStage == GameStages.RACING) {
+                update();
+            }
         }
     }
 
@@ -264,12 +272,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;
         }
     }
 
@@ -280,7 +282,12 @@ public class GameState implements Runnable {
     public static void spawnNewToken() {
         Random random = new Random();
         tokensInPlay.clear();
-        tokensInPlay.add(allTokens.get(random.nextInt(allTokens.size())));
+
+        //Get a random token location with random type
+        Token token = allTokens.get(random.nextInt(allTokens.size()));
+        token.assignRandomType();
+
+        tokensInPlay.add(token);
     }
 
     /**
@@ -381,6 +388,7 @@ public class GameState implements Runnable {
         //Yacht Collision
         ServerYacht collidedYacht = checkYachtCollision(serverYacht);
         Mark collidedMark = checkMarkCollision(serverYacht);
+        Token collidedToken = checkTokenPickUp(serverYacht);
 
         if (collidedYacht != null) {
             GeoPoint originalLocation = serverYacht.getLocation();
@@ -396,9 +404,7 @@ public class GameState implements Runnable {
             collidedYacht.setCurrentVelocity(
                 collidedYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
             );
-            notifyMessageListeners(
-                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION)
-            );
+            notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
         }
 
         //Mark Collision
@@ -410,9 +416,7 @@ public class GameState implements Runnable {
             serverYacht.setCurrentVelocity(
                 serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
             );
-            notifyMessageListeners(
-                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION)
-            );
+            notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
         }
 
         //Boundary Collision
@@ -425,23 +429,23 @@ public class GameState implements Runnable {
             serverYacht.setCurrentVelocity(
                 serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
             );
-            notifyMessageListeners(
-                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION)
-            );
+            notifyMessageListeners(MessageFactory.makeCollisionMessage(serverYacht));
         }
 
         //Token Collision
-        Token collidedToken = checkTokenPickUp(serverYacht);
         if (collidedToken != null) {
-            sendServerMessage(serverYacht.getSourceId(), serverYacht.getBoatName() + " has picked speed-up token");
+            if (collidedToken.getTokenType() == TokenType.RANDOM) {
+                collidedToken.realiseRandom();
+            }
+            sendServerMessage(serverYacht.getSourceId(),
+                serverYacht.getBoatName() + " has picked up a " + collidedToken.getTokenType()
+                    .getName() + " token");
             tokensInPlay.remove(collidedToken);
             serverYacht.powerUp(collidedToken.getTokenType());
             logger.debug("Yacht: " + serverYacht.getShortName() + " got powerup " + collidedToken
                 .getTokenType());
-            System.out.println("AGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
             notifyMessageListeners(MessageFactory.getRaceXML());
-            notifyMessageListeners(
-                new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.TOKEN));
+            notifyMessageListeners(MessageFactory.makePickupMessage(serverYacht, collidedToken));
         }
     }
 
@@ -449,11 +453,10 @@ 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) * speedMultiplier * yacht.getMaxSpeedMultiplier();
+        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;
+                maxBoatSpeed *= VELOCITY_BOOST_MULTIPLIER;
             }
         }
 
@@ -461,17 +464,17 @@ public class GameState implements Runnable {
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (currentVelocity < maxBoatSpeed - 500) {
-                yacht.changeVelocity((maxBoatSpeed / 100) * yacht.getAccelerationMultiplier());
+                yacht.changeVelocity(maxBoatSpeed / 100);
             } else if (currentVelocity > maxBoatSpeed + 500) {
-                yacht.changeVelocity((-currentVelocity / 200) * yacht.getAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 200);
             } else {
-                yacht.setCurrentVelocity((maxBoatSpeed) * yacht.getAccelerationMultiplier());
+                yacht.setCurrentVelocity(maxBoatSpeed);
             }
         } else {
             if (currentVelocity > 3000) {
-                yacht.changeVelocity((-currentVelocity / 200) * yacht.getAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 200);
             } else if (currentVelocity > 100) {
-                yacht.changeVelocity((-currentVelocity / 50) * yacht.getAccelerationMultiplier());
+                yacht.changeVelocity(-currentVelocity / 50);
             } else if (currentVelocity <= 100) {
                 yacht.setCurrentVelocity(0d);
             }
@@ -702,9 +705,6 @@ public class GameState implements Runnable {
             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));
         }
     }
 

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

@@ -1,23 +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 seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
 
 /**
  * A class describing the overall server, which creates and collects server threads for each client
@@ -38,13 +45,29 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     private Thread thread;
 
     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;
@@ -56,42 +79,33 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
         // Start advertising server
         try {
-            ServerAdvertiser.getInstance()
-                .setMapName(regattaXMLData.getCourseName())
-                .setCapacity(capacity)
-                .setNumberOfPlayers(numPlayers)
-                .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() {
-        MessageFactory.updateXMLGenerator(raceXMLData, regattaXMLData);
-        GameState.setRace(raceXMLData);
-        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
-        startAdvertisingServer();
-        PolarTable
-            .parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
-        GameState.addMessageEventListener(this::broadcastMessage);
-        startUpdatingWind();
-        startSpawningTokens();
-        System.out.println("SAAAANNNNNNNNNDDDDDDDDDDDDDDDDDDDDDDDDDDdd");
-        sendSetupMessages();
-    }
 
     public void run() {
 
@@ -104,7 +118,6 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 for (ServerToClientThread stc : serverToClientThreads) {
                     if (!stc.isSocketOpen()) {
                         GameState.getYachts().remove(stc.getSourceId());
-                        System.out.println("AAAAAAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");
                         sendSetupMessages();
                         try {
                             stc.getSocket().close();
@@ -120,9 +133,8 @@ 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()));
-                System.out.println("gfdgfdgfdg");
+            if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState
+                .getCustomizationFlag()) {
                 sendSetupMessages();
                 GameState.resetCustomizationFlag();
             }
@@ -242,34 +254,11 @@ 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 {
-            MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
-            for (ServerYacht serverYacht : GameState.getYachts().values()) {
-                System.out.println("Connecterino" + serverYacht);
-            }
-            serverToClientThread.addConnectionListener(() -> {
-                System.out.println("LUSTENER");
-                sendSetupMessages();
-            });
         }
         serverToClientThreads.add(serverToClientThread);
+        serverToClientThread.addConnectionListener(this::sendSetupMessages);
         serverToClientThread.addDisconnectListener(this::clientDisconnected);
+
         try {
             ServerAdvertiser.getInstance().setNumberOfPlayers(GameState.getNumberOfPlayers());
         } catch (IOException e) {
@@ -328,9 +317,9 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
         }, 0, 500);
 
 
-//        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
-//            sendSetupMessages();
-//        }
+        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+            sendSetupMessages();
+        }
     }
 
     public void terminate() {
@@ -341,166 +330,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);
+            }
+
+            yacht.setLocation(spawnMark);
+            boatIndex++;
         }
     }
 }

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

@@ -11,13 +11,14 @@ 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;
 
 /**
@@ -37,51 +38,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() {
@@ -142,14 +98,63 @@ 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);
+
+        return new XMLMessage(
+            xmlGenerator.getBoatsAsXml(),
+            XMLMessageSubType.BOAT,
+            xmlGenerator.getBoatsAsXml().length());
+    }
+
+    public static YachtEventCodeMessage makeCollisionMessage(ServerYacht serverYacht) {
+        return new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION);
+    }
+
+    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);
     }
 }

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

@@ -1,5 +1,8 @@
 package seng302.gameServer;
 
+import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.DiscoveryServerClient;
+
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceInfo;
 import java.io.IOException;
@@ -32,12 +35,15 @@ 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 ServerAdvertiser() throws IOException{
         jmdnsInstance = JmDNS.create(InetAddress.getByName(getLocalHostIp()));
 
+        repositoryClient = new DiscoveryServerClient();
+
         props = new Hashtable<>();
         props.put("map", "");
         props.put("spacesLeft", "0");
@@ -126,6 +132,9 @@ public class ServerAdvertiser {
                     }
                 }
             }, 0);
+
+        ServerListing serverListing = new ServerListing(serverName, props.get("map"), getLocalHostIp(), portNo, Integer.parseInt(props.get("capacity")));
+        repositoryClient.register(serverListing);
     }
 
     /**

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

@@ -7,6 +7,10 @@ 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;
@@ -15,6 +19,7 @@ public class ServerDescription {
         this.address = address;
         this.portNum = portNum;
         this.capacity = capacity;
+        lastUpdated = System.currentTimeMillis();
     }
 
 
@@ -80,4 +85,20 @@ 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;
+
+        System.out.println("SBR" + (System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL));
+        return System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL;
+    }
+
+    public void hasBeenRefreshed(){
+        System.out.println("Was refreshed");
+        lastRefreshed = System.currentTimeMillis();
+    }
 }

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

@@ -1,21 +1,23 @@
 package seng302.gameServer;
 
 
+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 javafx.beans.property.SimpleObjectProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 import seng302.gameServer.messages.BoatAction;
 import seng302.gameServer.messages.ChatterMessage;
 import seng302.gameServer.messages.ClientType;
@@ -23,16 +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.visualiser.fxObjects.assets_3D.BoatMeshType;
-import seng302.utilities.XMLParser;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -80,9 +80,6 @@ public class ServerToClientThread implements Runnable {
     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;
@@ -103,16 +100,37 @@ public class ServerToClientThread implements Runnable {
     }
 
     private void setUpPlayer(){
-        String fName = "Player" + GameState.getNumberOfPlayers().toString();
+        BufferedReader fn;
+        String fName = "";
+        BufferedReader ln;
         String lName = "";
-        ServerYacht yacht = new ServerYacht(
-            BoatMeshType.DINGHY, sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
+
+        fn = new BufferedReader(
+                new InputStreamReader(
+                        ServerToClientThread.class.getResourceAsStream(
+                                "/server_config/CSV_Database_of_First_Names.csv"
+                        )
+                )
         );
-        System.out.println(yacht);
+        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(
+                "Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
+        );
+
         player = new Player(socket, yacht);
         GameState.addYacht(sourceId, yacht);
         GameState.addPlayer(player);
-        System.out.println(GameState.getYachts().size());
     }
 
     private void completeRegistration(ClientType clientType) throws IOException {
@@ -136,9 +154,8 @@ public class ServerToClientThread implements Runnable {
         this.sourceId = sourceId;
         isRegistered = true;
         os.write(responseMessage.getBuffer());
-        System.out.println("MAKING A PLAYER");
+
         setUpPlayer();
-        System.out.println("DONE MAKING A PLAYER");
 
         for (ConnectionListener listener : connectionListeners) {
             listener.notifyConnection();
@@ -168,51 +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));
-                                break;
-                            case REGATTA_XML:
-                                regattaXMLProperty.set(
-                                    XMLParser.parseRegatta(
-                                        StreamParser.extractXmlMessage(packet)
-                                    )
-                                );
-                                break;
-
                         }
                     } else {
                         logger.warn("Packet has been dropped", 1);
@@ -229,9 +232,23 @@ 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);
+
+        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() {
@@ -327,12 +344,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/MessageType.java

@@ -21,7 +21,10 @@ public enum MessageType {
     REGISTRATION_REQUEST(101),
     REGISTRATION_RESPONSE(102),
     CUSTOMIZATION_REQUEST(103),
-    CUSTOMIZATION_RESPONSE(104);
+    CUSTOMIZATION_RESPONSE(104),
+    REPO_REGISTRATION_REQUEST(201),
+    ROOM_CODE_REQUEST(202),
+    LOBBY_REQUEST(203);
 
 
     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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,60 @@
+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);
+    }
+
+    @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

@@ -5,7 +5,11 @@ package seng302.gameServer.messages;
  */
 public enum YachtEventType {
     COLLISION(33),
-    TOKEN(34);
+    TOKEN_VELOCITY(34),
+    TOKEN_BUMPER(35),
+    TOKEN_HANDLING(36),
+    TOKEN_WIND_WALKER(37),
+    TOKEN_RANDOM(38);
 
     private int code;
 

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

@@ -6,17 +6,19 @@ 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.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.model.token.TokenType;
 import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 
 /**
@@ -37,19 +39,25 @@ public class ClientYacht extends Observable {
         void notifyRounding(ClientYacht yacht, int legNumber);
     }
 
+    @FunctionalInterface
+    public interface PowerUpListener {
+        void notifyPowerUp(ClientYacht yacht, TokenType tokenType);
+    }
+
     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;
@@ -59,20 +67,18 @@ 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 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;
@@ -82,7 +88,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);
@@ -97,7 +102,7 @@ public class ClientYacht extends Observable {
         super.addObserver(o);
     }
 
-    public BoatMeshType getBoatType() {
+    public String getBoatType() {
         return boatType;
     }
 
@@ -208,6 +213,17 @@ public class ClientYacht extends Observable {
         this.position = position;
     }
 
+    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;
     }
@@ -230,7 +246,6 @@ public class ClientYacht extends Observable {
 
     public void setHeading(Double heading) {
         this.heading = heading;
-        setHeadingProperty();
     }
 
     @Override
@@ -259,10 +274,10 @@ public class ClientYacht extends Observable {
         this.colour = colour;
     }
 
+
     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) {
@@ -270,10 +285,6 @@ public class ClientYacht extends Observable {
         }
     }
 
-    private void setHeadingProperty() {
-        headingProperty.set(heading);
-    }
-
     public void addLocationListener(YachtLocationListener listener) {
         locationListeners.add(listener);
     }
@@ -282,6 +293,10 @@ public class ClientYacht extends Observable {
         markRoundingListeners.add(listener);
     }
 
+    public void addPowerUpListener(PowerUpListener listener) {
+        powerUpListeners.add(listener);
+    }
+
     public void removeMarkRoundingListener(MarkRoundingListener listener) {
         markRoundingListeners.remove(listener);
     }
@@ -310,9 +325,4 @@ public class ClientYacht extends Observable {
     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/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 maxSpeedMultiplier = 1.0;
-    private Double turnStepMultiplier = 1.0;
-    private Double accelerationMultiplier = 1.0;
+    private String boatType;
     private Integer sourceId;
     private String hullID; //matches HullNum in the XML spec.
     private String shortName;
@@ -56,12 +56,10 @@ public class ServerYacht {
     private TokenType powerUp;
     private Long powerUpStartTime;
 
-    //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;
@@ -82,8 +80,6 @@ public class ServerYacht {
         this.hasEnteredRoundingZone = false;
         this.hasPassedLine = false;
         this.hasPassedThroughGate = false;
-
-        this.continuouslyTurning = false;
     }
 
 
@@ -133,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 * turnStepMultiplier);
+        Double newVal = heading + amount;
         lastHeading = heading;
         heading = (double) Math.floorMod(newVal.longValue(), 360L);
     }
@@ -156,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;
     }
 
     /**
@@ -178,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);
             }
         }
     }
@@ -192,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);
-                } else {
-                    adjustHeading(turnStep);
-                }
-            } else if (normalizedHeading == 180) {
-                if (lastHeading < 180) {
-                    adjustHeading(turnStep);
-                } else {
-                    adjustHeading(-turnStep);
-                }
-            } else if (normalizedHeading < 180) {
-                adjustHeading(-turnStep);
+        if (normalizedHeading == 0) {
+            if (lastHeading < 180) {
+                adjustHeading(-TURN_STEP);
             } else {
-                adjustHeading(turnStep);
+                adjustHeading(TURN_STEP);
             }
+        } else if (normalizedHeading == 180) {
+            if (lastHeading < 180) {
+                adjustHeading(TURN_STEP);
+            } else {
+                adjustHeading(-TURN_STEP);
+            }
+        } else if (normalizedHeading < 180) {
+            adjustHeading(-TURN_STEP);
+        } else {
+            adjustHeading(TURN_STEP);
         }
     }
 
     public void turnDownwind() {
         disableAutoPilot();
         Double normalizedHeading = normalizeHeading();
-        if (continuouslyTurning) {
-            adjustHeading(-turnStep);
-        } else {
-            if (normalizedHeading == 0) {
-                if (lastHeading < 180) {
-                    adjustHeading(turnStep);
-                } else {
-                    adjustHeading(-turnStep);
-                }
-            } else if (normalizedHeading == 180) {
-                if (lastHeading < 180) {
-                    adjustHeading(-turnStep);
-                } else {
-                    adjustHeading(turnStep);
-                }
-            } else if (normalizedHeading < 180) {
-                adjustHeading(turnStep);
+        if (normalizedHeading == 0) {
+            if (lastHeading < 180) {
+                adjustHeading(TURN_STEP);
             } else {
-                adjustHeading(-turnStep);
+                adjustHeading(-TURN_STEP);
             }
+        } else if (normalizedHeading == 180) {
+            if (lastHeading < 180) {
+                adjustHeading(-TURN_STEP);
+            } else {
+                adjustHeading(TURN_STEP);
+            }
+        } else if (normalizedHeading < 180) {
+            adjustHeading(TURN_STEP);
+        } else {
+            adjustHeading(-TURN_STEP);
         }
     }
 
@@ -266,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);
         }
@@ -281,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);
         }
     }
 
@@ -434,27 +421,4 @@ public class ServerYacht {
         return boatColor;
     }
 
-    public void setBoatType(BoatMeshType boatType) {
-        this.accelerationMultiplier = boatType.accelerationMultiplier;
-        this.maxSpeedMultiplier = boatType.maxSpeedMultiplier;
-        this.turnStepMultiplier = boatType.turnStep;
-        this.boatType = boatType;
-    }
-
-    public Double getMaxSpeedMultiplier() {
-        return maxSpeedMultiplier;
-    }
-
-    public Double getAccelerationMultiplier(){
-        return accelerationMultiplier;
-    }
-
-
-    public BoatMeshType getBoatType() {
-        return boatType;
-    }
-
-    public void setContinuouslyTurning(Boolean continuouslyTurning) {
-        this.continuouslyTurning = continuouslyTurning;
-    }
 }

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,12 +1,23 @@
 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.
@@ -14,17 +25,10 @@ import seng302.model.stream.xml.parser.RaceXMLData;
 public class MarkOrder {
     private List<CompoundMark> raceMarkOrder;
     private Logger logger = LoggerFactory.getLogger(MarkOrder.class);
+    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);
-        }
+    public MarkOrder(){
+        loadRaceProperties();
     }
 
     /**
@@ -36,6 +40,7 @@ public class MarkOrder {
             logger.warn("Race order accessed but not instantiated");
             return null;
         }
+
         return Collections.unmodifiableList(raceMarkOrder);
     }
 
@@ -69,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,7 +20,9 @@ public enum PacketType {
     RACE_REGISTRATION_REQUEST,
     RACE_REGISTRATION_RESPONSE,
     RACE_CUSTOMIZATION_REQUEST,
-    RACE_CUSTOMIZATION_RESPONSE;
+    RACE_CUSTOMIZATION_RESPONSE,
+
+    SERVER_REGISTRATION, ROOM_CODE_REQUEST, LOBBY_REQUEST;
 
     public static PacketType assignPacketType(int packetType, byte[] payload){
         switch(packetType){
@@ -65,6 +67,10 @@ 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,5 +1,9 @@
 package seng302.model.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
 import seng302.model.GeoPoint;
 
 /**
@@ -9,6 +13,7 @@ import seng302.model.GeoPoint;
 public class Token extends GeoPoint {
 
     private TokenType tokenType;
+    private Random random = new Random();
 
     public Token(TokenType tokenType, double lat, double lng) {
         super(lat, lng);
@@ -18,4 +23,22 @@ public class Token extends GeoPoint {
     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()));
+    }
+
+
 }

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

@@ -5,27 +5,32 @@ package seng302.model.token;
  * Created by wmu16 on 28/08/17.
  */
 public enum TokenType {
-    BOOST(0),
-    HANDLING(1);
+
+    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);
 
     private int value;
+    private String name;
+    private int timeout;
 
-    TokenType(int value) {
+    TokenType(int value, String name, int timeout) {
         this.value = value;
+        this.name = name;
+        this.timeout = timeout;
     }
 
     public int getValue() {
         return value;
     }
 
-    public static TokenType getToken(int value) {
-        switch (value) {
-            case 0:
-                return BOOST;
-            case 1:
-                return HANDLING;
-            default:
-                return BOOST;
-        }
+    public String getName() {
+        return name;
+    }
+
+    public int getTimeout() {
+        return timeout;
     }
 }

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;
 
@@ -157,17 +155,11 @@ public class Sounds {
 
     public static void playCrashSound() {
         if (!soundEffectsMuted) {
-            if (!crashInitialized) {
-                Media pickupSound = 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();
+            Media crashSound = new Media(
+                Sounds.class.getClassLoader().getResource("sounds/Large-metal-door-slam.mp3")
+                    .toString());
+            soundPlayer = new MediaPlayer(crashSound);
+            soundPlayer.play();
         }
     }
 
@@ -184,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

@@ -136,7 +136,7 @@ public class StreamParser {
         long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
         String xmlMessage = new String(
             (Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
-        System.out.println(xmlMessage);
+
         //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,43 +1,29 @@
 package seng302.utilities;
 
-import java.io.IOException;
 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.
      *
@@ -48,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;
         }
@@ -80,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;
         }
@@ -152,27 +138,17 @@ 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);
-                competingBoats.put(yacht.getSourceId(), yacht);
+                yacht.setColour(Color.web(getNodeAttributeString(currentBoat, "Color")));
+                if (yacht.getBoatType().equals("Yacht")) {
+                    competingBoats.put(yacht.getSourceId(), yacht);
+                }
             }
         }
         return competingBoats;
@@ -198,31 +174,6 @@ public class XMLParser {
         );
     }
 
-    public static Boolean tokensEnabled(Document doc) {
-        Element docEle = doc.getDocumentElement();
-        try {
-            Node tokenNode = docEle.getAttributeNode("Tokens");
-            return Boolean.valueOf(XMLParser.getNodeAttributeString(tokenNode, "Enabled"));
-        } catch (NullPointerException npe) {
-            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
      *
@@ -232,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),
@@ -245,20 +196,17 @@ 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);
-                if (tokenNode.getNodeName().equals("Token")) {
-                    String tokenType = getNodeAttributeString(tokenNode, "TokenType");
-                    Double lat = getNodeAttributeDouble(tokenNode, "TargetLat");
-                    Double lng = getNodeAttributeDouble(tokenNode, "TargetLng");
-                    tokens.add(new Token(TokenType.valueOf(tokenType), lat, lng));
-                }
+        NodeList tokenList = docEle.getElementsByTagName("Tokens").item(0).getChildNodes();
+        for (int i = 0; i < tokenList.getLength(); i++) {
+            Node tokenNode = tokenList.item(i);
+            if (tokenNode.getNodeName().equals("Token")) {
+                String tokenType = getNodeAttributeString(tokenNode, "TokenType");
+                Double lat = getNodeAttributeDouble(tokenNode, "TargetLat");
+                Double lng = getNodeAttributeDouble(tokenNode, "TargetLng");
+                tokens.add(new Token(TokenType.valueOf(tokenType), lat, lng));
             }
-        } catch (NullPointerException npe) {
-            return new ArrayList<>();
         }
+
         return tokens;
     }
 
@@ -271,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(
-                    XMLParser.getNodeAttributeInt(limitNode, "SeqID"),
-                    XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
-                    XMLParser.getNodeAttributeDouble(limitNode, "Lon")
-                ));
+                courseLimit.add(
+                    new Limit(
+                        XMLParser.getNodeAttributeInt(limitNode, "SeqID"),
+                        XMLParser.getNodeAttributeDouble(limitNode, "Lat"),
+                        XMLParser.getNodeAttributeDouble(limitNode, "Lon")
+                    )
+                );
             }
         }
         return courseLimit;
@@ -307,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++) {
@@ -329,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);
             }
@@ -354,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 location of the race def file
-     * @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(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

@@ -14,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;
@@ -26,14 +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;
 
 /**
  * A class describing a single connection to a Server for the purposes of sending and receiving on
@@ -51,7 +44,7 @@ public class ClientToServerThread implements Runnable {
 
     @FunctionalInterface
     public interface DisconnectedFromHostListener {
-        void notifyDisconnection(String message);
+        void notifYDisconnection (String message);
     }
 
     private class ByteReadException extends Exception {
@@ -75,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;
 
@@ -173,7 +166,7 @@ public class ClientToServerThread implements Runnable {
     private void notifyDisconnectListeners (String message) {
         if (socketOpen) {
             for (DisconnectedFromHostListener listener : disconnectionListeners) {
-                listener.notifyDisconnection(message);
+                listener.notifYDisconnection(message);
             }
         }
     }
@@ -182,7 +175,7 @@ public class ClientToServerThread implements Runnable {
      * 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());
@@ -198,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)){
@@ -249,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
                     );
@@ -262,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;
         }
     }
@@ -375,25 +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()
-        );
-    }
 }

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

@@ -14,6 +14,8 @@ import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXMLLoader;
+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;
@@ -26,8 +28,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;
@@ -37,6 +37,7 @@ 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;
@@ -44,7 +45,6 @@ import seng302.utilities.XMLParser;
 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
@@ -67,8 +67,6 @@ public class GameClient {
 
     private ArrayList<ClientYacht> finishedBoats = new ArrayList<>();
 
-    private GameKeyBind gameKeyBind; // all the key binding setting.
-
     private ObservableList<String> clientLobbyList = FXCollections.observableArrayList();
 
     /**
@@ -78,7 +76,6 @@ public class GameClient {
      */
     public GameClient(Pane holder) {
         this.holderPane = holder;
-        this.gameKeyBind = GameKeyBind.getInstance();
     }
 
     /**
@@ -121,11 +118,9 @@ public class GameClient {
      * @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();
 
@@ -134,7 +129,7 @@ public class GameClient {
         } catch (IOException e) {
             showConnectionError("Cannot connect to server as host");
         }
-        socketThread.sendXML(race, serverName, numLegs, maxPlayers, tokensEnabled);
+
         while (regattaData == null){
             try {
                 Thread.sleep(100);
@@ -170,12 +165,10 @@ public class GameClient {
 
     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();
         });
     }
 
@@ -214,7 +207,6 @@ public class GameClient {
                     break;
 
                 case RACE_XML:
-                    System.out.println("HEY I GOT A RACE MANG AND I AM CLIENT " + ((Boolean) (server==null)).toString());
                     RaceXMLData raceXMLData = XMLParser.parseRace(
                         StreamParser.extractXmlMessage(packet)
                     );
@@ -254,12 +246,7 @@ public class GameClient {
                     break;
 
                 case YACHT_EVENT_CODE:
-                    YachtEventData yachtEventData = StreamParser.extractYachtEventCode(packet);
-                    if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
-                        showCollisionAlert(StreamParser.extractYachtEventCode(packet));
-                    } else if (yachtEventData.getEventId() == YachtEventType.TOKEN.getCode()) {
-                        showPickUp();
-                    }
+                    processYachtEvent(StreamParser.extractYachtEventCode(packet));
                     break;
 
                 case CHATTER_TEXT:
@@ -382,16 +369,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
-            // if chat box is active take whatever is in there and send it to server
-            socketThread.sendBoatAction(BoatAction.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); break;
         }
     }
 
@@ -400,17 +387,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);
+                allBoatsMap.get(socketThread.getClientId()).toggleSail();
+                break;
+            case PAGE_UP:
+            case PAGE_DOWN:
+                socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break;
         }
     }
 
@@ -418,6 +403,34 @@ 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) {
+        if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
+            showCollisionAlert(yachtEventData);
+        } else {
+            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;
+            }
+
+            showTokenPickUp(tokenType);
+            allBoatsMap.get(yachtEventData.getSubjectId().intValue()).setPowerUp(tokenType);
+        }
+    }
+
     /**
      * Tells race view to show a collision animation.
      */
@@ -431,8 +444,18 @@ public class GameClient {
     }
 
     // TODO: 11/09/17 wmu16 - Add in functionality to viually indicate a pickup to a user
-    private void showPickUp() {
+    private void showTokenPickUp(TokenType tokenType) {
         Sounds.playTokenPickupSound();
+        switch (tokenType) {
+            case BOOST:
+                break;
+            case HANDLING:
+                break;
+            case WIND_WALKER:
+                break;
+            case BUMPER:
+                break;
+        }
     }
 
     private void formatAndSendChatMessage(String rawChat) {
@@ -467,14 +490,4 @@ public class GameClient {
     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,443 @@
 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.MarkArrowFactory;
+import seng302.visualiser.fxObjects.assets_2D.*;
+
+import java.util.*;
 
 /**
- * Common elements of game visualizing classes.
+ * 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

@@ -1,7 +1,7 @@
 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;
@@ -9,7 +9,6 @@ import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
 import javafx.geometry.Point2D;
 import javafx.geometry.Point3D;
-import javafx.scene.Camera;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.PerspectiveCamera;
@@ -22,14 +21,13 @@ import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 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.model.token.TokenType;
 import seng302.utilities.GeoUtility;
 import seng302.utilities.Sounds;
 import seng302.visualiser.cameras.ChaseCamera;
@@ -46,51 +44,79 @@ 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_DEPTH = -125;
     private final double DEFAULT_CAMERA_X = 0;
-    private final double DEFAULT_CAMERA_Y = 100;
+    private final double DEFAULT_CAMERA_Y = 155;
 
     private Group root3D;
     private SubScene view;
+    //    ParallelCamera camera;
+    private PerspectiveCamera camera;
+    private PerspectiveCamera camera2;
+    private PerspectiveCamera camera3;
+    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 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 List<Limit> borderPoints;
     private Map<Mark, Marker3D> markerObjects;
+
     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 List<CompoundMark> course = new ArrayList<>();
     private List<Node> mapTokens;
     private AnimationTimer playerBoatAnimationTimer;
     private Group trail = new Group();
     private Double windDir;
 
+    private enum ScaleDirection {
+        HORIZONTAL,
+        VERTICAL
+    }
+
     public GameView3D () {
-        isometricCam = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y);
-        topDownCam = new TopDownCamera();
-        chaseCam = new ChaseCamera();
+        camera = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y, DEFAULT_CAMERA_DEPTH);
+        camera.setFarClip(600);
+        camera.setNearClip(0.1);
+        camera.setFieldOfView(FOV);
 
-        canvasWidth = canvasHeight = 300;
+        camera2 = new TopDownCamera();
+        camera2.setFarClip(600);
+        camera2.setNearClip(0.1);
+        camera2.setFieldOfView(FOV);
 
-        for (PerspectiveCamera pc : Arrays.asList(isometricCam, topDownCam, chaseCam)) {
-            pc.setFarClip(600);
-            pc.setNearClip(0.1);
-            pc.setFieldOfView(FOV);
-        }
+        camera3 = new ChaseCamera();
+        camera3.setFarClip(600);
+        camera3.setNearClip(0.1);
+        camera3.setFieldOfView(FOV);
 
         gameObjects = new Group();
-        root3D = new Group(isometricCam, gameObjects);
+        root3D = new Group(camera, gameObjects);
         view = new SubScene(
             root3D, 1000, 1000, true, SceneAntialiasing.BALANCED
         );
-        view.setCamera(isometricCam);
+        view.setCamera(camera);
+        camera.getTransforms().add(new Rotate(30, new Point3D(1,0,0)));
 
         gameObjects.getChildren().addAll(
             ModelFactory.importModel(ModelType.OCEAN).getAssets(),
@@ -101,14 +127,10 @@ public class GameView3D extends GameView{
                 scene.addEventHandler(KeyEvent.KEY_PRESSED, this::cameraMovement);
             }
         });
-
-
     }
 
-    @Override
     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) {
@@ -159,13 +181,11 @@ public class GameView3D extends GameView{
 
         //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());
             marker.setLayoutX(p2d.getX());
             marker.setLayoutY(p2d.getY());
         }));
@@ -185,7 +205,7 @@ public class GameView3D extends GameView{
     private void makeAndBindMarker(Mark observableMark, ModelType markerType) {
         markerObjects.put(observableMark, new Marker3D(markerType));
         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());
         });
@@ -200,8 +220,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(
@@ -259,44 +279,202 @@ public class GameView3D extends GameView{
         }
     }
 
-    public void cameraMovement(KeyEvent event) {
-        GameKeyBind keyBinds = GameKeyBind.getInstance();
-        KeyAction keyPressed = keyBinds.getKeyAction(event.getCode());
-        switch (keyPressed) {
-            case ZOOM_IN:
-                ((RaceCamera) view.getCamera()).zoomIn();
-                break;
-            case ZOOM_OUT:
-                ((RaceCamera) view.getCamera()).zoomOut();
-                break;
-            case FORWARD:
-                ((RaceCamera) view.getCamera()).panUp();
-                break;
-            case BACKWARD:
-                ((RaceCamera) view.getCamera()).panDown();
-                break;
-            case LEFT:
-                ((RaceCamera) view.getCamera()).panLeft();
-                break;
-            case RIGHT:
-                ((RaceCamera) view.getCamera()).panRight();
-                break;
-            case VIEW:
-                toggleCamera();
-                break;
+    /**
+     * 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;
         }
     }
 
-    private void toggleCamera() {
-        Camera currCamera = view.getCamera();
+    /**
+     * 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 (currCamera.equals(isometricCam)) {
-            view.setCamera(topDownCam);
-        } else if (currCamera.equals(topDownCam)) {
-            view.setCamera(chaseCam);
+        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 {
-            view.setCamera(isometricCam);
+            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) {
+        switch (event.getCode()) {
+            case NUMPAD8:
+                view.getCamera().getTransforms().addAll(new Rotate(0.5, new Point3D(1, 0, 0)));
+                break;
+            case NUMPAD2:
+                view.getCamera().getTransforms().addAll(new Rotate(-0.5, new Point3D(1, 0, 0)));
+                break;
+            case NUMPAD4:
+                view.getCamera().getTransforms().addAll(new Rotate(-0.5, new Point3D(0, 1, 0)));
+                break;
+            case NUMPAD6:
+                view.getCamera().getTransforms().addAll(new Rotate(0.5, new Point3D(0, 1, 0)));
+                break;
+            case Z:
+                ((RaceCamera) view.getCamera()).zoomIn();
+                break;
+            case X:
+                ((RaceCamera) view.getCamera()).zoomOut();
+                break;
+            case W:
+                view.getCamera().getTransforms().addAll(new Translate(0, -1, 0));
+                break;
+            case S:
+                view.getCamera().getTransforms().addAll(new Translate(0, 1, 0));
+                break;
+            case A:
+                view.getCamera().getTransforms().addAll(new Translate(-1, 0, 0));
+                break;
+            case D:
+                view.getCamera().getTransforms().addAll(new Translate(1, 0, 0));
+                break;
+            case F1:
+                if (view.getCamera().equals(camera)) {
+                    view.setCamera(camera2);
+                    if (view.getCamera() instanceof TopDownCamera) {
+                        ((RaceCamera) view.getCamera()).zoomIn();
+                    }
+                } else if (view.getCamera().equals(camera2)) {
+                    view.setCamera(camera3);
+                } else {
+                    view.setCamera(camera);
+                }
+        }
+    }
+
+    /**
+     * 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();
     }
 
     /**
@@ -308,7 +486,7 @@ 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.setFill(colour);
             boatObjects.put(clientYacht, newBoat);
             wakesGroup.getChildren().add(newBoat.getWake());
@@ -316,14 +494,13 @@ public class GameView3D extends GameView{
             boatObjectGroup.getChildren().add(newBoat);
             clientYacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
                 BoatObject bo = boatObjects.get(boat);
-                Point2D p2d = scaledPoint.findScaledXY(lat, lon);
+                Point2D p2d = findScaledXY(lat, lon);
                 bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir);
             });
 
             if (clientYacht.getSourceId().equals(
                 ViewManager.getInstance().getGameClient().getServerThread().getClientId())) {
-                ((ChaseCamera) chaseCam).setPlayerBoat(newBoat);
-                ((TopDownCamera) topDownCam).setPlayerBoat(newBoat);
+                ((ChaseCamera) camera3).setPlayerBoat(newBoat);
             }
         }
         Platform.runLater(() -> {
@@ -345,20 +522,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());
@@ -384,7 +559,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(
@@ -412,8 +587,28 @@ 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());
-            Node tokenObject = ModelFactory.importModel(ModelType.VELOCITY_PICKUP).getAssets();
+            Point2D location = 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();
             tokenObject.setLayoutX(location.getX());
             tokenObject.setLayoutY(location.getY());
             mapTokens.add(tokenObject);
@@ -425,20 +620,21 @@ public class GameView3D extends GameView{
     }
 
     public void setBoatAsPlayer (ClientYacht playerYacht) {
-        playerYacht.toggleSail();
         playerBoatAnimationTimer = new AnimationTimer() {
 
-            Point2D lastLocation = scaledPoint.findScaledXY(playerYacht.getLocation());
+            double count = 60;
+            Point2D lastLocation = findScaledXY(playerYacht.getLocation());
 
             @Override
             public void handle(long now) {
-                Point2D location = scaledPoint.findScaledXY(playerYacht.getLocation());
-                if (Math.abs(lastLocation.distance(location)) > 2) {
+                if (--count == 0) {
+                    count = 60;
                     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 Rotate(playerYacht.getHeading(), new Point3D(0,0,1)),
+                        new Scale(1, lastLocation.distance(location) / 5, 1)
                     );
                     trail.getChildren().add(segment);
                     if (trail.getChildren().size() > 50) {

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

@@ -1,120 +0,0 @@
-package seng302.visualiser;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-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();
-
-    public static MapMaker getInstance() {
-        if (instance == null) {
-            instance = new MapMaker();
-        }
-        return instance;
-    }
-
-    private MapMaker() {
-        File dir = new File(MapMaker.class.getResource("/maps/").getPath());
-        File[] directoryListing = dir.listFiles();
-        if (directoryListing != null) {
-            for (File child : directoryListing) {
-                Pair<RegattaXMLTemplate, RaceXMLTemplate> regattaRace = XMLParser.parseRaceDef(
-                    child.getAbsolutePath(), "", 1, null, false
-                );
-                filePaths.add(child.getAbsolutePath());
-                RegattaXMLTemplate regattaTemplate = regattaRace.getKey();
-                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();
-    private 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/ServerListener.java

@@ -6,11 +6,10 @@ 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.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 import static seng302.gameServer.ServerAdvertiser.getLocalHostIp;
 
@@ -18,6 +17,7 @@ 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,8 +91,16 @@ 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 {
@@ -110,4 +118,25 @@ 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,7 +1,7 @@
 package seng302.visualiser.cameras;
 
-import java.util.Arrays;
-import javafx.beans.property.DoubleProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.geometry.Point3D;
 import javafx.scene.PerspectiveCamera;
@@ -13,118 +13,77 @@ 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());
+        this.playerBoat.layoutXProperty().addListener(new ChangeListener<Number>() {
+            @Override
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue,
+                Number newValue) {
+                updateCameraX((Double) oldValue, (Double) newValue);
+            }
+        });
+        this.playerBoat.layoutYProperty().addListener(new ChangeListener<Number>() {
+            @Override
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue,
+                Number newValue) {
+                updateCameraY((Double) oldValue, (Double) newValue);
+            }
+        });
+    }
+
+
+    private void updateCameraX(Double oldXValue, Double newXValue) {
+        if (transforms.size() == 0) { // boat is placed and then moved at start,
+            transforms.addAll(
+                new Translate(playerBoat.getLayoutX() - 30, playerBoat.getLayoutY() - 30, -125),
+                new Rotate(80, new Point3D(0, 0, 1))
+            );
+        } else {
+            transforms.addAll(new Translate(newXValue - oldXValue, 0, 0));
         }
     }
 
-    /**
-     * 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();
+    private void updateCameraY(Double oldYValue, Double newYValue) {
+        transforms.addAll(new Translate(0, (newYValue - oldYValue), 0));
     }
 
     @Override
     public void zoomIn() {
-        adjustZoomFactor(ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, 1.5));
     }
 
     @Override
     public void zoomOut() {
-        adjustZoomFactor(-ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, -1.5));
     }
 
+
+    /*
+    These have been left intentionally empty for now. it would be cool to be able to pan around the boat and have the camera move around the boat though.
+    */
+
     @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 +1,47 @@
 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;
+    ObservableList<Transform> transforms;
 
-    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) {
+    public IsometricCamera(Double cameraStartX, Double cameraStartY, Double cameraDepth) {
         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();
-        }
+        transforms.addAll(new Translate(cameraStartX, cameraStartY, cameraDepth));
     }
 
     @Override
     public void zoomIn() {
-        adjustZoomFactor(-2.5);
+        transforms.addAll(new Translate(0, 0, 1.5));
     }
 
     @Override
     public void zoomOut() {
-        adjustZoomFactor(2.5);
+        transforms.addAll(new Translate(0, 0, -1.5));
     }
 
     @Override
     public void panLeft() {
-        adjustHorizontalPan(-2.5);
+        transforms.addAll(new Translate(-1, 0, 0));
     }
 
     @Override
     public void panRight() {
-        adjustHorizontalPan(2.5);
+        transforms.addAll(new Translate(1, 0, 0));
     }
 
     @Override
     public void panUp() {
-        adjustVerticalPan(-2.5);
+        transforms.addAll(new Translate(0, -1, 0));
     }
 
     @Override
     public void panDown() {
-        adjustVerticalPan(2.5);
+        transforms.addAll(new Translate(0, 1, 0));
     }
 }

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

@@ -1,123 +1,48 @@
 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;
+    ObservableList<Transform> transforms;
 
     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();
-        }
+        transforms.add(new Translate(0, 0, -125));
     }
 
     @Override
     public void zoomIn() {
-        adjustZoomFactor(ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, 1.5));
     }
 
     @Override
     public void zoomOut() {
-        adjustZoomFactor(-ZOOM_STEP);
+        transforms.addAll(new Translate(0, 0, -1.5));
     }
 
     @Override
     public void panLeft() {
-        adjustHorizontalPan(-1.0);
+        transforms.addAll(new Translate(-1, 0, 0));
     }
 
     @Override
     public void panRight() {
-        adjustHorizontalPan(1.0);
+        transforms.addAll(new Translate(1, 0, 0));
     }
 
     @Override
     public void panUp() {
-        adjustVerticalPan(-1.0);
+        transforms.addAll(new Translate(0, -1, 0));
     }
 
     @Override
     public void panDown() {
-        adjustVerticalPan(1.0);
+        transforms.addAll(new Translate(0, 1, 0));
     }
-
 }

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

@@ -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

@@ -2,12 +2,6 @@ package seng302.visualiser.controllers;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
@@ -15,7 +9,7 @@ import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-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;
@@ -28,15 +22,17 @@ import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.utilities.Sounds;
-import seng302.visualiser.MapPreview;
+import seng302.visualiser.GameView;
 import seng302.visualiser.controllers.cells.PlayerCell;
 import seng302.visualiser.controllers.dialogs.BoatCustomizeController;
 
-public class LobbyController implements Initializable {
+import java.io.IOException;
+import java.net.URL;
+import java.util.*;
 
-    private final double INITIAL_MAP_HEIGHT = 770d;
-    private final double INITIAL_MAP_WIDTH = 574d;
+public class LobbyController implements Initializable {
 
     //--------FXML BEGIN--------//
     @FXML
@@ -52,15 +48,15 @@ public class LobbyController implements Initializable {
     @FXML
     private Label mapName;
     @FXML
-    private AnchorPane serverMap;
+    private Pane serverMap;
     //---------FXML END---------//
 
     private RaceState raceState;
     private JFXDialog customizationDialog;
     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) {
@@ -87,21 +83,25 @@ public class LobbyController implements Initializable {
             serverName.setText(ViewManager.getInstance().getProperty("serverName"));
             mapName.setText(ViewManager.getInstance().getProperty("mapName"));
 
+            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 -> {
-            customizationDialog = createCustomizeDialog();
-            Sounds.playButtonClick();
-            customizationDialog.show();
-        });
-
         Platform.runLater(() -> {
             Integer playerId = ViewManager.getInstance().getGameClient().getServerThread().getClientId();
 
             playersColor = Colors.getColor(playerId - 1);
+            customizationDialog = createCustomizeDialog();
+
+            customizeButton.setOnMouseReleased(event -> {
+                Sounds.playButtonClick();
+                customizationDialog.show();
+            });
         });
 
         leaveLobbyButton.setOnMouseEntered(e -> Sounds.playHoverSound());
@@ -131,35 +131,48 @@ public class LobbyController implements Initializable {
         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();
         });
     }
 
@@ -191,7 +204,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();
@@ -231,4 +244,8 @@ public class LobbyController implements Initializable {
     public void closeCustomizationDialog() {
         customizationDialog.close();
     }
+
+    public void setRoomCode(String roomCode) {
+        roomLabel.setText("Room#" + roomCode);
+    }
 }

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

@@ -12,16 +12,22 @@ 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.Group;
+import javafx.scene.Node;
 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;
@@ -43,10 +49,12 @@ import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import seng302.model.ClientYacht;
+import seng302.model.ClientYacht.PowerUpListener;
 import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.token.TokenType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameView3D;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
@@ -56,6 +64,8 @@ import seng302.visualiser.controllers.dialogs.FinishDialogController;
 import seng302.visualiser.fxObjects.ChatHistory;
 import seng302.visualiser.fxObjects.assets_2D.WindArrow;
 import seng302.visualiser.fxObjects.assets_3D.BoatObject;
+import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
+import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
 /**
  * Controller class that manages the display of a race
@@ -63,6 +73,8 @@ import seng302.visualiser.fxObjects.assets_3D.BoatObject;
 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 Pane basePane;
@@ -83,7 +95,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     @FXML
     private Label timerLabel;
     @FXML
-    private StackPane contentStackPane;
+    private StackPane contentAnchorPane;
 
     private GridPane contentGridPane;
     @FXML
@@ -106,6 +118,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Label windSpeedLabel;
     @FXML
     private Label positionLabel, boatSpeedLabel, boatHeadingLabel;
+    @FXML
+    private ImageView velocityIcon, handlingIcon, windWalkerIcon, bumperIcon;
 
     //Race Data
     private Map<Integer, ClientYacht> participants;
@@ -130,6 +144,34 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         Sounds.stopMusic();
         Sounds.playRaceMusic();
 
+        finishScreenDialog = createFinishDialog();
+
+        // 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));
@@ -143,46 +185,54 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         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) -> {
-            if (newValue) {
-                chatHistory.increaseOpacity();
-            } else {
-                chatHistory.decreaseOpacity();
+        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();
+                }
             }
         });
     }
 
     public void showFinishDialog(ArrayList<ClientYacht> finishedBoats) {
         raceState.setRaceStarted(false);
-        createFinishDialog(finishedBoats);
+        finishDialogController.setFinishedBoats(finishedBoats);
+        finishScreenDialog.show();
     }
 
-    /**
-     * Create finishScreenDialog and set up finishDialogController.
-     */
-    private void createFinishDialog(ArrayList<ClientYacht> finishedBoats) {
+    private JFXDialog createFinishDialog() {
         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();
-            }
-        });
+        JFXDialog finishScreenDialog = null;
+
+        try {
+            finishScreenDialog = new JFXDialog(contentAnchorPane, dialog.load(),
+                JFXDialog.DialogTransition.CENTER);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        finishDialogController = dialog.getController();
+
+        return finishScreenDialog;
     }
 
+
     public void loadRace (
         Map<Integer, ClientYacht> participants, RaceXMLData raceData, RaceState raceState,
         ClientYacht player) {
@@ -197,14 +247,18 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             while (c.next()) {
                 if (c.wasPermutated()) {
                     updateOrder(raceState.getPlayerPositions());
+                    updateSparkLine();
                 }
             }
         });
 
+        player.addPowerUpListener(this::displayPowerUpIcon);
+
         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()
@@ -216,10 +270,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         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()));
@@ -232,9 +287,67 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             updateWindSpeed(raceState.getWindSpeed());
         });
         gameView.setWindDir(raceState.windDirectionProperty().doubleValue());
-        Platform.runLater(this::initializeUpdateTimer);
+        Platform.runLater(() -> {
+            initializeUpdateTimer();
+        });
     }
 
+    /**
+     * Displays the relevant icon, starts blinking it when it is close to turning off and then
+     * switches it off after the tokens time out
+     *
+     * @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
+     */
+    private void displayPowerUpIcon(ClientYacht yacht, TokenType tokenType) {
+        if (yacht == player) {
+            final ImageView iconToDisplay;
+
+            switch (tokenType) {
+                case BOOST:
+                    iconToDisplay = velocityIcon;
+                    break;
+                case HANDLING:
+                    iconToDisplay = handlingIcon;
+                    break;
+                case WIND_WALKER:
+                    iconToDisplay = windWalkerIcon;
+                    break;
+                case BUMPER:
+                    iconToDisplay = bumperIcon;
+                    break;
+                default:
+                    iconToDisplay = velocityIcon;
+            }
+
+            //Turn icon on
+            iconToDisplay.setVisible(true);
+
+            //Start blinking icon towards end
+            Timer blinkingTimer = new 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);
+
+            //Turn icon off after the time out
+            Timer switchOffTimer = new Timer();
+            switchOffTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    blinkingTimer.cancel();
+                    iconToDisplay.setVisible(false);
+                }
+            }, tokenType.getTimeout());
+        }
+    }
+
+
     /**
      * The important annotations have been changed, update this view
      *
@@ -273,6 +386,137 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         }
     }
 
+    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.
@@ -630,7 +874,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     public String readChatInput() {
         String chat = chatInput.getText();
         chatInput.clear();
-        contentStackPane.requestFocus();
+        rvAnchorPane.requestFocus();
         return chat;
     }
 

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

@@ -15,6 +15,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.geometry.Pos;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.KeyCode;
@@ -22,7 +23,10 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import seng302.discoveryServer.DiscoveryServer;
 import seng302.gameServer.ServerDescription;
+import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.DiscoveryServerClient;
 import seng302.utilities.Sounds;
 import seng302.visualiser.ServerListener;
 import seng302.visualiser.ServerListenerDelegate;
@@ -51,6 +55,10 @@ public class ServerListController implements Initializable, ServerListenerDelega
     private JFXTextField serverHostName;
     @FXML
     private JFXTextField serverPortNumber;
+    @FXML
+    private JFXButton roomConnectButton;
+    @FXML
+    private JFXTextField roomNumber;
     //---------FXML END---------//
 
     private Label noServersFound;
@@ -64,6 +72,17 @@ public class ServerListController implements Initializable, ServerListenerDelega
         // Set Event Bindings
         connectButton.setOnMouseEntered(event -> Sounds.playHoverSound());
         serverListHostButton.setOnMouseEntered(event -> Sounds.playHoverSound());
+
+        roomConnectButton.setOnMouseReleased(event -> {
+            connectToRoomCode(roomNumber.getText());
+            Sounds.playButtonClick();
+        });
+        roomNumber.setOnKeyPressed(event -> {
+            if (event.getCode().equals(KeyCode.ENTER)) {
+                connectToRoomCode(roomNumber.getText());
+            }
+        });
+
         connectButton.setOnMouseReleased(event -> {
             attemptToDirectConnect();
             Sounds.playButtonClick();
@@ -112,25 +131,17 @@ public class ServerListController implements Initializable, ServerListenerDelega
         serverListVBox.getChildren().add(noServersFound);
 
         // Set up dialog for server creation
-        serverListHostButton.setOnAction(action -> {
-            showServerCreationDialog();
-        });
-    }
-
-    /**
-     * 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 {
                 JFXDialog dialog = new JFXDialog(serverListMainStackPane, dialogContent.load(),
                     DialogTransition.CENTER);
-                dialog.show();
-                Sounds.playButtonClick();
+                serverListHostButton.setOnAction(action -> {
+                    dialog.show();
+                    Sounds.playButtonClick();
+                });
             } catch (IOException e) {
-                e.printStackTrace();
                 logger.warn("Could not create Server Creation Dialog.");
             }
         });
@@ -158,6 +169,24 @@ public class ServerListController implements Initializable, ServerListenerDelega
         return hostNameValid && portNumberValid;
     }
 
+    private void connectToRoomCode(String roomCode){
+        try {
+            ServerListing serverListing = new DiscoveryServerClient().getServerForRoomCode(roomCode);
+            ViewManager.getInstance().getGameClient().runAsClient(serverListing.getAddress(), serverListing.getPortNumber());
+        }
+        catch (java.net.ConnectException e){
+            //TODO Add proper dialog
+            logger.warn("Couldn't connect to discovery server");
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setHeaderText("Couldn't connect to discovery server");
+            alert.setContentText("Couldn't connect to " + DiscoveryServer.DISCOVERY_SERVER);
+            alert.showAndWait();
+        }
+        catch (Exception e) {
+            logger.warn("Error discovering room code");
+        }
+    }
+
     /**
      * Connects the user to a lobby via the Direct Connect form.
      */

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

@@ -2,9 +2,6 @@ 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;
@@ -18,7 +15,6 @@ 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 org.slf4j.Logger;
@@ -27,8 +23,6 @@ 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;
 
 public class ViewManager {
 
@@ -38,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<>();
@@ -102,8 +99,6 @@ public class ViewManager {
             gameClient.stopGame();
             System.exit(0);
         });
-
-        jfxSnackbar = new JFXSnackbar(decorator);
     }
 
     /**
@@ -124,31 +119,12 @@ public class ViewManager {
         //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);
@@ -158,13 +134,9 @@ public class ViewManager {
         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",
-            Color.WHITE);
         volumeOn.setSize(16, 16);
         volumeOff.setSize(16, 16);
         spacer.setSize(40, 16);
-        keyBindingGlyph.setSize(24, 16);
 
         // Determine which graphic should go on the button
         if (Sounds.isMusicMuted() && Sounds.isSoundEffectsMuted()) {
@@ -173,12 +145,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)) {
@@ -190,84 +159,6 @@ public class ViewManager {
 
     }
 
-    /**
-     * 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.
-     */
-    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());
-            }
-        }
-        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);
-    }
-
     /**
      * Determines if a PC has compatibility with the bonjour protocol for server detection.
      */
@@ -330,7 +221,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.
      */
@@ -343,8 +233,9 @@ public class ViewManager {
             logger.error("Could not load lobby view");
         }
 
+        LobbyController lobbyController = loader.getController();
+
         if (disableReadyButton) {
-            LobbyController lobbyController = loader.getController();
             lobbyController.disableReadyButton();
         }
 
@@ -353,10 +244,8 @@ 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
@@ -378,10 +267,17 @@ public class ViewManager {
                 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();
@@ -390,7 +286,7 @@ public class ViewManager {
             }
         });
 
-        while (loader.getController() == null) {
+        while (loader.getController() == null){
             try {
                 Thread.sleep(50);
             } catch (InterruptedException e) {
@@ -400,9 +296,4 @@ public class ViewManager {
 
         return loader.getController();
     }
-
-    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/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,23 @@ 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) {
 
         socketThread = ViewManager.getInstance().getGameClient().getServerThread();
-        findMaxStats();
+
         RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator();
         playerNameReqValidator.setMessage("Player name required.");
 
@@ -70,8 +48,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();
@@ -102,10 +78,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 +93,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/KeyBindingDialogController.java

@@ -1,194 +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 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();
-        });
-
-        closeLabel.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,19 +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.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.ViewManager;
 import seng302.visualiser.validators.FieldLengthValidator;
 import seng302.visualiser.validators.ValidationTools;
@@ -29,40 +28,13 @@ public class ServerCreationController implements Initializable {
     private Label maxPlayersLabel;
     @FXML
     private JFXButton submitBtn;
-    @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 MapMaker mapMaker = MapMaker.getInstance();
-
     //---------FXML END---------//
 
     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.");
@@ -77,18 +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());
     }
 
     /**
@@ -109,7 +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());
+                .getValue());
 
         ViewManager.getInstance().setProperty("serverName", serverDescription.getName());
         ViewManager.getInstance().setProperty("mapName", serverDescription.getMapName());
@@ -120,35 +80,11 @@ public class ServerCreationController implements Initializable {
      */
     private void updateMaxPlayerLabel() {
         maxPlayersSlider.setValue(Math.floor(maxPlayersSlider.getValue()));
-        maxPlayersLabel.setText(String.format("Max players: %.0f", 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());
-    }
 }

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

@@ -2,59 +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, Y offset of mast CoR from origin, sail file, Y 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);
+    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};
 
-    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,16 +34,14 @@ 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))
-            );
-            sail.getTransforms().setAll(
-                new Rotate(degrees, 0, -meshType.sailOffset,0, new Point3D(0, 0, 1))
-            );
-        }
+        MeshView mast = getMeshViewChild(MAST_INDEX);
+        MeshView sail = getMeshViewChild(SAIL_INDEX);
+        mast.getTransforms().setAll(
+                new Rotate(degrees, -meshType.mastOffset, 0,0, new Point3D(0, 0, 1))
+        );
+        sail.getTransforms().setAll(
+                new Rotate(degrees, -meshType.sailOffset, 0,0, new Point3D(0, 0, 1))
+        );
     }
 
     public void hideSail() {
@@ -71,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

@@ -3,7 +3,6 @@ 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.Point3D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
@@ -12,7 +11,7 @@ import javafx.scene.transform.Rotate;
 /**
  * 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
+ * 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.
@@ -29,18 +28,15 @@ public class BoatObject extends Group {
     private Group wake;
     private Color colour = Color.BLACK;
     private Boolean isSelected = false;
-    private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
-
-    private ReadOnlyDoubleWrapper rotationProperty;
+    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(BoatMeshType boatMeshType) {
-        rotationProperty = new ReadOnlyDoubleWrapper(0.0);
-        boatAssets = ModelFactory.boatGameView(boatMeshType, colour);
+    public BoatObject() {
+        boatAssets = ModelFactory.boatGameView(BoatMeshType.DINGHY, colour);
         boatAssets.hideSail();
         boatAssets.getAssets().getTransforms().addAll(
             rotation
@@ -70,6 +66,8 @@ public class BoatObject extends Group {
      * @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);
             this.layoutXProperty().setValue(x);
@@ -87,7 +85,6 @@ public class BoatObject extends Group {
 
 
     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) {
@@ -135,8 +132,4 @@ public class BoatObject extends Group {
     public void addSelectedBoatListener(SelectedBoatListener sbl) {
         selectedBoatListenerListeners.add(sbl);
     }
-
-    public ReadOnlyDoubleWrapper getRotationProperty() {
-        return rotationProperty;
-    }
 }

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

@@ -7,7 +7,6 @@ import javafx.geometry.Point3D;
 import javafx.scene.AmbientLight;
 import javafx.scene.CacheHint;
 import javafx.scene.Group;
-import javafx.scene.PointLight;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Circle;
@@ -19,7 +18,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 {
 
@@ -52,35 +51,6 @@ public class ModelFactory {
         return bo;
     }
 
-    public static BoatModel boatCustomiseView(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
-        );
-
-        boatAssets.getTransforms().add(animationRotate);
-        BoatModel bo = new BoatModel(boatAssets, null, boatType);
-        bo.rotateSail(45);
-
-        bo.setAnimation(new AnimationTimer() {
-            double boatAngle = 0;
-            Rotate rotate = animationRotate;
-            @Override
-            public void handle(long now) {
-                boatAngle += 0.5;
-                rotate.setAngle(boatAngle);
-            }
-        });
-        boatAssets.getChildren().addAll(
-            new AmbientLight()
-        );
-        return bo;
-    }
-
     public static BoatModel boatRotatingView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().addAll(
@@ -114,29 +84,20 @@ public class ModelFactory {
     }
 
     private static Group getUnmodifiedBoatModel(BoatMeshType boatType, Color primaryColour) {
-
         Group boatAssets = new Group();
-        MeshView hull = importSTL(boatType.hullFile);
+        MeshView hull = importFile(boatType.hullFile);
         hull.setMaterial(new PhongMaterial(primaryColour));
-        MeshView mast = importSTL(boatType.mastFile);
+        MeshView mast = importFile(boatType.mastFile);
         mast.setMaterial(new PhongMaterial(primaryColour));
-        MeshView sail = importSTL(boatType.sailFile);
+        MeshView sail = importFile(boatType.sailFile);
         sail.setMaterial(new PhongMaterial(Color.WHITE));
-
-        if (boatType.jibFile != null) {
-            MeshView jib = importSTL(boatType.jibFile);
-            sail.setMaterial(new PhongMaterial(Color.WHITE));
-            boatAssets.getChildren().addAll(hull, mast, sail, jib);
-        } else {
-            boatAssets.getChildren().addAll(hull, mast, sail);
-        }
-
+        boatAssets.getChildren().addAll(hull, mast, sail);
         return boatAssets;
     }
 
-    private static MeshView importSTL(String fileName) {
+    private static MeshView importFile(String fileName) {
         StlMeshImporter importer = new StlMeshImporter();
-        importer.read(ModelFactory.class.getResource("/meshes/boatSTLs/" + fileName));
+        importer.read(ModelFactory.class.getResource("/meshes/" + fileName));
         MeshView importedFile = new MeshView(importer.getImport());
         importedFile.setCache(true);
         importedFile.setCacheHint(CacheHint.SCALE_AND_ROTATE);
@@ -156,7 +117,11 @@ public class ModelFactory {
         }
         switch (tokenType) {
             case VELOCITY_PICKUP:
-                return makeCoinPickup(assets);
+            case BUMPER_PICKUP:
+            case RANDOM_PICKUP:
+            case HANDLING_PICKUP:
+            case WIND_WALKER_PICKUP:
+                return makeTokenPickup(assets);
             case FINISH_MARKER:
             case PLAIN_MARKER:
             case START_MARKER:
@@ -185,24 +150,22 @@ public class ModelFactory {
         }
     }
 
-    private static Model makeCoinPickup(Group assets){
-        assets.setRotationAxis(new Point3D(1,0,0));
-        assets.setRotate(90);
-        assets.setTranslateX(0.2);
-        assets.setTranslateY(1);
+    private static Model makeTokenPickup(Group assets) {
+        Rotate animationRotate = new Rotate(0, new Point3D(0, 0, 1));
         assets.getTransforms().addAll(
-            new Translate(0,-1,0),
-            new Rotate(0 ,new Point3D(1,1,1))
+            animationRotate,
+            new Translate(0, 0, -1)
         );
+
         return new Model(new Group(assets), new AnimationTimer() {
 
             private double rotation = 0;
-            private Group group = assets;
+            private Rotate rotate = animationRotate;
 
             @Override
             public void handle(long now) {
                 rotation += 1;
-                ((Rotate) group.getTransforms().get(1)).setAngle(rotation);
+                rotate.setAngle(rotation);
             }
         });
     }

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

@@ -7,6 +7,10 @@ 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"),

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/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 {
@@ -109,16 +99,4 @@
 
 .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

@@ -48,7 +48,6 @@ GridPane .timer * {
     -fx-text-fill: -fx-pp-theme-color;
     -fx-font-size: 13px;
     -fx-pref-height: 35px;
-    -fx-focus-traversable: false;
 }
 
 #chatSend:hover {

src/main/resources/css/ServerListView.css

@@ -38,30 +38,30 @@
     -fx-font-size: 23px;
 }
 
-#connectButton {
+#connectButton, #roomConnectButton {
     -fx-background-color: -fx-pp-light-text-color; /* inverted */
     -fx-text-fill: -fx-pp-theme-color; /* inverted */
     -fx-font-size: 20px;
-    -fx-pref-height: 65px;
+    -fx-pref-height: 45px;
 }
 
-#connectButton:hover {
+#connectButton:hover, #roomConnectButton:hover {
     -fx-font-size: 23px;
 }
 
-#connectLabel, #serverPortNumber, #serverHostName {
+#connectLabel, #connectLabel1, #serverPortNumber, #roomNumber, #serverHostName {
     -fx-text-fill: -fx-pp-light-text-color;
     -fx-font-size: 18px;
 }
 
-#serverHostName, #serverPortNumber {
+#serverHostName, #serverPortNumber, #roomNumber {
     -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 {
+#serverHostName .error-label, #serverPortNumber .error-label, #roomNumber .error-label {
     -fx-font-size: 12px;
     -fx-text-fill: lightblue;
 }

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/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 {
-    -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 {
-    -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;
-}

src/main/resources/css/dialogs/Popup.css

@@ -1,33 +0,0 @@
-#headerLabel {
-    -fx-font-size: 20px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel {
-    -fx-font-size: 22px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#closeLabel:hover {
-    -fx-font-size: 24px;
-    -fx-text-fill: red;
-}
-
-#contentLabel {
-    -fx-font-size: 22px;
-    -fx-text-fill: -fx-pp-dark-text-color;
-}
-
-#optionButton {
-    -fx-background-color: -fx-pp-theme-color;
-    -fx-text-fill: -fx-pp-light-text-color;
-    -fx-font-size: 18px;
-    -fx-effect: -fx-pp-dropshadow-light;
-    -fx-max-height: 55;
-    -fx-focus-traversable: false;
-}
-
-#optionButton:hover {
-    -fx-font-size: 20px !important;
-    -fx-background-color: -fx-pp-light-theme-color;
-}

src/main/resources/css/dialogs/Snackbar.css

@@ -1,4 +0,0 @@
-/* a separate file to dynamically change snackbar's color */
-.jfx-snackbar-toast {
-    -fx-text-fill: red !important;
-}

src/main/resources/maps/default.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RaceDefinition>
-
-  <CourseName> El Classico </CourseName>
-
-  <CentralLat> 57.6679590 </CentralLat>
-  <CentralLng> 11.8503233 </CentralLng>
-
-  <MaxPlayers> 10 </MaxPlayers>
-
-  <Marks>
-    <CompoundMark CompoundMarkID="1">
-      <Mark Lat="57.670603" Lng="11.828262"/>
-      <Mark Lat="57.669445" Lng="11.826413"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="2">
-      <Mark Lat="57.6675700" Lng="11.8359880"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="3">
-      <Mark Lat="57.6708220" Lng="11.8433900"/>
-      <Mark Lat="57.671629" Lng="11.840951"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="4">
-      <Mark Lat="57.664190" Lng="11.829576"/>
-      <Mark Lat="57.665316" Lng="11.827184"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="5">
-      <Mark Lat="57.672350" Lng="11.842535"/>
-      <Mark Lat="57.6715240" Lng="11.8444950"/>
-    </CompoundMark>
-  </Marks>
-
-  <Course>
-    <OpeningSegment>
-      <Corner CompoundMarkID="1" Rounding="PS"/>
-      <Corner CompoundMarkID="2" Rounding="P"/>
-    </OpeningSegment>
-
-    <RepeatingSegment>
-      <Corner CompoundMarkID="3" Rounding="SP"/>
-      <Corner CompoundMarkID="4" Rounding="PS"/>
-    </RepeatingSegment>
-
-    <ClosingSegment>
-      <Corner CompoundMarkID="5" Rounding="PS"/>
-    </ClosingSegment>
-  </Course>
-
-  <CourseLimit>
-    <Limit Lat="57.6739450" Lng="11.8417100" />
-    <Limit Lat="57.6709520" Lng="11.8485010" />
-    <Limit Lat="57.6690260" Lng="11.8472790" />
-    <Limit Lat="57.6693140" Lng="11.8457610" />
-    <Limit Lat="57.6665370" Lng="11.8432910" />
-    <Limit Lat="57.6641400" Lng="11.8385840" />
-    <Limit Lat="57.6629430" Lng="11.8332030" />
-    <Limit Lat="57.6629480" Lng="11.8249660" />
-    <Limit Lat="57.6686890" Lng="11.8250920" />
-    <Limit Lat="57.6692230" Lng="11.8231430" />
-    <Limit Lat="57.6725370" Lng="11.8272480" />
-    <Limit Lat="57.6708220" Lng="11.8321340" />
-  </CourseLimit>
-
-</RaceDefinition>

src/main/resources/maps/horseshoe.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RaceDefinition>
-
-  <CourseName> HorseShoe </CourseName>
-
-  <CentralLat> -14.6457 </CentralLat>
-  <CentralLng> 47.612855 </CentralLng>
-
-  <MaxPlayers> 5 </MaxPlayers>
-
-  <Marks>
-    <CompoundMark CompoundMarkID="1">
-      <Mark Lat="-14.071412" Lng="47.05756"/>
-      <Mark Lat="-14.069914" Lng="47.058541"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="2">
-      <Mark Lat="-14.067194" Lng="47.053818" />
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="3">
-      <Mark Lat="-14.061248" Lng="47.058556" />
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="4">
-      <Mark Lat="-14.060584" Lng="47.063088"/>
-      <Mark Lat="-14.060617" Lng="47.06374" />
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="5">
-      <Mark Lat="-14.064637" Lng="47.060307"/>
-      <Mark Lat="-14.06477" Lng="47.061165"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="6">
-      <Mark Lat="-14.063839" Lng="47.06762"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="7">
-      <Mark Lat="-14.068954" Lng="47.066349"/>
-    </CompoundMark>
-    <CompoundMark CompoundMarkID="8">
-      <Mark Lat="-14.07025" Lng="47.060238"/>
-      <Mark Lat="-14.071047" Lng="47.060307"/>
-    </CompoundMark>
-  </Marks>
-
-  <Course>
-
-    <OpeningSegment>
-      <Corner CompoundMarkID="1" Rounding="PS"/>
-      <Corner CompoundMarkID="2" Rounding="S"/>
-      <Corner CompoundMarkID="3" Rounding="S"/>
-      <Corner CompoundMarkID="4" Rounding="SP"/>
-    </OpeningSegment>
-
-    <RepeatingSegment>
-      <Corner CompoundMarkID="5" Rounding="SP"/>
-      <Corner CompoundMarkID="4" Rounding="PS"/>
-    </RepeatingSegment>
-
-    <ClosingSegment>
-      <Corner CompoundMarkID="6" Rounding="S"/>
-      <Corner CompoundMarkID="7" Rounding="S"/>
-      <Corner CompoundMarkID="8" Rounding="SP" />
-    </ClosingSegment>
-
-  </Course>
-
-  <CourseLimit>
-    <Limit Lat="-14.073371" Lng="47.058213" />
-    <Limit Lat="-14.06453" Lng="47.050003" />
-    <Limit Lat="-14.059022" Lng="47.057286" />
-    <Limit Lat="-14.058723" Lng="47.064358" />
-    <Limit Lat="-14.06261" Lng="47.071293" />
-    <Limit Lat="-14.070814" Lng="47.06762" />
-    <Limit Lat="-14.072773" Lng="47.059689" />
-    <Limit Lat="-14.068323" Lng="47.059449" />
-    <Limit Lat="-14.064969" Lng="47.065113" />
-    <Limit Lat="-14.066131" Lng="47.05986" />
-    <Limit Lat="-14.063441" Lng="47.058419" />
-    <Limit Lat="-14.068091" Lng="47.059174" />
-  </CourseLimit>
-
-</RaceDefinition>

src/main/resources/meshes/bumper_pickup.dae

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool>
+    </contributor>
+    <created>2017-09-19T15:47:50</created>
+    <modified>2017-09-19T15:47:50</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0 0 0 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_002_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.64 6.87021e-4 0 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001_001-material" name="Material_001_001">
+      <instance_effect url="#Material_001_001-effect"/>
+    </material>
+    <material id="Material_002_001-material" name="Material_002_001">
+      <instance_effect url="#Material_002_001-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Icosphere_001-mesh" name="Icosphere.001">
+      <mesh>
+        <source id="Icosphere_001-mesh-positions">
+          <float_array id="Icosphere_001-mesh-positions-array" count="126">0 0 -1 0.7236073 -0.5257253 -0.4472195 -0.276388 -0.8506492 -0.4472199 -0.8944262 0 -0.4472156 -0.276388 0.8506492 -0.4472199 0.7236073 0.5257253 -0.4472195 0.276388 -0.8506492 0.4472199 -0.7236073 -0.5257253 0.4472195 -0.7236073 0.5257253 0.4472195 0.276388 0.8506492 0.4472199 0.8944262 0 0.4472156 0 0 1 -0.1624554 -0.4999952 -0.8506544 0.4253227 -0.3090114 -0.8506542 0.2628688 -0.8090116 -0.5257377 0.8506479 0 -0.5257359 0.4253227 0.3090114 -0.8506542 -0.5257298 0 -0.8506517 -0.6881894 -0.4999969 -0.5257362 -0.1624554 0.4999952 -0.8506544 -0.6881894 0.4999969 -0.5257362 0.2628688 0.8090116 -0.5257377 0.9510579 -0.3090126 0 0.9510579 0.3090126 0 0 -1 0 0.5877856 -0.8090167 0 -0.9510579 -0.3090126 0 -0.5877856 -0.8090167 0 -0.5877856 0.8090167 0 -0.9510579 0.3090126 0 0.5877856 0.8090167 0 0 1 0 0.6881894 -0.4999969 0.5257362 -0.2628688 -0.8090116 0.5257377 -0.8506479 0 0.5257359 -0.2628688 0.8090116 0.5257377 0.6881894 0.4999969 0.5257362 0.1624554 -0.4999952 0.8506544 0.5257298 0 0.8506517 -0.4253227 -0.3090114 0.8506542 -0.4253227 0.3090114 0.8506542 0.1624554 0.4999952 0.8506544</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-positions-array" count="42" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-normals">
+          <float_array id="Icosphere_001-mesh-normals-array" count="240">0.7002241 -0.2680317 -0.6616988 0.9049891 -0.2680316 -0.3303847 0.02474653 -0.9435215 -0.330386 -0.8896973 -0.3150947 -0.3303849 -0.5746018 0.7487837 -0.3303875 0.5345759 0.7778646 -0.3303867 0.4089462 -0.6284253 0.6616985 -0.4712997 -0.5831224 0.6616985 -0.7002241 0.2680317 0.6616988 0.03853034 0.7487788 0.6616991 0.7240421 0.1947362 0.6616954 0.4911195 0.356821 0.7946575 0.4089463 0.6284252 0.6616985 -0.1875942 0.5773453 0.7946577 -0.4712997 0.5831224 0.6616985 -0.6070605 0 0.7946557 -0.7002241 -0.2680318 0.6616988 -0.1875942 -0.5773453 0.7946577 0.03853034 -0.7487788 0.6616991 0.4911194 -0.356821 0.7946576 0.7240421 -0.1947363 0.6616954 0.8896973 0.3150946 0.3303849 0.7946556 0.5773479 0.1875951 0.5746018 0.7487836 0.3303875 -0.02474653 0.9435214 0.3303861 -0.3035309 0.9341714 0.1875976 -0.5345759 0.7778646 0.3303867 -0.9049891 0.2680316 0.3303846 -0.9822458 0 0.1875985 -0.9049891 -0.2680316 0.3303846 -0.5345759 -0.7778646 0.3303867 -0.3035309 -0.9341714 0.1875975 -0.02474653 -0.9435214 0.3303861 0.5746018 -0.7487836 0.3303875 0.7946556 -0.5773479 0.1875951 0.8896973 -0.3150946 0.3303849 0.3035309 0.9341714 -0.1875975 0.02474653 0.9435215 -0.330386 -0.7946556 0.5773479 -0.1875951 -0.8896973 0.3150945 -0.3303849 -0.7946556 -0.5773479 -0.1875951 -0.5746018 -0.7487836 -0.3303875 0.3035309 -0.9341714 -0.1875976 0.5345759 -0.7778645 -0.3303867 0.9822458 0 -0.1875985 0.9049891 0.2680316 -0.3303847 0.4712997 0.5831224 -0.6616986 0.1875942 0.5773453 -0.7946577 -0.0385304 0.7487788 -0.6616991 -0.4089462 0.6284252 -0.6616984 -0.4911194 0.356821 -0.7946576 -0.7240421 0.1947362 -0.6616954 -0.7240421 -0.1947362 -0.6616954 -0.4911195 -0.356821 -0.7946575 -0.4089462 -0.6284252 -0.6616984 0.7002241 0.2680318 -0.6616988 0.6070605 0 -0.7946556 -0.0385304 -0.7487788 -0.6616991 0.1875942 -0.5773453 -0.7946577 0.4712997 -0.5831224 -0.6616986 0.1023808 -0.3150898 -0.9435235 -0.2680341 -0.1947365 -0.9435229 -0.2680341 0.1947365 -0.9435229 0.1023808 0.3150898 -0.9435235 0.802609 -0.5831265 -0.1256273 -0.306569 -0.9435216 -0.1256289 -0.9920774 0 -0.1256284 -0.306569 0.9435216 -0.1256289 0.802609 0.5831265 -0.1256273 0.2680341 0.1947365 0.9435229 -0.1023808 0.3150899 0.9435235 -0.3313045 0 0.943524 -0.1023808 -0.3150898 0.9435235 0.2680341 -0.1947365 0.9435229 0.306569 0.9435216 0.1256289 -0.802609 0.5831265 0.1256274 -0.802609 -0.5831265 0.1256274 0.306569 -0.9435216 0.1256289 0.9920774 0 0.1256284 0.3313045 0 -0.943524</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-normals-array" count="80" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-map-0">
+          <float_array id="Icosphere_001-mesh-map-0-array" count="480">0.1891562 0.4353454 0.2201194 0.3408505 0.2923961 0.4111046 0.1891562 0.4353454 0.2923961 0.4111046 0.2610388 0.5272238 0.06585121 0.2636542 0.1202549 0.3546833 1.02655e-4 0.3599037 0.1891674 0.09197556 0.120263 0.1726311 0.07693755 0.06042814 0.3900915 0.1577098 0.2924051 0.1162222 0.3863589 0.0410583 0.3900838 0.3696232 0.3989981 0.2636671 0.4998953 0.3296785 0.6099237 0.1577003 0.7076132 0.1162198 0.6911104 0.216345 0.6099155 0.3696137 0.6010091 0.2636568 0.6911069 0.3109756 0.8108381 0.4353509 0.7076001 0.4111025 0.779882 0.3408538 0.934156 0.263669 0.8797454 0.354694 0.833759 0.263666 0.8108526 0.09198099 0.8797511 0.1726418 0.7798885 0.1864736 0.7798885 0.1864736 0.8797511 0.1726418 0.833759 0.263666 0.8797511 0.1726418 0.934156 0.263669 0.833759 0.263666 0.833759 0.263666 0.8797454 0.354694 0.779882 0.3408538 0.8797454 0.354694 0.8108381 0.4353509 0.779882 0.3408538 0.779882 0.3408538 0.7076001 0.4111025 0.6911069 0.3109756 0.7076001 0.4111025 0.6099155 0.3696137 0.6911069 0.3109756 0.6911069 0.3109756 0.6010091 0.2636568 0.6911104 0.216345 0.6010091 0.2636568 0.6099237 0.1577003 0.6911104 0.216345 0.6911104 0.216345 0.7076132 0.1162198 0.7798885 0.1864736 0.7076132 0.1162198 0.8108526 0.09198099 0.7798885 0.1864736 0.923085 0.06044203 0.8797511 0.1726418 0.8108526 0.09198099 0.923085 0.06044203 0.9998974 0.16742 0.8797511 0.1726418 0.9998974 0.16742 0.934156 0.263669 0.8797511 0.1726418 0.9998974 0.3599234 0.8797454 0.354694 0.934156 0.263669 0.9998974 0.3599234 0.923074 0.4668999 0.8797454 0.354694 0.923074 0.4668999 0.8108381 0.4353509 0.8797454 0.354694 0.7389487 0.527224 0.7076001 0.4111025 0.8108381 0.4353509 0.7389487 0.527224 0.6136447 0.4862654 0.7076001 0.4111025 0.6136447 0.4862654 0.6099155 0.3696137 0.7076001 0.4111025 0.5001069 0.3296607 0.6010091 0.2636568 0.6099155 0.3696137 0.5001069 0.3296607 0.5001106 0.1976431 0.6010091 0.2636568 0.5001106 0.1976431 0.6099237 0.1577003 0.6010091 0.2636568 0.613665 0.041049 0.7076132 0.1162198 0.6099237 0.1577003 0.613665 0.041049 0.7389741 1.02655e-4 0.7076132 0.1162198 0.7389741 1.02655e-4 0.8108526 0.09198099 0.7076132 0.1162198 0.4998953 0.3296785 0.3989981 0.2636671 0.4999017 0.1976609 0.3989981 0.2636671 0.3900915 0.1577098 0.4999017 0.1976609 0.3863589 0.0410583 0.2924051 0.1162222 0.2610529 1.02655e-4 0.2924051 0.1162222 0.1891674 0.09197556 0.2610529 1.02655e-4 0.07693755 0.06042814 0.120263 0.1726311 1.17172e-4 0.1674003 0.120263 0.1726311 0.06585121 0.2636542 1.17172e-4 0.1674003 1.02655e-4 0.3599037 0.1202549 0.3546833 0.07691794 0.466886 0.1202549 0.3546833 0.1891562 0.4353454 0.07691794 0.466886 0.2610388 0.5272238 0.2923961 0.4111046 0.3863458 0.4862747 0.2923961 0.4111046 0.3900838 0.3696232 0.3863458 0.4862747 0.3088967 0.3109791 0.3989981 0.2636671 0.3900838 0.3696232 0.3088967 0.3109791 0.3089004 0.2163485 0.3989981 0.2636671 0.3089004 0.2163485 0.3900915 0.1577098 0.3989981 0.2636671 0.3089004 0.2163485 0.2924051 0.1162222 0.3900915 0.1577098 0.3089004 0.2163485 0.2201245 0.1864705 0.2924051 0.1162222 0.2201245 0.1864705 0.1891674 0.09197556 0.2924051 0.1162222 0.2201245 0.1864705 0.120263 0.1726311 0.1891674 0.09197556 0.2201245 0.1864705 0.1662483 0.2636588 0.120263 0.1726311 0.1662483 0.2636588 0.06585121 0.2636542 0.120263 0.1726311 0.2923961 0.4111046 0.3088967 0.3109791 0.3900838 0.3696232 0.2923961 0.4111046 0.2201194 0.3408505 0.3088967 0.3109791 0.1662483 0.2636588 0.1202549 0.3546833 0.06585121 0.2636542 0.1662483 0.2636588 0.2201194 0.3408505 0.1202549 0.3546833 0.2201194 0.3408505 0.1891562 0.4353454 0.1202549 0.3546833 0.2038319 0.6020938 0.07803589 0.775239 2.88122e-4 0.5359594 0.2038319 0.6020938 2.88122e-4 0.5359594 0.2038319 0.3880734 0.2038319 0.6020938 0.2038319 0.3880734 0.4073758 0.5359594 0.2038319 0.6020938 0.4073758 0.5359594 0.329628 0.775239 0.8690316 0.364753 0.791095 0.5663278 0.6529134 0.364753 0.5301482 0.1791203 0.6523408 0.3573763 0.407952 0.3573763 0.5301446 0.5663277 0.407952 0.3880734 0.6523372 0.3880734 0.20244 0.9919336 0.20244 0.7758153 0.4040137 0.9139961 0.4079523 0.566904 0.6095281 0.6448412 0.407952 0.7830209 0.203883 2.88122e-4 0.4073758 0.1482443 0.2038091 0.2143085 0.4073758 0.1482443 0.3295453 0.3874972 0.2038091 0.2143085 0.3295453 0.3874972 0.07795333 0.3874103 0.2038091 0.2143085 0.07795333 0.3874103 2.88122e-4 0.1481037 0.2038091 0.2143085 2.88122e-4 0.1481037 0.203883 2.88122e-4 0.2038091 0.2143085 0.6523409 0.178544 0.407952 0.1785441 0.5301446 2.88122e-4 0.7910969 0.2018641 0.6529171 2.88122e-4 0.8690339 2.88122e-4 0.8116793 0.6448401 0.6101047 0.7830221 0.6101044 0.566904 2.88169e-4 0.7758153 0.2018638 0.9139932 2.88122e-4 0.9919315 0.407952 0.7835971 0.6095241 0.9217739 0.407952 0.999712 0.07803589 0.775239 0.2038319 0.6020938 0.329628 0.775239</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-map-0-array" count="240" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Icosphere_001-mesh-vertices">
+          <input semantic="POSITION" source="#Icosphere_001-mesh-positions"/>
+        </vertices>
+        <polylist material="Material_001_001-material" count="60">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>1 0 0 13 0 1 15 0 2 1 1 3 15 1 4 22 1 5 2 2 6 14 2 7 24 2 8 3 3 9 18 3 10 26 3 11 4 4 12 20 4 13 28 4 14 5 5 15 21 5 16 30 5 17 6 6 18 32 6 19 37 6 20 7 7 21 33 7 22 39 7 23 8 8 24 34 8 25 40 8 26 9 9 27 35 9 28 41 9 29 10 10 30 36 10 31 38 10 32 38 11 33 36 11 34 41 11 35 36 12 36 9 12 37 41 12 38 41 13 39 35 13 40 40 13 41 35 14 42 8 14 43 40 14 44 40 15 45 34 15 46 39 15 47 34 16 48 7 16 49 39 16 50 39 17 51 33 17 52 37 17 53 33 18 54 6 18 55 37 18 56 37 19 57 32 19 58 38 19 59 32 20 60 10 20 61 38 20 62 23 21 63 36 21 64 10 21 65 23 22 66 30 22 67 36 22 68 30 23 69 9 23 70 36 23 71 31 24 72 35 24 73 9 24 74 31 25 75 28 25 76 35 25 77 28 26 78 8 26 79 35 26 80 29 27 81 34 27 82 8 27 83 29 28 84 26 28 85 34 28 86 26 29 87 7 29 88 34 29 89 27 30 90 33 30 91 7 30 92 27 31 93 24 31 94 33 31 95 24 32 96 6 32 97 33 32 98 25 33 99 32 33 100 6 33 101 25 34 102 22 34 103 32 34 104 22 35 105 10 35 106 32 35 107 30 36 108 21 36 109 31 36 110 21 37 111 4 37 112 31 37 113 28 38 114 20 38 115 29 38 116 20 39 117 3 39 118 29 39 119 26 40 120 18 40 121 27 40 122 18 41 123 2 41 124 27 41 125 24 42 126 14 42 127 25 42 128 14 43 129 1 43 130 25 43 131 22 44 132 15 44 133 23 44 134 15 45 135 5 45 136 23 45 137 16 46 138 21 46 139 5 46 140 16 47 141 19 47 142 21 47 143 19 48 144 4 48 145 21 48 146 19 49 147 20 49 148 4 49 149 19 50 150 17 50 151 20 50 152 17 51 153 3 51 154 20 51 155 17 52 156 18 52 157 3 52 158 17 53 159 12 53 160 18 53 161 12 54 162 2 54 163 18 54 164 15 55 165 16 55 166 5 55 167 15 56 168 13 56 169 16 56 170 12 57 171 14 57 172 2 57 173 12 58 174 13 58 175 14 58 176 13 59 177 1 59 178 14 59 179</p>
+        </polylist>
+        <polylist material="Material_002_001-material" count="20">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>0 60 180 13 60 181 12 60 182 0 61 183 12 61 184 17 61 185 0 62 186 17 62 187 19 62 188 0 63 189 19 63 190 16 63 191 1 64 192 22 64 193 25 64 194 2 65 195 24 65 196 27 65 197 3 66 198 26 66 199 29 66 200 4 67 201 28 67 202 31 67 203 5 68 204 30 68 205 23 68 206 38 69 207 41 69 208 11 69 209 41 70 210 40 70 211 11 70 212 40 71 213 39 71 214 11 71 215 39 72 216 37 72 217 11 72 218 37 73 219 38 73 220 11 73 221 30 74 222 31 74 223 9 74 224 28 75 225 29 75 226 8 75 227 26 76 228 27 76 229 7 76 230 24 77 231 25 77 232 6 77 233 22 78 234 23 78 235 10 78 236 13 79 237 0 79 238 16 79 239</p>
+        </polylist>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Icosphere" name="Icosphere" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
+        <instance_geometry url="#Icosphere_001-mesh" name="Icosphere">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001_001-material" target="#Material_001_001-material"/>
+              <instance_material symbol="Material_002_001-material" target="#Material_002_001-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>

src/main/resources/meshes/random_pickup.dae

@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool>
+    </contributor>
+    <created>2017-09-19T15:54:38</created>
+    <modified>2017-09-19T15:54:38</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.8 0.6035923 0 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_002_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.8 0.1522076 0 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.01023849 0.004662884 0.64 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.5 0.5 0.5 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_002-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.64 0 0.2456551 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.5 0.5 0.5 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_003-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">8.07677e-5 0.64 0 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.5 0.5 0.5 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_004-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.64 0 0.005309466 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.5 0.5 0.5 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_005-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0 0 0 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.5 0.5 0.5 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001_001-material" name="Material_001_001">
+      <instance_effect url="#Material_001_001-effect"/>
+    </material>
+    <material id="Material_002_001-material" name="Material_002_001">
+      <instance_effect url="#Material_002_001-effect"/>
+    </material>
+    <material id="Material_001-material" name="Material_001">
+      <instance_effect url="#Material_001-effect"/>
+    </material>
+    <material id="Material_002-material" name="Material_002">
+      <instance_effect url="#Material_002-effect"/>
+    </material>
+    <material id="Material_003-material" name="Material_003">
+      <instance_effect url="#Material_003-effect"/>
+    </material>
+    <material id="Material_004-material" name="Material_004">
+      <instance_effect url="#Material_004-effect"/>
+    </material>
+    <material id="Material_005-material" name="Material_005">
+      <instance_effect url="#Material_005-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Icosphere_001-mesh" name="Icosphere.001">
+      <mesh>
+        <source id="Icosphere_001-mesh-positions">
+          <float_array id="Icosphere_001-mesh-positions-array" count="126">0 0 -1 0.7236073 -0.5257253 -0.4472195 -0.276388 -0.8506492 -0.4472199 -0.8944262 0 -0.4472156 -0.276388 0.8506492 -0.4472199 0.7236073 0.5257253 -0.4472195 0.276388 -0.8506492 0.4472199 -0.7236073 -0.5257253 0.4472195 -0.7236073 0.5350354 0.4472195 0.276388 0.8506492 0.4472199 0.8944262 0 0.4472156 0 0 1 -0.1624554 -0.4999952 -0.8506544 0.4253227 -0.3090114 -0.8506542 0.2628688 -0.8090116 -0.5257377 0.8506479 0 -0.5257359 0.4253227 0.3090114 -0.8506542 -0.5257298 0 -0.8506517 -0.6881894 -0.4999969 -0.5257362 -0.1624554 0.4999952 -0.8506544 -0.6881894 0.4999969 -0.5257362 0.2628688 0.8090116 -0.5257377 0.9510579 -0.3090126 0 0.9510579 0.3090126 0 0 -1 0 0.5877856 -0.8090167 0 -0.9510579 -0.3090126 0 -0.5877856 -0.8090167 0 -0.5877856 0.8183268 0 -0.9510579 0.3090126 0 0.5877856 0.8090167 0 0 1 0 0.6881894 -0.4999969 0.5257362 -0.2628688 -0.8090116 0.5257377 -0.8506479 0 0.5257359 -0.2628688 0.8183217 0.5257377 0.6881894 0.4999969 0.5257362 0.1624554 -0.4999952 0.8506544 0.5257298 0 0.8506517 -0.4253227 -0.3090114 0.8506542 -0.4253227 0.3090114 0.8506542 0.1624554 0.4999952 0.8506544</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-positions-array" count="42" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-normals">
+          <float_array id="Icosphere_001-mesh-normals-array" count="240">0.7002241 -0.2680317 -0.6616988 0.9049891 -0.2680316 -0.3303847 0.02474653 -0.9435215 -0.330386 -0.8896973 -0.3150947 -0.3303849 -0.570192 0.7464457 -0.3430743 0.5345759 0.7778646 -0.3303867 0.4089462 -0.6284253 0.6616985 -0.4712997 -0.5831224 0.6616985 -0.6991799 0.2635454 0.6645987 0.05184978 0.746441 0.6634285 0.7240421 0.1947362 0.6616954 0.4911195 0.356821 0.7946575 0.4089463 0.6284252 0.6616985 -0.185151 0.569826 0.8006358 -0.4685443 0.5765037 0.6694099 -0.6070605 0 0.7946557 -0.7002241 -0.2680318 0.6616988 -0.1875942 -0.5773453 0.7946577 0.03853034 -0.7487788 0.6616991 0.4911194 -0.356821 0.7946576 0.7240421 -0.1947363 0.6616954 0.8896973 0.3150946 0.3303849 0.7946556 0.5773479 0.1875951 0.5746018 0.7487836 0.3303875 -0.009833872 0.9466192 0.3222044 -0.2904988 0.9398801 0.1795436 -0.5345759 0.7778646 0.3303867 -0.9071158 0.2635452 0.3281539 -0.9822458 0 0.1875985 -0.9049891 -0.2680316 0.3303846 -0.5345759 -0.7778646 0.3303867 -0.3035309 -0.9341714 0.1875975 -0.02474653 -0.9435214 0.3303861 0.5746018 -0.7487836 0.3303875 0.7946556 -0.5773479 0.1875951 0.8896973 -0.3150946 0.3303849 0.3035309 0.9341714 -0.1875975 0.02474653 0.9435215 -0.330386 -0.7989099 0.5698285 -0.1924537 -0.8896973 0.3150945 -0.3303849 -0.7946556 -0.5773479 -0.1875951 -0.5746018 -0.7487836 -0.3303875 0.3035309 -0.9341714 -0.1875976 0.5345759 -0.7778645 -0.3303867 0.9822458 0 -0.1875985 0.9049891 0.2680316 -0.3303847 0.4712997 0.5831224 -0.6616986 0.1875942 0.5773453 -0.7946577 -0.0385304 0.7487788 -0.6616991 -0.4089462 0.6284252 -0.6616984 -0.4911194 0.356821 -0.7946576 -0.7240421 0.1947362 -0.6616954 -0.7240421 -0.1947362 -0.6616954 -0.4911195 -0.356821 -0.7946575 -0.4089462 -0.6284252 -0.6616984 0.7002241 0.2680318 -0.6616988 0.6070605 0 -0.7946556 -0.0385304 -0.7487788 -0.6616991 0.1875942 -0.5773453 -0.7946577 0.4712997 -0.5831224 -0.6616986 0.1023808 -0.3150898 -0.9435235 -0.2680341 -0.1947365 -0.9435229 -0.2680341 0.1947365 -0.9435229 0.1023808 0.3150898 -0.9435235 0.802609 -0.5831265 -0.1256273 -0.306569 -0.9435216 -0.1256289 -0.9920774 0 -0.1256284 -0.2925817 0.9466192 -0.1353079 0.802609 0.5831265 -0.1256273 0.2680341 0.1947365 0.9435229 -0.1023808 0.3150899 0.9435235 -0.3313045 0 0.943524 -0.1023808 -0.3150898 0.9435235 0.2680341 -0.1947365 0.9435229 0.306569 0.9435216 0.1256289 -0.8082743 0.5765079 0.1197141 -0.802609 -0.5831265 0.1256274 0.306569 -0.9435216 0.1256289 0.9920774 0 0.1256284 0.3313045 0 -0.943524</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-normals-array" count="80" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-map-0">
+          <float_array id="Icosphere_001-mesh-map-0-array" count="480">0.1891562 0.4353454 0.2201194 0.3408505 0.2923961 0.4111046 0.1891562 0.4353454 0.2923961 0.4111046 0.2610388 0.5272238 0.06585121 0.2636542 0.1202549 0.3546833 1.02655e-4 0.3599037 0.1891674 0.09197556 0.120263 0.1726311 0.07693755 0.06042814 0.3900915 0.1577098 0.2924051 0.1162222 0.3863589 0.0410583 0.3900838 0.3696232 0.3989981 0.2636671 0.4998953 0.3296785 0.6099237 0.1577003 0.7076132 0.1162198 0.6911104 0.216345 0.6099155 0.3696137 0.6010091 0.2636568 0.6911069 0.3109756 0.8108381 0.4353509 0.7076001 0.4111025 0.779882 0.3408538 0.934156 0.263669 0.8797454 0.354694 0.833759 0.263666 0.8108526 0.09198099 0.8797511 0.1726418 0.7798885 0.1864736 0.7798885 0.1864736 0.8797511 0.1726418 0.833759 0.263666 0.8797511 0.1726418 0.934156 0.263669 0.833759 0.263666 0.833759 0.263666 0.8797454 0.354694 0.779882 0.3408538 0.8797454 0.354694 0.8108381 0.4353509 0.779882 0.3408538 0.779882 0.3408538 0.7076001 0.4111025 0.6911069 0.3109756 0.7076001 0.4111025 0.6099155 0.3696137 0.6911069 0.3109756 0.6911069 0.3109756 0.6010091 0.2636568 0.6911104 0.216345 0.6010091 0.2636568 0.6099237 0.1577003 0.6911104 0.216345 0.6911104 0.216345 0.7076132 0.1162198 0.7798885 0.1864736 0.7076132 0.1162198 0.8108526 0.09198099 0.7798885 0.1864736 0.923085 0.06044203 0.8797511 0.1726418 0.8108526 0.09198099 0.923085 0.06044203 0.9998974 0.16742 0.8797511 0.1726418 0.9998974 0.16742 0.934156 0.263669 0.8797511 0.1726418 0.9998974 0.3599234 0.8797454 0.354694 0.934156 0.263669 0.9998974 0.3599234 0.923074 0.4668999 0.8797454 0.354694 0.923074 0.4668999 0.8108381 0.4353509 0.8797454 0.354694 0.7389487 0.527224 0.7076001 0.4111025 0.8108381 0.4353509 0.7389487 0.527224 0.6136447 0.4862654 0.7076001 0.4111025 0.6136447 0.4862654 0.6099155 0.3696137 0.7076001 0.4111025 0.5001069 0.3296607 0.6010091 0.2636568 0.6099155 0.3696137 0.5001069 0.3296607 0.5001106 0.1976431 0.6010091 0.2636568 0.5001106 0.1976431 0.6099237 0.1577003 0.6010091 0.2636568 0.613665 0.041049 0.7076132 0.1162198 0.6099237 0.1577003 0.613665 0.041049 0.7389741 1.02655e-4 0.7076132 0.1162198 0.7389741 1.02655e-4 0.8108526 0.09198099 0.7076132 0.1162198 0.4998953 0.3296785 0.3989981 0.2636671 0.4999017 0.1976609 0.3989981 0.2636671 0.3900915 0.1577098 0.4999017 0.1976609 0.3863589 0.0410583 0.2924051 0.1162222 0.2610529 1.02655e-4 0.2924051 0.1162222 0.1891674 0.09197556 0.2610529 1.02655e-4 0.07693755 0.06042814 0.120263 0.1726311 1.17172e-4 0.1674003 0.120263 0.1726311 0.06585121 0.2636542 1.17172e-4 0.1674003 1.02655e-4 0.3599037 0.1202549 0.3546833 0.07691794 0.466886 0.1202549 0.3546833 0.1891562 0.4353454 0.07691794 0.466886 0.2610388 0.5272238 0.2923961 0.4111046 0.3863458 0.4862747 0.2923961 0.4111046 0.3900838 0.3696232 0.3863458 0.4862747 0.3088967 0.3109791 0.3989981 0.2636671 0.3900838 0.3696232 0.3088967 0.3109791 0.3089004 0.2163485 0.3989981 0.2636671 0.3089004 0.2163485 0.3900915 0.1577098 0.3989981 0.2636671 0.3089004 0.2163485 0.2924051 0.1162222 0.3900915 0.1577098 0.3089004 0.2163485 0.2201245 0.1864705 0.2924051 0.1162222 0.2201245 0.1864705 0.1891674 0.09197556 0.2924051 0.1162222 0.2201245 0.1864705 0.120263 0.1726311 0.1891674 0.09197556 0.2201245 0.1864705 0.1662483 0.2636588 0.120263 0.1726311 0.1662483 0.2636588 0.06585121 0.2636542 0.120263 0.1726311 0.2923961 0.4111046 0.3088967 0.3109791 0.3900838 0.3696232 0.2923961 0.4111046 0.2201194 0.3408505 0.3088967 0.3109791 0.1662483 0.2636588 0.1202549 0.3546833 0.06585121 0.2636542 0.1662483 0.2636588 0.2201194 0.3408505 0.1202549 0.3546833 0.2201194 0.3408505 0.1891562 0.4353454 0.1202549 0.3546833 0.2038319 0.6020938 0.07803589 0.775239 2.88122e-4 0.5359594 0.2038319 0.6020938 2.88122e-4 0.5359594 0.2038319 0.3880734 0.2038319 0.6020938 0.2038319 0.3880734 0.4073758 0.5359594 0.2038319 0.6020938 0.4073758 0.5359594 0.329628 0.775239 0.8690316 0.364753 0.791095 0.5663278 0.6529134 0.364753 0.5301482 0.1791203 0.6523408 0.3573763 0.407952 0.3573763 0.5301446 0.5663277 0.407952 0.3880734 0.6523372 0.3880734 0.20244 0.9919336 0.20244 0.7758153 0.4040137 0.9139961 0.4079523 0.566904 0.6095281 0.6448412 0.407952 0.7830209 0.203883 2.88122e-4 0.4073758 0.1482443 0.2038091 0.2143085 0.4073758 0.1482443 0.3295453 0.3874972 0.2038091 0.2143085 0.3295453 0.3874972 0.07795333 0.3874103 0.2038091 0.2143085 0.07795333 0.3874103 2.88122e-4 0.1481037 0.2038091 0.2143085 2.88122e-4 0.1481037 0.203883 2.88122e-4 0.2038091 0.2143085 0.6523409 0.178544 0.407952 0.1785441 0.5301446 2.88122e-4 0.7910969 0.2018641 0.6529171 2.88122e-4 0.8690339 2.88122e-4 0.8116793 0.6448401 0.6101047 0.7830221 0.6101044 0.566904 2.88169e-4 0.7758153 0.2018638 0.9139932 2.88122e-4 0.9919315 0.407952 0.7835971 0.6095241 0.9217739 0.407952 0.999712 0.07803589 0.775239 0.2038319 0.6020938 0.329628 0.775239</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-map-0-array" count="240" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Icosphere_001-mesh-vertices">
+          <input semantic="POSITION" source="#Icosphere_001-mesh-positions"/>
+        </vertices>
+        <polylist material="Material_001_001-material" count="15">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>36 12 36 9 12 37 41 12 38 35 14 42 8 14 43 40 14 44 34 16 48 7 16 49 39 16 50 33 18 54 6 18 55 37 18 56 32 20 60 10 20 61 38 20 62 30 23 69 9 23 70 36 23 71 28 26 78 8 26 79 35 26 80 26 29 87 7 29 88 34 29 89 24 32 96 6 32 97 33 32 98 22 35 105 10 35 106 32 35 107 16 47 141 19 47 142 21 47 143 19 50 150 17 50 151 20 50 152 17 53 159 12 53 160 18 53 161 15 56 168 13 56 169 16 56 170 12 58 174 13 58 175 14 58 176</p>
+        </polylist>
+        <polylist material="Material_002_001-material" count="20">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>0 60 180 13 60 181 12 60 182 0 61 183 12 61 184 17 61 185 0 62 186 17 62 187 19 62 188 0 63 189 19 63 190 16 63 191 1 64 192 22 64 193 25 64 194 2 65 195 24 65 196 27 65 197 3 66 198 26 66 199 29 66 200 4 67 201 28 67 202 31 67 203 5 68 204 30 68 205 23 68 206 38 69 207 41 69 208 11 69 209 41 70 210 40 70 211 11 70 212 40 71 213 39 71 214 11 71 215 39 72 216 37 72 217 11 72 218 37 73 219 38 73 220 11 73 221 30 74 222 31 74 223 9 74 224 28 75 225 29 75 226 8 75 227 26 76 228 27 76 229 7 76 230 24 77 231 25 77 232 6 77 233 22 78 234 23 78 235 10 78 236 13 79 237 0 79 238 16 79 239</p>
+        </polylist>
+        <polylist material="Material_001-material" count="10">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>23 22 66 30 22 67 36 22 68 31 25 75 28 25 76 35 25 77 29 28 84 26 28 85 34 28 86 27 31 93 24 31 94 33 31 95 25 34 102 22 34 103 32 34 104 30 36 108 21 36 109 31 36 110 28 38 114 20 38 115 29 38 116 26 40 120 18 40 121 27 40 122 24 42 126 14 42 127 25 42 128 22 44 132 15 44 133 23 44 134</p>
+        </polylist>
+        <polylist material="Material_002-material" count="10">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>6 6 18 32 6 19 37 6 20 7 7 21 33 7 22 39 7 23 8 8 24 34 8 25 40 8 26 9 9 27 35 9 28 41 9 29 10 10 30 36 10 31 38 10 32 23 21 63 36 21 64 10 21 65 31 24 72 35 24 73 9 24 74 29 27 81 34 27 82 8 27 83 27 30 90 33 30 91 7 30 92 25 33 99 32 33 100 6 33 101</p>
+        </polylist>
+        <polylist material="Material_003-material" count="5">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 </vcount>
+          <p>38 11 33 36 11 34 41 11 35 41 13 39 35 13 40 40 13 41 40 15 45 34 15 46 39 15 47 39 17 51 33 17 52 37 17 53 37 19 57 32 19 58 38 19 59</p>
+        </polylist>
+        <polylist material="Material_004-material" count="10">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>1 0 0 13 0 1 15 0 2 1 1 3 15 1 4 22 1 5 2 2 6 14 2 7 24 2 8 3 3 9 18 3 10 26 3 11 4 4 12 20 4 13 28 4 14 5 5 15 21 5 16 30 5 17 16 46 138 21 46 139 5 46 140 19 49 147 20 49 148 4 49 149 17 52 156 18 52 157 3 52 158 12 57 171 14 57 172 2 57 173</p>
+        </polylist>
+        <polylist material="Material_005-material" count="10">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>21 37 111 4 37 112 31 37 113 20 39 117 3 39 118 29 39 119 18 41 123 2 41 124 27 41 125 14 43 129 1 43 130 25 43 131 15 45 135 5 45 136 23 45 137 19 48 144 4 48 145 21 48 146 17 51 153 3 51 154 20 51 155 12 54 162 2 54 163 18 54 164 15 55 165 16 55 166 5 55 167 13 59 177 1 59 178 14 59 179</p>
+        </polylist>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Icosphere" name="Icosphere" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
+        <instance_geometry url="#Icosphere_001-mesh" name="Icosphere">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001_001-material" target="#Material_001_001-material"/>
+              <instance_material symbol="Material_002_001-material" target="#Material_002_001-material"/>
+              <instance_material symbol="Material_001-material" target="#Material_001-material"/>
+              <instance_material symbol="Material_002-material" target="#Material_002-material"/>
+              <instance_material symbol="Material_003-material" target="#Material_003-material"/>
+              <instance_material symbol="Material_004-material" target="#Material_004-material"/>
+              <instance_material symbol="Material_005-material" target="#Material_005-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>

src/main/resources/meshes/trail_segment.dae

@@ -5,8 +5,8 @@
       <author>Blender User</author>
       <authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool>
     </contributor>
-    <created>2017-09-26T01:05:25</created>
-    <modified>2017-09-26T01:05:25</modified>
+    <created>2017-09-11T16:51:03</created>
+    <modified>2017-09-11T16:51:03</modified>
     <unit name="meter" meter="1"/>
     <up_axis>Z_UP</up_axis>
   </asset>
@@ -48,7 +48,7 @@
     <geometry id="Plane_004-mesh" name="Plane.004">
       <mesh>
         <source id="Plane_004-mesh-positions">
-          <float_array id="Plane_004-mesh-positions-array" count="240">-1 -0.09999954 0.01554518 1 -0.09999954 0.01554518 -1 0.1000005 0.01554518 1 0.1000005 0.01554518 1 0.1000005 0.01554518 1 -0.09999954 0.01554518 1.019509 -0.09807801 0.01554518 1.038269 -0.09238743 0.01554518 1.055557 -0.08314645 0.01554518 1.070711 -0.07071018 0.01554518 1.083147 -0.05555647 0.01554518 1.092388 -0.03826785 0.01554518 1.098079 -0.01950848 0.01554518 1.1 5.96046e-7 0.01554518 1.098079 0.01950955 0.01554518 1.092388 0.03826892 0.01554518 1.083147 0.05555754 0.01554518 1.070711 0.07071125 0.01554518 1.055557 0.08314752 0.01554518 1.038269 0.09238851 0.01554518 1.019509 0.09807896 0.01554518 -1 0.1000005 0.01554518 -1.019509 0.0980789 0.01554518 -1.038268 0.09238833 0.01554518 -1.055557 0.08314734 0.01554518 -1.070711 0.07071107 0.01554518 -1.083147 0.05555737 0.01554518 -1.092388 0.03826874 0.01554518 -1.098078 0.01950937 0.01554518 -1.1 4.56348e-7 0.01554518 -1.098078 -0.0195086 0.01554518 -1.092388 -0.03826785 0.01554518 -1.083147 -0.05555647 0.01554518 -1.070711 -0.07071018 0.01554518 -1.055557 -0.08314645 0.01554518 -1.038268 -0.09238755 0.01554518 -1.019509 -0.09807813 0.01554518 -0.9999997 -0.09999954 0.01554518 1 4.76837e-7 0.01554518 -1 4.76837e-7 0.01554518 -1 4.76837e-7 0.04452198 -1 0.1000005 0.04452198 -1 -0.09999954 0.04452198 1 -0.09999954 0.04452198 1 0.1000005 0.04452198 1.019509 -0.09807801 0.04452198 1 -0.09999954 0.04452198 1.038269 -0.09238743 0.04452198 1.055557 -0.08314645 0.04452198 1.070711 -0.07071018 0.04452198 1.083147 -0.05555647 0.04452198 1.092388 -0.03826785 0.04452198 1.098079 -0.01950848 0.04452198 1.1 5.96046e-7 0.04452198 1.098079 0.01950955 0.04452198 1.092388 0.03826892 0.04452198 1.083147 0.05555754 0.04452198 1.070711 0.07071125 0.04452198 1.055557 0.08314752 0.04452198 1.038269 0.09238851 0.04452198 1.019509 0.09807896 0.04452198 1 0.1000005 0.04452198 -1.019509 0.0980789 0.04452198 -1 0.1000005 0.04452198 -1.038268 0.09238833 0.04452198 -1.055557 0.08314734 0.04452198 -1.070711 0.07071107 0.04452198 -1.083147 0.05555737 0.04452198 -1.092388 0.03826874 0.04452198 -1.098078 0.01950937 0.04452198 -1.1 4.56348e-7 0.04452198 -1.098078 -0.0195086 0.04452198 -1.092388 -0.03826785 0.04452198 -1.083147 -0.05555647 0.04452198 -1.070711 -0.07071018 0.04452198 -1.055557 -0.08314645 0.04452198 -1.038268 -0.09238755 0.04452198 -1.019509 -0.09807813 0.04452198 -0.9999997 -0.09999954 0.04452198 1 4.76837e-7 0.04452198</float_array>
+          <float_array id="Plane_004-mesh-positions-array" count="240">-1 -0.09999954 0.01554524 1 -0.09999954 0.01554524 -1 0.1000005 0.01554524 1 0.1000005 0.01554524 1 0.1000005 0.01554524 1 -0.09999954 0.01554524 1.019509 -0.09807801 0.01554524 1.038269 -0.09238743 0.01554524 1.055557 -0.08314645 0.01554524 1.070711 -0.07071018 0.01554524 1.083147 -0.05555653 0.01554524 1.092388 -0.03826785 0.01554524 1.098079 -0.01950848 0.01554524 1.1 5.96046e-7 0.01554524 1.098079 0.01950955 0.01554524 1.092388 0.03826892 0.01554524 1.083147 0.0555576 0.01554524 1.070711 0.07071125 0.01554524 1.055557 0.08314752 0.01554524 1.038269 0.09238851 0.01554524 1.019509 0.09807896 0.01554524 -1 0.1000005 0.01554524 -1.019509 0.0980789 0.01554524 -1.038268 0.09238833 0.01554524 -1.055557 0.08314734 0.01554524 -1.070711 0.07071107 0.01554524 -1.083147 0.05555742 0.01554524 -1.092388 0.03826874 0.01554524 -1.098078 0.01950937 0.01554524 -1.1 4.56348e-7 0.01554524 -1.098078 -0.0195086 0.01554524 -1.092388 -0.03826785 0.01554524 -1.083147 -0.05555653 0.01554524 -1.070711 -0.07071018 0.01554524 -1.055557 -0.08314645 0.01554524 -1.038268 -0.09238755 0.01554524 -1.019509 -0.09807813 0.01554524 -0.9999997 -0.09999954 0.01554524 1 4.76837e-7 0.01554524 -1 4.76837e-7 0.01554524 -1 4.76837e-7 0.04452204 -1 0.1000005 0.04452204 -1 -0.09999954 0.04452204 1 -0.09999954 0.04452204 1 0.1000005 0.04452204 1.019509 -0.09807801 0.04452204 1 -0.09999954 0.04452204 1.038269 -0.09238743 0.04452204 1.055557 -0.08314645 0.04452204 1.070711 -0.07071018 0.04452204 1.083147 -0.05555653 0.04452204 1.092388 -0.03826785 0.04452204 1.098079 -0.01950848 0.04452204 1.1 5.96046e-7 0.04452204 1.098079 0.01950955 0.04452204 1.092388 0.03826892 0.04452204 1.083147 0.0555576 0.04452204 1.070711 0.07071125 0.04452204 1.055557 0.08314752 0.04452204 1.038269 0.09238851 0.04452204 1.019509 0.09807896 0.04452204 1 0.1000005 0.04452204 -1.019509 0.0980789 0.04452204 -1 0.1000005 0.04452204 -1.038268 0.09238833 0.04452204 -1.055557 0.08314734 0.04452204 -1.070711 0.07071107 0.04452204 -1.083147 0.05555742 0.04452204 -1.092388 0.03826874 0.04452204 -1.098078 0.01950937 0.04452204 -1.1 4.56348e-7 0.04452204 -1.098078 -0.0195086 0.04452204 -1.092388 -0.03826785 0.04452204 -1.083147 -0.05555653 0.04452204 -1.070711 -0.07071018 0.04452204 -1.055557 -0.08314645 0.04452204 -1.038268 -0.09238755 0.04452204 -1.019509 -0.09807813 0.04452204 -0.9999997 -0.09999954 0.04452204 1 4.76837e-7 0.04452204</float_array>
           <technique_common>
             <accessor source="#Plane_004-mesh-positions-array" count="80" stride="3">
               <param name="X" type="float"/>
@@ -58,9 +58,9 @@
           </technique_common>
         </source>
         <source id="Plane_004-mesh-normals">
-          <float_array id="Plane_004-mesh-normals-array" count="270">0 0 -1 1.19345e-7 0 -1 0 0 -1 0 0 -1 -1.19344e-7 0 -1 -1.19343e-7 0 -1 0 0 -1 0 0 -1 -1.19343e-7 0 -1 0 0 1 1.19345e-7 0 1 0 0 1 -4.77394e-7 0 1 -1.19344e-7 0 1 -4.77375e-7 0 1 4.77387e-7 0 1 0 0 1 -1.19345e-7 0 1 2.38692e-7 0 1 2.38687e-7 0 1 -2.38687e-7 0 1 -0.6343871 0.7730156 0 -1 0 0 0.9569398 -0.2902864 0 1 0 0 -0.7730116 0.6343919 0 0.9951861 -0.09800404 0 -0.8819217 0.4713962 0 0.9951872 0.09799164 0 -0.9569509 0.2902504 0 0.9569326 0.2903105 0 -0.9951821 0.09804385 0 0.8819217 0.471396 0 0.923877 0.3826896 0 -0.9951823 -0.09804314 0 0.773018 0.6343841 0 0.3826818 -0.9238802 0 0 -1 0 -0.9569467 -0.2902641 0 0.6343807 0.7730209 0 0 1 0 -0.8819217 -0.4713962 0 0.4714139 0.8819121 0 0.09802061 -0.9951844 0 -0.7730181 -0.6343839 0 1 3.85683e-6 0 0.2902668 0.9569458 0 -0.2902731 0.9569439 0 -0.6343807 -0.7730209 0 0.09802073 0.9951844 0 -0.4714134 0.8819125 0 -0.4713908 -0.8819245 0 -0.09802436 0.995184 0 0.6343871 -0.7730156 0 -0.2902895 -0.956939 0 -0.2902888 0.9569392 0 0.7730117 -0.6343918 0 -0.09801268 -0.9951853 0 -0.4713921 0.8819237 0 0.8819217 -0.4713962 0 -0.6343807 0.7730209 0 0.9569326 -0.2903105 0 -0.7730181 0.634384 0 0.9951873 -0.0979911 0 0.995186 0.09800463 0 -0.9569472 0.2902624 0 0.9569398 0.2902864 0 -0.9951821 0.09804385 0 0.923877 0.3826897 0 0.7730115 0.634392 0 0.3826841 -0.9238793 0 -0.9569503 -0.2902522 0 0.6343871 0.7730156 0 0.4714112 0.8819137 0 0.09801995 -0.9951846 0 -0.7730117 -0.6343919 0 1 2.57122e-6 0 0.2902686 0.9569453 0 -0.2902749 0.9569434 0 -0.6343871 -0.7730156 0 0.09802132 0.9951844 0 -0.4714105 0.8819139 0 -0.4713962 -0.8819217 0 -0.09802371 0.9951841 0 0.6343807 -0.7730209 0 -0.2902895 -0.956939 0 -0.2902888 0.9569392 0 0.7730181 -0.634384 0 -0.09801262 -0.9951853 0 -0.4713866 0.8819267 0</float_array>
+          <float_array id="Plane_004-mesh-normals-array" count="342">0 0 -1 0 0 -1 0 0 -1 0 0 -1 1.19345e-7 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 -1.19344e-7 0 -1 0 0 1 -1.19345e-7 0 1 0 0 1 1.19344e-7 0 1 -4.77372e-7 0 1 0 0 1 0 0 1 0 0 1 -2.38688e-7 0 1 0 0 1 2.3869e-7 0 1 1.19345e-7 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 -2.3869e-7 0 1 0 0 1 -0.6343874 0.7730153 0 -1 0 0 0.9569399 -0.2902863 0 1 0 0 -0.7730182 0.6343839 0 0.9951848 -0.09801703 0 -0.8819218 0.4713957 0 0.9951835 0.09803056 0 -1 -5.14244e-6 0 -0.9569436 0.2902743 0 0.9569399 0.2902863 0 -0.9951834 0.09803056 0 0.8819165 0.4714059 0 0.9238785 0.3826861 0 -0.9951835 -0.09802997 0 0.7730053 0.6343997 0 0.3826843 -0.9238792 0 0 -1 0 -0.9569393 -0.2902879 0 0.6344003 0.7730048 0 0 1 0 -0.8819164 -0.4714059 0 0.4713947 0.8819224 0 0.09802103 -0.9951844 0 -0.7730182 -0.6343839 0 1 3.85683e-6 0 0.2902728 0.9569441 0 -0.2902856 0.9569401 0 -0.6343874 -0.7730153 0 0.09802168 0.9951844 0 -0.4713947 0.8819224 0 -0.4713994 -0.8819198 0 -0.09802168 0.9951844 0 0.6344003 -0.7730048 0 -0.2902857 -0.9569401 0 1 2.57122e-6 0 -0.2902857 0.9569401 0 0.7730085 -0.6343957 0 -0.0980131 -0.9951851 0 -0.4713975 0.881921 0 0.8819219 -0.4713957 0 0.9569398 -0.2902863 0 -0.7730182 0.634384 0 0.9951835 -0.09802997 0 -0.8819165 0.4714059 0 0.9951847 0.09801757 0 -1 -3.85683e-6 0 -0.9569399 0.2902863 0 0.9569398 0.2902863 0 -0.9951834 0.09803056 0 0.8819218 0.4713957 0 0.9238789 0.3826851 0 0.7730085 0.6343957 0 0.3826831 -0.9238798 0 -0.956943 -0.2902759 0 0.6344001 0.7730049 0 -0.8819219 -0.4713957 0 0.4713975 0.881921 0 0.09802103 -0.9951844 0 -0.7730182 -0.634384 0 1 3.85683e-6 0 -0.2902855 0.9569401 0 0.09802103 0.9951844 0 -0.4714021 -0.8819184 0 -0.09802103 0.9951844 0 0.6344001 -0.7730049 0 -0.2902856 -0.9569401 0 1 2.57122e-6 0 -0.2902856 0.9569401 0 0.7730054 -0.6343996 0 -0.09801179 -0.9951853 0 -0.4713947 0.8819224 0 0.8819164 -0.471406 0</float_array>
           <technique_common>
-            <accessor source="#Plane_004-mesh-normals-array" count="90" stride="3">
+            <accessor source="#Plane_004-mesh-normals-array" count="114" stride="3">
               <param name="X" type="float"/>
               <param name="Y" type="float"/>
               <param name="Z" type="float"/>
@@ -74,7 +74,7 @@
           <input semantic="VERTEX" source="#Plane_004-mesh-vertices" offset="0"/>
           <input semantic="NORMAL" source="#Plane_004-mesh-normals" offset="1"/>
           <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
-          <p>38 0 0 0 39 0 6 1 5 1 38 1 8 0 6 0 38 0 9 2 38 2 10 2 8 0 38 0 9 0 10 0 38 0 11 0 11 0 38 0 12 0 12 3 38 3 13 3 4 0 20 0 38 0 19 0 38 0 20 0 18 0 38 0 19 0 17 0 38 0 18 0 16 0 38 0 17 0 15 0 38 0 16 0 14 0 38 0 15 0 13 0 38 0 14 0 37 4 36 4 39 4 35 0 39 0 36 0 21 0 39 0 22 0 34 0 39 0 35 0 33 5 39 5 34 5 32 0 39 0 33 0 31 0 39 0 32 0 30 0 39 0 31 0 29 0 39 0 30 0 28 6 39 6 29 6 27 0 39 0 28 0 26 0 39 0 27 0 25 7 39 7 26 7 22 0 39 0 23 0 23 0 39 0 24 0 24 8 39 8 25 8 40 9 43 9 79 9 45 9 79 9 46 9 48 9 79 9 45 9 49 9 50 9 79 9 48 9 49 9 79 9 50 10 51 10 79 10 51 9 52 9 79 9 52 11 53 11 79 11 61 9 79 9 60 9 59 9 60 9 79 9 58 12 59 12 79 12 57 9 58 9 79 9 56 9 57 9 79 9 55 9 56 9 79 9 54 13 55 13 79 13 53 9 54 9 79 9 78 14 40 14 77 14 76 15 77 15 40 15 63 9 62 9 40 9 75 9 76 9 40 9 74 9 75 9 40 9 73 9 74 9 40 9 72 9 73 9 40 9 71 9 72 9 40 9 70 9 71 9 40 9 69 16 70 16 40 16 68 9 69 9 40 9 67 17 68 17 40 17 66 18 67 18 40 18 62 9 64 9 40 9 64 19 65 19 40 19 65 20 66 20 40 20 25 21 65 21 24 21 38 22 61 22 4 22 12 23 51 23 11 23 38 24 43 24 1 24 26 25 66 25 25 25 13 26 52 26 12 26 0 22 40 22 39 22 27 27 67 27 26 27 14 28 53 28 13 28 5 22 79 22 38 22 28 29 68 29 27 29 15 30 54 30 14 30 29 31 69 31 28 31 16 32 55 32 15 32 38 33 47 33 7 33 39 22 41 22 2 22 30 34 70 34 29 34 17 35 56 35 16 35 8 36 45 36 6 36 1 37 42 37 0 37 31 38 71 38 30 38 18 39 57 39 17 39 2 40 44 40 3 40 32 41 72 41 31 41 19 42 58 42 18 42 6 43 46 43 5 43 33 44 73 44 32 44 37 45 40 45 78 45 20 46 59 46 19 46 6 47 47 47 7 47 34 48 74 48 33 48 4 49 60 49 20 49 7 50 48 50 8 50 35 51 75 51 34 51 22 52 63 52 21 52 9 53 48 53 8 53 36 54 76 54 35 54 21 24 40 24 39 24 23 55 62 55 22 55 10 56 49 56 9 56 37 57 77 57 36 57 24 58 64 58 23 58 11 59 50 59 10 59 3 24 79 24 38 24 39 0 2 0 3 0 38 0 1 0 0 0 39 0 3 0 38 0 44 9 41 9 40 9 40 9 42 9 43 9 79 9 44 9 40 9 25 60 66 60 65 60 38 22 79 22 61 22 12 61 52 61 51 61 38 24 79 24 43 24 26 62 67 62 66 62 13 63 53 63 52 63 0 22 42 22 40 22 27 27 68 27 67 27 14 64 54 64 53 64 5 22 46 22 79 22 28 65 69 65 68 65 15 66 55 66 54 66 29 67 70 67 69 67 16 32 56 32 55 32 38 68 79 68 47 68 39 22 40 22 41 22 30 34 71 34 70 34 17 69 57 69 56 69 8 70 48 70 45 70 1 37 43 37 42 37 31 71 72 71 71 71 18 72 58 72 57 72 2 40 41 40 44 40 32 41 73 41 72 41 19 73 59 73 58 73 6 74 45 74 46 74 33 75 74 75 73 75 37 76 39 76 40 76 20 77 60 77 59 77 6 78 45 78 47 78 34 79 75 79 74 79 4 80 61 80 60 80 7 81 47 81 48 81 35 82 76 82 75 82 22 83 62 83 63 83 9 84 49 84 48 84 36 85 77 85 76 85 21 24 63 24 40 24 23 86 64 86 62 86 10 87 50 87 49 87 37 88 78 88 77 88 24 89 65 89 64 89 11 59 51 59 50 59 3 24 44 24 79 24</p>
+          <p>38 0 0 0 39 0 6 0 5 0 38 0 8 1 6 1 38 1 9 2 38 2 10 2 8 0 38 0 9 0 10 0 38 0 11 0 11 0 38 0 12 0 12 3 38 3 13 3 4 0 20 0 38 0 19 0 38 0 20 0 18 4 38 4 19 4 17 0 38 0 18 0 16 0 38 0 17 0 15 0 38 0 16 0 14 0 38 0 15 0 13 0 38 0 14 0 37 5 36 5 39 5 35 6 39 6 36 6 21 7 39 7 22 7 34 8 39 8 35 8 33 9 39 9 34 9 32 10 39 10 33 10 31 11 39 11 32 11 30 12 39 12 31 12 29 13 39 13 30 13 28 14 39 14 29 14 27 15 39 15 28 15 26 16 39 16 27 16 25 17 39 17 26 17 22 18 39 18 23 18 23 19 39 19 24 19 24 20 39 20 25 20 40 21 43 21 79 21 45 21 79 21 46 21 48 21 79 21 45 21 49 21 50 21 79 21 48 21 49 21 79 21 50 22 51 22 79 22 51 21 52 21 79 21 52 23 53 23 79 23 61 21 79 21 60 21 59 21 60 21 79 21 58 21 59 21 79 21 57 21 58 21 79 21 56 21 57 21 79 21 55 21 56 21 79 21 54 24 55 24 79 24 53 21 54 21 79 21 78 25 40 25 77 25 76 26 77 26 40 26 63 27 62 27 40 27 75 28 76 28 40 28 74 29 75 29 40 29 73 30 74 30 40 30 72 31 73 31 40 31 71 32 72 32 40 32 70 33 71 33 40 33 69 34 70 34 40 34 68 35 69 35 40 35 67 36 68 36 40 36 66 37 67 37 40 37 62 38 64 38 40 38 64 39 65 39 40 39 65 40 66 40 40 40 25 41 65 41 24 41 38 42 61 42 4 42 12 43 51 43 11 43 38 44 43 44 1 44 26 45 66 45 25 45 13 46 52 46 12 46 0 42 40 42 39 42 27 47 67 47 26 47 14 48 53 48 13 48 5 49 79 49 38 49 28 50 68 50 27 50 15 51 54 51 14 51 29 52 69 52 28 52 16 53 55 53 15 53 38 54 47 54 7 54 39 42 41 42 2 42 30 55 70 55 29 55 17 56 56 56 16 56 8 57 45 57 6 57 1 58 42 58 0 58 31 59 71 59 30 59 18 60 57 60 17 60 2 61 44 61 3 61 32 62 72 62 31 62 19 63 58 63 18 63 6 64 46 64 5 64 33 65 73 65 32 65 37 66 40 66 78 66 20 67 59 67 19 67 6 68 47 68 7 68 34 69 74 69 33 69 4 70 60 70 20 70 7 71 48 71 8 71 35 72 75 72 34 72 22 73 63 73 21 73 9 74 48 74 8 74 36 75 76 75 35 75 21 76 40 76 39 76 23 77 62 77 22 77 10 78 49 78 9 78 37 79 77 79 36 79 24 80 64 80 23 80 11 81 50 81 10 81 3 44 79 44 38 44 39 0 2 0 3 0 38 0 1 0 0 0 39 0 3 0 38 0 44 21 41 21 40 21 40 21 42 21 43 21 79 21 44 21 40 21 25 41 66 41 65 41 38 42 79 42 61 42 12 82 52 82 51 82 38 44 79 44 43 44 26 83 67 83 66 83 13 84 53 84 52 84 0 42 42 42 40 42 27 85 68 85 67 85 14 86 54 86 53 86 5 87 46 87 79 87 28 88 69 88 68 88 15 89 55 89 54 89 29 90 70 90 69 90 16 91 56 91 55 91 38 92 79 92 47 92 39 42 40 42 41 42 30 55 71 55 70 55 17 93 57 93 56 93 8 94 48 94 45 94 1 58 43 58 42 58 31 95 72 95 71 95 18 96 58 96 57 96 2 61 41 61 44 61 32 97 73 97 72 97 19 98 59 98 58 98 6 99 45 99 46 99 33 100 74 100 73 100 37 101 39 101 40 101 20 67 60 67 59 67 6 102 45 102 47 102 34 69 75 69 74 69 4 103 61 103 60 103 7 80 47 80 48 80 35 104 76 104 75 104 22 105 62 105 63 105 9 106 49 106 48 106 36 107 77 107 76 107 21 108 63 108 40 108 23 109 64 109 62 109 10 110 50 110 49 110 37 111 78 111 77 111 24 112 65 112 64 112 11 113 51 113 50 113 3 44 44 44 79 44</p>
         </polylist>
       </mesh>
     </geometry>
@@ -83,7 +83,7 @@
   <library_visual_scenes>
     <visual_scene id="Scene" name="Scene">
       <node id="Plane" name="Plane" type="NODE">
-        <matrix sid="transform">0.4856636 0 0 0 0 0.6802911 0 -4.76837e-7 0 0 1 0 0 0 0 1</matrix>
+        <matrix sid="transform">1 0 0 0 0 1 0 -4.76837e-7 0 0 1 0 0 0 0 1</matrix>
         <instance_geometry url="#Plane_004-mesh" name="Plane">
           <bind_material>
             <technique_common>

src/main/resources/meshes/turning_pickup.dae

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool>
+    </contributor>
+    <created>2017-09-19T15:45:46</created>
+    <modified>2017-09-19T15:45:46</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.004555753 0.0885511 0.003947978 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_002_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.64 0.1458963 0.001825521 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001_001-material" name="Material_001_001">
+      <instance_effect url="#Material_001_001-effect"/>
+    </material>
+    <material id="Material_002_001-material" name="Material_002_001">
+      <instance_effect url="#Material_002_001-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Icosphere_001-mesh" name="Icosphere.001">
+      <mesh>
+        <source id="Icosphere_001-mesh-positions">
+          <float_array id="Icosphere_001-mesh-positions-array" count="126">0 0 -1 0.7236073 -0.5257253 -0.4472195 -0.276388 -0.8506492 -0.4472199 -0.8944262 0 -0.4472156 -0.276388 0.8506492 -0.4472199 0.7236073 0.5257253 -0.4472195 0.276388 -0.8506492 0.4472199 -0.7236073 -0.5257253 0.4472195 -0.7236073 0.5257253 0.4472195 0.276388 0.8506492 0.4472199 0.8944262 0 0.4472156 0 0 1 -0.1624554 -0.4999952 -0.8506544 0.4253227 -0.3090114 -0.8506542 0.2628688 -0.8090116 -0.5257377 0.8506479 0 -0.5257359 0.4253227 0.3090114 -0.8506542 -0.5257298 0 -0.8506517 -0.6881894 -0.4999969 -0.5257362 -0.1624554 0.4999952 -0.8506544 -0.6881894 0.4999969 -0.5257362 0.2628688 0.8090116 -0.5257377 0.9510579 -0.3090126 0 0.9510579 0.3090126 0 0 -1 0 0.5877856 -0.8090167 0 -0.9510579 -0.3090126 0 -0.5877856 -0.8090167 0 -0.5877856 0.8090167 0 -0.9510579 0.3090126 0 0.5877856 0.8090167 0 0 1 0 0.6881894 -0.4999969 0.5257362 -0.2628688 -0.8090116 0.5257377 -0.8506479 0 0.5257359 -0.2628688 0.8090116 0.5257377 0.6881894 0.4999969 0.5257362 0.1624554 -0.4999952 0.8506544 0.5257298 0 0.8506517 -0.4253227 -0.3090114 0.8506542 -0.4253227 0.3090114 0.8506542 0.1624554 0.4999952 0.8506544</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-positions-array" count="42" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-normals">
+          <float_array id="Icosphere_001-mesh-normals-array" count="240">0.7002241 -0.2680317 -0.6616988 0.9049891 -0.2680316 -0.3303847 0.02474653 -0.9435215 -0.330386 -0.8896973 -0.3150947 -0.3303849 -0.5746018 0.7487837 -0.3303875 0.5345759 0.7778646 -0.3303867 0.4089462 -0.6284253 0.6616985 -0.4712997 -0.5831224 0.6616985 -0.7002241 0.2680317 0.6616988 0.03853034 0.7487788 0.6616991 0.7240421 0.1947362 0.6616954 0.4911195 0.356821 0.7946575 0.4089463 0.6284252 0.6616985 -0.1875942 0.5773453 0.7946577 -0.4712997 0.5831224 0.6616985 -0.6070605 0 0.7946557 -0.7002241 -0.2680318 0.6616988 -0.1875942 -0.5773453 0.7946577 0.03853034 -0.7487788 0.6616991 0.4911194 -0.356821 0.7946576 0.7240421 -0.1947363 0.6616954 0.8896973 0.3150946 0.3303849 0.7946556 0.5773479 0.1875951 0.5746018 0.7487836 0.3303875 -0.02474653 0.9435214 0.3303861 -0.3035309 0.9341714 0.1875976 -0.5345759 0.7778646 0.3303867 -0.9049891 0.2680316 0.3303846 -0.9822458 0 0.1875985 -0.9049891 -0.2680316 0.3303846 -0.5345759 -0.7778646 0.3303867 -0.3035309 -0.9341714 0.1875975 -0.02474653 -0.9435214 0.3303861 0.5746018 -0.7487836 0.3303875 0.7946556 -0.5773479 0.1875951 0.8896973 -0.3150946 0.3303849 0.3035309 0.9341714 -0.1875975 0.02474653 0.9435215 -0.330386 -0.7946556 0.5773479 -0.1875951 -0.8896973 0.3150945 -0.3303849 -0.7946556 -0.5773479 -0.1875951 -0.5746018 -0.7487836 -0.3303875 0.3035309 -0.9341714 -0.1875976 0.5345759 -0.7778645 -0.3303867 0.9822458 0 -0.1875985 0.9049891 0.2680316 -0.3303847 0.4712997 0.5831224 -0.6616986 0.1875942 0.5773453 -0.7946577 -0.0385304 0.7487788 -0.6616991 -0.4089462 0.6284252 -0.6616984 -0.4911194 0.356821 -0.7946576 -0.7240421 0.1947362 -0.6616954 -0.7240421 -0.1947362 -0.6616954 -0.4911195 -0.356821 -0.7946575 -0.4089462 -0.6284252 -0.6616984 0.7002241 0.2680318 -0.6616988 0.6070605 0 -0.7946556 -0.0385304 -0.7487788 -0.6616991 0.1875942 -0.5773453 -0.7946577 0.4712997 -0.5831224 -0.6616986 0.1023808 -0.3150898 -0.9435235 -0.2680341 -0.1947365 -0.9435229 -0.2680341 0.1947365 -0.9435229 0.1023808 0.3150898 -0.9435235 0.802609 -0.5831265 -0.1256273 -0.306569 -0.9435216 -0.1256289 -0.9920774 0 -0.1256284 -0.306569 0.9435216 -0.1256289 0.802609 0.5831265 -0.1256273 0.2680341 0.1947365 0.9435229 -0.1023808 0.3150899 0.9435235 -0.3313045 0 0.943524 -0.1023808 -0.3150898 0.9435235 0.2680341 -0.1947365 0.9435229 0.306569 0.9435216 0.1256289 -0.802609 0.5831265 0.1256274 -0.802609 -0.5831265 0.1256274 0.306569 -0.9435216 0.1256289 0.9920774 0 0.1256284 0.3313045 0 -0.943524</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-normals-array" count="80" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-map-0">
+          <float_array id="Icosphere_001-mesh-map-0-array" count="480">0.1891562 0.4353454 0.2201194 0.3408505 0.2923961 0.4111046 0.1891562 0.4353454 0.2923961 0.4111046 0.2610388 0.5272238 0.06585121 0.2636542 0.1202549 0.3546833 1.02655e-4 0.3599037 0.1891674 0.09197556 0.120263 0.1726311 0.07693755 0.06042814 0.3900915 0.1577098 0.2924051 0.1162222 0.3863589 0.0410583 0.3900838 0.3696232 0.3989981 0.2636671 0.4998953 0.3296785 0.6099237 0.1577003 0.7076132 0.1162198 0.6911104 0.216345 0.6099155 0.3696137 0.6010091 0.2636568 0.6911069 0.3109756 0.8108381 0.4353509 0.7076001 0.4111025 0.779882 0.3408538 0.934156 0.263669 0.8797454 0.354694 0.833759 0.263666 0.8108526 0.09198099 0.8797511 0.1726418 0.7798885 0.1864736 0.7798885 0.1864736 0.8797511 0.1726418 0.833759 0.263666 0.8797511 0.1726418 0.934156 0.263669 0.833759 0.263666 0.833759 0.263666 0.8797454 0.354694 0.779882 0.3408538 0.8797454 0.354694 0.8108381 0.4353509 0.779882 0.3408538 0.779882 0.3408538 0.7076001 0.4111025 0.6911069 0.3109756 0.7076001 0.4111025 0.6099155 0.3696137 0.6911069 0.3109756 0.6911069 0.3109756 0.6010091 0.2636568 0.6911104 0.216345 0.6010091 0.2636568 0.6099237 0.1577003 0.6911104 0.216345 0.6911104 0.216345 0.7076132 0.1162198 0.7798885 0.1864736 0.7076132 0.1162198 0.8108526 0.09198099 0.7798885 0.1864736 0.923085 0.06044203 0.8797511 0.1726418 0.8108526 0.09198099 0.923085 0.06044203 0.9998974 0.16742 0.8797511 0.1726418 0.9998974 0.16742 0.934156 0.263669 0.8797511 0.1726418 0.9998974 0.3599234 0.8797454 0.354694 0.934156 0.263669 0.9998974 0.3599234 0.923074 0.4668999 0.8797454 0.354694 0.923074 0.4668999 0.8108381 0.4353509 0.8797454 0.354694 0.7389487 0.527224 0.7076001 0.4111025 0.8108381 0.4353509 0.7389487 0.527224 0.6136447 0.4862654 0.7076001 0.4111025 0.6136447 0.4862654 0.6099155 0.3696137 0.7076001 0.4111025 0.5001069 0.3296607 0.6010091 0.2636568 0.6099155 0.3696137 0.5001069 0.3296607 0.5001106 0.1976431 0.6010091 0.2636568 0.5001106 0.1976431 0.6099237 0.1577003 0.6010091 0.2636568 0.613665 0.041049 0.7076132 0.1162198 0.6099237 0.1577003 0.613665 0.041049 0.7389741 1.02655e-4 0.7076132 0.1162198 0.7389741 1.02655e-4 0.8108526 0.09198099 0.7076132 0.1162198 0.4998953 0.3296785 0.3989981 0.2636671 0.4999017 0.1976609 0.3989981 0.2636671 0.3900915 0.1577098 0.4999017 0.1976609 0.3863589 0.0410583 0.2924051 0.1162222 0.2610529 1.02655e-4 0.2924051 0.1162222 0.1891674 0.09197556 0.2610529 1.02655e-4 0.07693755 0.06042814 0.120263 0.1726311 1.17172e-4 0.1674003 0.120263 0.1726311 0.06585121 0.2636542 1.17172e-4 0.1674003 1.02655e-4 0.3599037 0.1202549 0.3546833 0.07691794 0.466886 0.1202549 0.3546833 0.1891562 0.4353454 0.07691794 0.466886 0.2610388 0.5272238 0.2923961 0.4111046 0.3863458 0.4862747 0.2923961 0.4111046 0.3900838 0.3696232 0.3863458 0.4862747 0.3088967 0.3109791 0.3989981 0.2636671 0.3900838 0.3696232 0.3088967 0.3109791 0.3089004 0.2163485 0.3989981 0.2636671 0.3089004 0.2163485 0.3900915 0.1577098 0.3989981 0.2636671 0.3089004 0.2163485 0.2924051 0.1162222 0.3900915 0.1577098 0.3089004 0.2163485 0.2201245 0.1864705 0.2924051 0.1162222 0.2201245 0.1864705 0.1891674 0.09197556 0.2924051 0.1162222 0.2201245 0.1864705 0.120263 0.1726311 0.1891674 0.09197556 0.2201245 0.1864705 0.1662483 0.2636588 0.120263 0.1726311 0.1662483 0.2636588 0.06585121 0.2636542 0.120263 0.1726311 0.2923961 0.4111046 0.3088967 0.3109791 0.3900838 0.3696232 0.2923961 0.4111046 0.2201194 0.3408505 0.3088967 0.3109791 0.1662483 0.2636588 0.1202549 0.3546833 0.06585121 0.2636542 0.1662483 0.2636588 0.2201194 0.3408505 0.1202549 0.3546833 0.2201194 0.3408505 0.1891562 0.4353454 0.1202549 0.3546833 0.2038319 0.6020938 0.07803589 0.775239 2.88122e-4 0.5359594 0.2038319 0.6020938 2.88122e-4 0.5359594 0.2038319 0.3880734 0.2038319 0.6020938 0.2038319 0.3880734 0.4073758 0.5359594 0.2038319 0.6020938 0.4073758 0.5359594 0.329628 0.775239 0.8690316 0.364753 0.791095 0.5663278 0.6529134 0.364753 0.5301482 0.1791203 0.6523408 0.3573763 0.407952 0.3573763 0.5301446 0.5663277 0.407952 0.3880734 0.6523372 0.3880734 0.20244 0.9919336 0.20244 0.7758153 0.4040137 0.9139961 0.4079523 0.566904 0.6095281 0.6448412 0.407952 0.7830209 0.203883 2.88122e-4 0.4073758 0.1482443 0.2038091 0.2143085 0.4073758 0.1482443 0.3295453 0.3874972 0.2038091 0.2143085 0.3295453 0.3874972 0.07795333 0.3874103 0.2038091 0.2143085 0.07795333 0.3874103 2.88122e-4 0.1481037 0.2038091 0.2143085 2.88122e-4 0.1481037 0.203883 2.88122e-4 0.2038091 0.2143085 0.6523409 0.178544 0.407952 0.1785441 0.5301446 2.88122e-4 0.7910969 0.2018641 0.6529171 2.88122e-4 0.8690339 2.88122e-4 0.8116793 0.6448401 0.6101047 0.7830221 0.6101044 0.566904 2.88169e-4 0.7758153 0.2018638 0.9139932 2.88122e-4 0.9919315 0.407952 0.7835971 0.6095241 0.9217739 0.407952 0.999712 0.07803589 0.775239 0.2038319 0.6020938 0.329628 0.775239</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-map-0-array" count="240" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Icosphere_001-mesh-vertices">
+          <input semantic="POSITION" source="#Icosphere_001-mesh-positions"/>
+        </vertices>
+        <polylist material="Material_001_001-material" count="60">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>1 0 0 13 0 1 15 0 2 1 1 3 15 1 4 22 1 5 2 2 6 14 2 7 24 2 8 3 3 9 18 3 10 26 3 11 4 4 12 20 4 13 28 4 14 5 5 15 21 5 16 30 5 17 6 6 18 32 6 19 37 6 20 7 7 21 33 7 22 39 7 23 8 8 24 34 8 25 40 8 26 9 9 27 35 9 28 41 9 29 10 10 30 36 10 31 38 10 32 38 11 33 36 11 34 41 11 35 36 12 36 9 12 37 41 12 38 41 13 39 35 13 40 40 13 41 35 14 42 8 14 43 40 14 44 40 15 45 34 15 46 39 15 47 34 16 48 7 16 49 39 16 50 39 17 51 33 17 52 37 17 53 33 18 54 6 18 55 37 18 56 37 19 57 32 19 58 38 19 59 32 20 60 10 20 61 38 20 62 23 21 63 36 21 64 10 21 65 23 22 66 30 22 67 36 22 68 30 23 69 9 23 70 36 23 71 31 24 72 35 24 73 9 24 74 31 25 75 28 25 76 35 25 77 28 26 78 8 26 79 35 26 80 29 27 81 34 27 82 8 27 83 29 28 84 26 28 85 34 28 86 26 29 87 7 29 88 34 29 89 27 30 90 33 30 91 7 30 92 27 31 93 24 31 94 33 31 95 24 32 96 6 32 97 33 32 98 25 33 99 32 33 100 6 33 101 25 34 102 22 34 103 32 34 104 22 35 105 10 35 106 32 35 107 30 36 108 21 36 109 31 36 110 21 37 111 4 37 112 31 37 113 28 38 114 20 38 115 29 38 116 20 39 117 3 39 118 29 39 119 26 40 120 18 40 121 27 40 122 18 41 123 2 41 124 27 41 125 24 42 126 14 42 127 25 42 128 14 43 129 1 43 130 25 43 131 22 44 132 15 44 133 23 44 134 15 45 135 5 45 136 23 45 137 16 46 138 21 46 139 5 46 140 16 47 141 19 47 142 21 47 143 19 48 144 4 48 145 21 48 146 19 49 147 20 49 148 4 49 149 19 50 150 17 50 151 20 50 152 17 51 153 3 51 154 20 51 155 17 52 156 18 52 157 3 52 158 17 53 159 12 53 160 18 53 161 12 54 162 2 54 163 18 54 164 15 55 165 16 55 166 5 55 167 15 56 168 13 56 169 16 56 170 12 57 171 14 57 172 2 57 173 12 58 174 13 58 175 14 58 176 13 59 177 1 59 178 14 59 179</p>
+        </polylist>
+        <polylist material="Material_002_001-material" count="20">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>0 60 180 13 60 181 12 60 182 0 61 183 12 61 184 17 61 185 0 62 186 17 62 187 19 62 188 0 63 189 19 63 190 16 63 191 1 64 192 22 64 193 25 64 194 2 65 195 24 65 196 27 65 197 3 66 198 26 66 199 29 66 200 4 67 201 28 67 202 31 67 203 5 68 204 30 68 205 23 68 206 38 69 207 41 69 208 11 69 209 41 70 210 40 70 211 11 70 212 40 71 213 39 71 214 11 71 215 39 72 216 37 72 217 11 72 218 37 73 219 38 73 220 11 73 221 30 74 222 31 74 223 9 74 224 28 75 225 29 75 226 8 75 227 26 76 228 27 76 229 7 76 230 24 77 231 25 77 232 6 77 233 22 78 234 23 78 235 10 78 236 13 79 237 0 79 238 16 79 239</p>
+        </polylist>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Icosphere" name="Icosphere" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
+        <instance_geometry url="#Icosphere_001-mesh" name="Icosphere">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001_001-material" target="#Material_001_001-material"/>
+              <instance_material symbol="Material_002_001-material" target="#Material_002_001-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>

src/main/resources/meshes/wind_walker_pickup.dae

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool>
+    </contributor>
+    <created>2017-09-19T15:46:34</created>
+    <modified>2017-09-19T15:46:34</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.03920602 0.04758029 0.8 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="Material_002_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.64 0.5287738 0.5454956 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.25 0.25 0.25 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001_001-material" name="Material_001_001">
+      <instance_effect url="#Material_001_001-effect"/>
+    </material>
+    <material id="Material_002_001-material" name="Material_002_001">
+      <instance_effect url="#Material_002_001-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Icosphere_001-mesh" name="Icosphere.001">
+      <mesh>
+        <source id="Icosphere_001-mesh-positions">
+          <float_array id="Icosphere_001-mesh-positions-array" count="126">0 0 -1 0.7236073 -0.5257253 -0.4472195 -0.276388 -0.8506492 -0.4472199 -0.8944262 0 -0.4472156 -0.276388 0.8506492 -0.4472199 0.7236073 0.5257253 -0.4472195 0.276388 -0.8506492 0.4472199 -0.7236073 -0.5257253 0.4472195 -0.7236073 0.5257253 0.4472195 0.276388 0.8506492 0.4472199 0.8944262 0 0.4472156 0 0 1 -0.1624554 -0.4999952 -0.8506544 0.4253227 -0.3090114 -0.8506542 0.2628688 -0.8090116 -0.5257377 0.8506479 0 -0.5257359 0.4253227 0.3090114 -0.8506542 -0.5257298 0 -0.8506517 -0.6881894 -0.4999969 -0.5257362 -0.1624554 0.4999952 -0.8506544 -0.6881894 0.4999969 -0.5257362 0.2628688 0.8090116 -0.5257377 0.9510579 -0.3090126 0 0.9510579 0.3090126 0 0 -1 0 0.5877856 -0.8090167 0 -0.9510579 -0.3090126 0 -0.5877856 -0.8090167 0 -0.5877856 0.8090167 0 -0.9510579 0.3090126 0 0.5877856 0.8090167 0 0 1 0 0.6881894 -0.4999969 0.5257362 -0.2628688 -0.8090116 0.5257377 -0.8506479 0 0.5257359 -0.2628688 0.8090116 0.5257377 0.6881894 0.4999969 0.5257362 0.1624554 -0.4999952 0.8506544 0.5257298 0 0.8506517 -0.4253227 -0.3090114 0.8506542 -0.4253227 0.3090114 0.8506542 0.1624554 0.4999952 0.8506544</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-positions-array" count="42" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-normals">
+          <float_array id="Icosphere_001-mesh-normals-array" count="240">0.7002241 -0.2680317 -0.6616988 0.9049891 -0.2680316 -0.3303847 0.02474653 -0.9435215 -0.330386 -0.8896973 -0.3150947 -0.3303849 -0.5746018 0.7487837 -0.3303875 0.5345759 0.7778646 -0.3303867 0.4089462 -0.6284253 0.6616985 -0.4712997 -0.5831224 0.6616985 -0.7002241 0.2680317 0.6616988 0.03853034 0.7487788 0.6616991 0.7240421 0.1947362 0.6616954 0.4911195 0.356821 0.7946575 0.4089463 0.6284252 0.6616985 -0.1875942 0.5773453 0.7946577 -0.4712997 0.5831224 0.6616985 -0.6070605 0 0.7946557 -0.7002241 -0.2680318 0.6616988 -0.1875942 -0.5773453 0.7946577 0.03853034 -0.7487788 0.6616991 0.4911194 -0.356821 0.7946576 0.7240421 -0.1947363 0.6616954 0.8896973 0.3150946 0.3303849 0.7946556 0.5773479 0.1875951 0.5746018 0.7487836 0.3303875 -0.02474653 0.9435214 0.3303861 -0.3035309 0.9341714 0.1875976 -0.5345759 0.7778646 0.3303867 -0.9049891 0.2680316 0.3303846 -0.9822458 0 0.1875985 -0.9049891 -0.2680316 0.3303846 -0.5345759 -0.7778646 0.3303867 -0.3035309 -0.9341714 0.1875975 -0.02474653 -0.9435214 0.3303861 0.5746018 -0.7487836 0.3303875 0.7946556 -0.5773479 0.1875951 0.8896973 -0.3150946 0.3303849 0.3035309 0.9341714 -0.1875975 0.02474653 0.9435215 -0.330386 -0.7946556 0.5773479 -0.1875951 -0.8896973 0.3150945 -0.3303849 -0.7946556 -0.5773479 -0.1875951 -0.5746018 -0.7487836 -0.3303875 0.3035309 -0.9341714 -0.1875976 0.5345759 -0.7778645 -0.3303867 0.9822458 0 -0.1875985 0.9049891 0.2680316 -0.3303847 0.4712997 0.5831224 -0.6616986 0.1875942 0.5773453 -0.7946577 -0.0385304 0.7487788 -0.6616991 -0.4089462 0.6284252 -0.6616984 -0.4911194 0.356821 -0.7946576 -0.7240421 0.1947362 -0.6616954 -0.7240421 -0.1947362 -0.6616954 -0.4911195 -0.356821 -0.7946575 -0.4089462 -0.6284252 -0.6616984 0.7002241 0.2680318 -0.6616988 0.6070605 0 -0.7946556 -0.0385304 -0.7487788 -0.6616991 0.1875942 -0.5773453 -0.7946577 0.4712997 -0.5831224 -0.6616986 0.1023808 -0.3150898 -0.9435235 -0.2680341 -0.1947365 -0.9435229 -0.2680341 0.1947365 -0.9435229 0.1023808 0.3150898 -0.9435235 0.802609 -0.5831265 -0.1256273 -0.306569 -0.9435216 -0.1256289 -0.9920774 0 -0.1256284 -0.306569 0.9435216 -0.1256289 0.802609 0.5831265 -0.1256273 0.2680341 0.1947365 0.9435229 -0.1023808 0.3150899 0.9435235 -0.3313045 0 0.943524 -0.1023808 -0.3150898 0.9435235 0.2680341 -0.1947365 0.9435229 0.306569 0.9435216 0.1256289 -0.802609 0.5831265 0.1256274 -0.802609 -0.5831265 0.1256274 0.306569 -0.9435216 0.1256289 0.9920774 0 0.1256284 0.3313045 0 -0.943524</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-normals-array" count="80" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Icosphere_001-mesh-map-0">
+          <float_array id="Icosphere_001-mesh-map-0-array" count="480">0.1891562 0.4353454 0.2201194 0.3408505 0.2923961 0.4111046 0.1891562 0.4353454 0.2923961 0.4111046 0.2610388 0.5272238 0.06585121 0.2636542 0.1202549 0.3546833 1.02655e-4 0.3599037 0.1891674 0.09197556 0.120263 0.1726311 0.07693755 0.06042814 0.3900915 0.1577098 0.2924051 0.1162222 0.3863589 0.0410583 0.3900838 0.3696232 0.3989981 0.2636671 0.4998953 0.3296785 0.6099237 0.1577003 0.7076132 0.1162198 0.6911104 0.216345 0.6099155 0.3696137 0.6010091 0.2636568 0.6911069 0.3109756 0.8108381 0.4353509 0.7076001 0.4111025 0.779882 0.3408538 0.934156 0.263669 0.8797454 0.354694 0.833759 0.263666 0.8108526 0.09198099 0.8797511 0.1726418 0.7798885 0.1864736 0.7798885 0.1864736 0.8797511 0.1726418 0.833759 0.263666 0.8797511 0.1726418 0.934156 0.263669 0.833759 0.263666 0.833759 0.263666 0.8797454 0.354694 0.779882 0.3408538 0.8797454 0.354694 0.8108381 0.4353509 0.779882 0.3408538 0.779882 0.3408538 0.7076001 0.4111025 0.6911069 0.3109756 0.7076001 0.4111025 0.6099155 0.3696137 0.6911069 0.3109756 0.6911069 0.3109756 0.6010091 0.2636568 0.6911104 0.216345 0.6010091 0.2636568 0.6099237 0.1577003 0.6911104 0.216345 0.6911104 0.216345 0.7076132 0.1162198 0.7798885 0.1864736 0.7076132 0.1162198 0.8108526 0.09198099 0.7798885 0.1864736 0.923085 0.06044203 0.8797511 0.1726418 0.8108526 0.09198099 0.923085 0.06044203 0.9998974 0.16742 0.8797511 0.1726418 0.9998974 0.16742 0.934156 0.263669 0.8797511 0.1726418 0.9998974 0.3599234 0.8797454 0.354694 0.934156 0.263669 0.9998974 0.3599234 0.923074 0.4668999 0.8797454 0.354694 0.923074 0.4668999 0.8108381 0.4353509 0.8797454 0.354694 0.7389487 0.527224 0.7076001 0.4111025 0.8108381 0.4353509 0.7389487 0.527224 0.6136447 0.4862654 0.7076001 0.4111025 0.6136447 0.4862654 0.6099155 0.3696137 0.7076001 0.4111025 0.5001069 0.3296607 0.6010091 0.2636568 0.6099155 0.3696137 0.5001069 0.3296607 0.5001106 0.1976431 0.6010091 0.2636568 0.5001106 0.1976431 0.6099237 0.1577003 0.6010091 0.2636568 0.613665 0.041049 0.7076132 0.1162198 0.6099237 0.1577003 0.613665 0.041049 0.7389741 1.02655e-4 0.7076132 0.1162198 0.7389741 1.02655e-4 0.8108526 0.09198099 0.7076132 0.1162198 0.4998953 0.3296785 0.3989981 0.2636671 0.4999017 0.1976609 0.3989981 0.2636671 0.3900915 0.1577098 0.4999017 0.1976609 0.3863589 0.0410583 0.2924051 0.1162222 0.2610529 1.02655e-4 0.2924051 0.1162222 0.1891674 0.09197556 0.2610529 1.02655e-4 0.07693755 0.06042814 0.120263 0.1726311 1.17172e-4 0.1674003 0.120263 0.1726311 0.06585121 0.2636542 1.17172e-4 0.1674003 1.02655e-4 0.3599037 0.1202549 0.3546833 0.07691794 0.466886 0.1202549 0.3546833 0.1891562 0.4353454 0.07691794 0.466886 0.2610388 0.5272238 0.2923961 0.4111046 0.3863458 0.4862747 0.2923961 0.4111046 0.3900838 0.3696232 0.3863458 0.4862747 0.3088967 0.3109791 0.3989981 0.2636671 0.3900838 0.3696232 0.3088967 0.3109791 0.3089004 0.2163485 0.3989981 0.2636671 0.3089004 0.2163485 0.3900915 0.1577098 0.3989981 0.2636671 0.3089004 0.2163485 0.2924051 0.1162222 0.3900915 0.1577098 0.3089004 0.2163485 0.2201245 0.1864705 0.2924051 0.1162222 0.2201245 0.1864705 0.1891674 0.09197556 0.2924051 0.1162222 0.2201245 0.1864705 0.120263 0.1726311 0.1891674 0.09197556 0.2201245 0.1864705 0.1662483 0.2636588 0.120263 0.1726311 0.1662483 0.2636588 0.06585121 0.2636542 0.120263 0.1726311 0.2923961 0.4111046 0.3088967 0.3109791 0.3900838 0.3696232 0.2923961 0.4111046 0.2201194 0.3408505 0.3088967 0.3109791 0.1662483 0.2636588 0.1202549 0.3546833 0.06585121 0.2636542 0.1662483 0.2636588 0.2201194 0.3408505 0.1202549 0.3546833 0.2201194 0.3408505 0.1891562 0.4353454 0.1202549 0.3546833 0.2038319 0.6020938 0.07803589 0.775239 2.88122e-4 0.5359594 0.2038319 0.6020938 2.88122e-4 0.5359594 0.2038319 0.3880734 0.2038319 0.6020938 0.2038319 0.3880734 0.4073758 0.5359594 0.2038319 0.6020938 0.4073758 0.5359594 0.329628 0.775239 0.8690316 0.364753 0.791095 0.5663278 0.6529134 0.364753 0.5301482 0.1791203 0.6523408 0.3573763 0.407952 0.3573763 0.5301446 0.5663277 0.407952 0.3880734 0.6523372 0.3880734 0.20244 0.9919336 0.20244 0.7758153 0.4040137 0.9139961 0.4079523 0.566904 0.6095281 0.6448412 0.407952 0.7830209 0.203883 2.88122e-4 0.4073758 0.1482443 0.2038091 0.2143085 0.4073758 0.1482443 0.3295453 0.3874972 0.2038091 0.2143085 0.3295453 0.3874972 0.07795333 0.3874103 0.2038091 0.2143085 0.07795333 0.3874103 2.88122e-4 0.1481037 0.2038091 0.2143085 2.88122e-4 0.1481037 0.203883 2.88122e-4 0.2038091 0.2143085 0.6523409 0.178544 0.407952 0.1785441 0.5301446 2.88122e-4 0.7910969 0.2018641 0.6529171 2.88122e-4 0.8690339 2.88122e-4 0.8116793 0.6448401 0.6101047 0.7830221 0.6101044 0.566904 2.88169e-4 0.7758153 0.2018638 0.9139932 2.88122e-4 0.9919315 0.407952 0.7835971 0.6095241 0.9217739 0.407952 0.999712 0.07803589 0.775239 0.2038319 0.6020938 0.329628 0.775239</float_array>
+          <technique_common>
+            <accessor source="#Icosphere_001-mesh-map-0-array" count="240" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Icosphere_001-mesh-vertices">
+          <input semantic="POSITION" source="#Icosphere_001-mesh-positions"/>
+        </vertices>
+        <polylist material="Material_001_001-material" count="60">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>1 0 0 13 0 1 15 0 2 1 1 3 15 1 4 22 1 5 2 2 6 14 2 7 24 2 8 3 3 9 18 3 10 26 3 11 4 4 12 20 4 13 28 4 14 5 5 15 21 5 16 30 5 17 6 6 18 32 6 19 37 6 20 7 7 21 33 7 22 39 7 23 8 8 24 34 8 25 40 8 26 9 9 27 35 9 28 41 9 29 10 10 30 36 10 31 38 10 32 38 11 33 36 11 34 41 11 35 36 12 36 9 12 37 41 12 38 41 13 39 35 13 40 40 13 41 35 14 42 8 14 43 40 14 44 40 15 45 34 15 46 39 15 47 34 16 48 7 16 49 39 16 50 39 17 51 33 17 52 37 17 53 33 18 54 6 18 55 37 18 56 37 19 57 32 19 58 38 19 59 32 20 60 10 20 61 38 20 62 23 21 63 36 21 64 10 21 65 23 22 66 30 22 67 36 22 68 30 23 69 9 23 70 36 23 71 31 24 72 35 24 73 9 24 74 31 25 75 28 25 76 35 25 77 28 26 78 8 26 79 35 26 80 29 27 81 34 27 82 8 27 83 29 28 84 26 28 85 34 28 86 26 29 87 7 29 88 34 29 89 27 30 90 33 30 91 7 30 92 27 31 93 24 31 94 33 31 95 24 32 96 6 32 97 33 32 98 25 33 99 32 33 100 6 33 101 25 34 102 22 34 103 32 34 104 22 35 105 10 35 106 32 35 107 30 36 108 21 36 109 31 36 110 21 37 111 4 37 112 31 37 113 28 38 114 20 38 115 29 38 116 20 39 117 3 39 118 29 39 119 26 40 120 18 40 121 27 40 122 18 41 123 2 41 124 27 41 125 24 42 126 14 42 127 25 42 128 14 43 129 1 43 130 25 43 131 22 44 132 15 44 133 23 44 134 15 45 135 5 45 136 23 45 137 16 46 138 21 46 139 5 46 140 16 47 141 19 47 142 21 47 143 19 48 144 4 48 145 21 48 146 19 49 147 20 49 148 4 49 149 19 50 150 17 50 151 20 50 152 17 51 153 3 51 154 20 51 155 17 52 156 18 52 157 3 52 158 17 53 159 12 53 160 18 53 161 12 54 162 2 54 163 18 54 164 15 55 165 16 55 166 5 55 167 15 56 168 13 56 169 16 56 170 12 57 171 14 57 172 2 57 173 12 58 174 13 58 175 14 58 176 13 59 177 1 59 178 14 59 179</p>
+        </polylist>
+        <polylist material="Material_002_001-material" count="20">
+          <input semantic="VERTEX" source="#Icosphere_001-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Icosphere_001-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Icosphere_001-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>0 60 180 13 60 181 12 60 182 0 61 183 12 61 184 17 61 185 0 62 186 17 62 187 19 62 188 0 63 189 19 63 190 16 63 191 1 64 192 22 64 193 25 64 194 2 65 195 24 65 196 27 65 197 3 66 198 26 66 199 29 66 200 4 67 201 28 67 202 31 67 203 5 68 204 30 68 205 23 68 206 38 69 207 41 69 208 11 69 209 41 70 210 40 70 211 11 70 212 40 71 213 39 71 214 11 71 215 39 72 216 37 72 217 11 72 218 37 73 219 38 73 220 11 73 221 30 74 222 31 74 223 9 74 224 28 75 225 29 75 226 8 75 227 26 76 228 27 76 229 7 76 230 24 77 231 25 77 232 6 77 233 22 78 234 23 78 235 10 78 236 13 79 237 0 79 238 16 79 239</p>
+        </polylist>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Icosphere" name="Icosphere" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
+        <instance_geometry url="#Icosphere_001-mesh" name="Icosphere">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001_001-material" target="#Material_001_001-material"/>
+              <instance_material symbol="Material_002_001-material" target="#Material_002_001-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>