Merge branch 'master' into new_3d_assets

racevisionGame/src/main/java/mock/app/Event.java

@@ -77,7 +77,7 @@ public class Event {
         String boatsXMLFile = "mock/mockXML/boatTest.xml";
         String regattaXMLFile = "mock/mockXML/regattaTest.xml";
         switch (mapIndex){
-            case 0:raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
+            case 0:raceXMLFile = "mock/mockXML/ac35MapLayout.xml";
                 break;
             case 1:raceXMLFile = "mock/mockXML/oMapLayout.xml";
                 break;
@@ -90,13 +90,12 @@ public class Event {
                 boatsXMLFile = "mock/mockXML/boatTutorial.xml";
                 regattaXMLFile = "mock/mockXML/regattaTutorial.xml";
                 break;
-            default: raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
+            default: raceXMLFile = "mock/mockXML/ac35MapLayout.xml";
 
         }
 
 
         if (singlePlayer) {
-            raceXMLFile = "mock/mockXML/raceSinglePlayer.xml";
             boatsXMLFile = "mock/mockXML/boatsSinglePlayer.xml";
         }
 

racevisionGame/src/main/java/mock/model/MockRace.java

@@ -109,8 +109,6 @@ public class MockRace extends RaceState {
             colliderRegistry.addCollider(mark.getMark1());
             if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2());
         }
-
-        this.colliderRegistry.addAllColliders(boats);
     }
 
 
@@ -133,9 +131,9 @@ public class MockRace extends RaceState {
 
         this.boats.add(mockBoat);
         this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand());
+        this.colliderRegistry.addCollider(mockBoat);
 
         getRaceDataSource().incrementSequenceNumber();
-
     }
 
     /**

racevisionGame/src/main/java/shared/model/Boat.java

@@ -418,7 +418,7 @@ public class Boat extends Collider {
     @Override
     public boolean rayCast(Boat boat) {
         if(boat != this) {
-            return rayCast(boat, 15);
+            return rayCast(boat, 50);
         } else return false;
     }
 

racevisionGame/src/main/java/shared/model/Constants.java

@@ -28,7 +28,7 @@ public class Constants {
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
      * E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
      */
-    public static final int RaceTimeScale = 2;
+    public static final int RaceTimeScale = 1;
 
     /**
      * The race pre-start time, in milliseconds. 30 seconds.

racevisionGame/src/main/java/shared/model/MarkRoundingSequence.java

@@ -17,8 +17,9 @@ public class MarkRoundingSequence {
 
     /**
      * For each leg, mark rounding information.
+     * Maps between leg number and rounding data.
      */
-    private Map<Leg, MarkRoundingData> roundingPoints;
+    private Map<Integer, MarkRoundingData> roundingPoints;
 
 
 
@@ -34,7 +35,7 @@ public class MarkRoundingSequence {
      * @return Rounding points for leg.
      */
     public MarkRoundingData getRoundingData(Leg leg) {
-        return roundingPoints.get(leg);
+        return roundingPoints.get(leg.getLegNumber());
     }
 
 
@@ -139,7 +140,7 @@ public class MarkRoundingSequence {
         roundingData.setRoundCheck2Halfway(roundCheck2Halfway);
 
 
-        this.roundingPoints.put(currentLeg, roundingData);
+        this.roundingPoints.put(currentLeg.getLegNumber(), roundingData);
 
 
         //Rounding points:

racevisionGame/src/main/java/shared/model/RaceClock.java

@@ -68,11 +68,11 @@ public class RaceClock {
     /**
      * Format string used for duration before it has started.
      */
-    private String durationBeforeStartFormat = "Starting in: %02d:%02d:%02d";
+    private String durationBeforeStartFormat = "%02d:%02d:%02d";
     /**
      * Format string used for duration once the race has started.
      */
-    private String durationAfterStartFormat = "Time: %02d:%02d:%02d";
+    private String durationAfterStartFormat = "%02d:%02d:%02d";
 
 
 

racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java

@@ -67,9 +67,9 @@ public class NextMarkController {
 
         Shape3D arrow = Assets3D.loadX3d(arrowPath);
 
-        arrow.setScaleX(25);
+        arrow.setScaleX(15);
         arrow.setScaleY(25);
-        arrow.setScaleZ(100);
+        arrow.setScaleZ(50);
         arrow.setRotationAxis(new Point3D(1,0,0));
 
         arrowStackPane3d.getChildren().add(arrow);

racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java

@@ -1,9 +1,7 @@
 package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import eu.hansolo.medusa.*;
-import eu.hansolo.medusa.events.UpdateEvent;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -104,6 +102,7 @@ public class RaceViewController extends Controller {
     private @FXML NextMarkController nextMarkController;
     private @FXML GridPane canvasBase;
     private @FXML GridPane canvasBase1;
+    private @FXML GridPane canvasBase2;
     private @FXML SplitPane racePane;
     private @FXML StackPane arrowPane;
     private @FXML Pane nextMarkPane;
@@ -145,9 +144,9 @@ public class RaceViewController extends Controller {
         deathPane.setVisible(false);
         tutorialCheck();
         initKeypressHandler();
-        initialiseRaceVisuals();
-        initialiseRaceCanvas();
         healthLoop();
+        initialiseRaceVisuals();
+
     }
 
     /**
@@ -301,7 +300,7 @@ public class RaceViewController extends Controller {
         //Create a gauge with a frame and background that utilizes a Medusa gauge
         fGauge = FGaugeBuilder
                 .create()
-                .prefSize(200, 200)
+                .prefSize(190, 190)
                 .gauge(gauge)
                 .gaugeDesign(GaugeDesign.METAL)
                 .gaugeBackground(GaugeDesign.GaugeBackground.CARBON)
@@ -322,12 +321,11 @@ public class RaceViewController extends Controller {
         initialiseHealthPane();
         initialiseRaceClock();
         initialiseSpeedometer();
+        initialiseRaceCanvas();
         raceTimer();    // start the timer
-        nextMarkPane.toFront();
+        //nextMarkPane.toFront();
         speedometerLoop();
         new Sparkline(this.raceState, this.sparklineChart);
-        timeZone.setText(this.raceState.getRaceClock().getTimeZone());
-        arrowController.setWindProperty(this.raceState.windProperty());
     }
 
 
@@ -466,7 +464,7 @@ public class RaceViewController extends Controller {
                 // Track player boat with camera
                 viewSubjects.add(boatModel);
                 Platform.runLater(() -> {
-                    view3D.trackSubject(boatModel);
+                    view3D.trackSubject(boatModel, 0);
                     view3D.setThirdPerson();
                 });
 
@@ -646,7 +644,12 @@ public class RaceViewController extends Controller {
 
         // Bind zooming to scrolling
         view3D.setOnScroll(e -> {
-            view3D.updateDistance(e.getDeltaY());
+            //view3D.updateDistance(e.getDeltaY());
+            if (e.getDeltaY() > 0) {
+                view3D.zoomIn();
+            } else {
+                view3D.zoomOut();
+            }
         });
 
         // Bind zooming to keypress (Z/X default)
@@ -1226,22 +1229,23 @@ public class RaceViewController extends Controller {
 
     private void bigMap(){
         if (mapToggle){
-            raceCanvas.widthProperty().bind(canvasBase.widthProperty());
+            raceCanvas.widthProperty().bind(canvasBase2.widthProperty());
-            raceCanvas.heightProperty().bind(canvasBase.heightProperty());
+            raceCanvas.heightProperty().bind(canvasBase2.heightProperty());
 
             raceCanvas.setFullScreen(true);
             raceCanvas.setOpacity(0.6);
 
             canvasBase1.getChildren().remove(raceCanvas);
-            canvasBase.getChildren().add(1, raceCanvas);
+            canvasBase2.getChildren().add(0, raceCanvas);
 
         }else{
             raceCanvas.widthProperty().bind(canvasBase1.widthProperty());
             raceCanvas.heightProperty().bind(canvasBase1.heightProperty());
 
             raceCanvas.setFullScreen(false);
+            raceCanvas.setOpacity(1);
 
-            canvasBase.getChildren().remove(raceCanvas);
+            canvasBase2.getChildren().remove(raceCanvas);
             canvasBase1.getChildren().add(0, raceCanvas);
         }
         mapToggle = !mapToggle;

racevisionGame/src/main/java/visualiser/Controllers/TitleController.java

@@ -1,17 +1,31 @@
 package visualiser.Controllers;
 
+import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import javafx.animation.AnimationTimer;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
+import javafx.scene.AmbientLight;
+import javafx.scene.PointLight;
+import javafx.scene.control.Button;
 import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.media.AudioClip;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.MeshView;
 import javafx.stage.Modality;
 import mock.exceptions.EventConstructionException;
 import visualiser.app.App;
+import visualiser.layout.SeaSurface;
+import visualiser.layout.SkyBox;
+import visualiser.layout.Subject3D;
+import visualiser.layout.View3D;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,9 +44,69 @@ import java.util.logging.Logger;
 public class TitleController extends Controller {
     private @FXML RadioButton dayModeRD;
     private @FXML RadioButton nightModeRD;
-    private @FXML Label tutorialLabel;
+    private @FXML Button tutorialButton;
-    private @FXML Pane menuPane;
     private @FXML ImageView imgSun;
+    private @FXML GridPane view3DContainer;
+    private ToggleGroup toggleGroup = new ToggleGroup();
+
+    public void initialize() {
+        dayModeRD.setToggleGroup(toggleGroup);
+        nightModeRD.setToggleGroup(toggleGroup);
+
+        AmbientLight ambientLight = new AmbientLight(Color.web("#CCCCFF"));
+        ambientLight.setTranslateX(250);
+        ambientLight.setTranslateZ(210);
+        ambientLight.setLightOn(true);
+
+        PointLight pointLight = new PointLight(Color.web("#AAAAFF"));
+        pointLight.setTranslateX(250);
+        pointLight.setTranslateZ(210);
+        pointLight.setLightOn(true);
+
+        ObservableList<Subject3D> subjects = FXCollections.observableArrayList();
+        View3D view3D = new View3D();
+        view3D.addAmbientLight(ambientLight);
+        view3D.addPointLight(pointLight);
+        view3D.setDistance(10);
+        view3D.setPitch(5);
+        view3D.setItems(subjects);
+
+        SkyBox skyBox = new SkyBox(750,200,250,0,250);
+        subjects.addAll(skyBox.getSkyBoxPlanes());
+
+        SeaSurface seaSurface = new SeaSurface(750, 200);
+        seaSurface.setX(250);
+        seaSurface.setZ(250);
+        subjects.add(seaSurface);
+
+        URL asset = RaceViewController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl");
+        StlMeshImporter importer = new StlMeshImporter();
+        importer.read(asset);
+        Subject3D boat = new Subject3D(new MeshView(importer.getImport()), 0);
+
+        double radius = 100;
+        boat.setX(0);
+        boat.setZ(radius);
+        boat.setScale(0.1);
+
+        subjects.add(boat);
+        view3D.trackSubject(boat, -45);
+
+        view3DContainer.add(view3D, 0, 0);
+
+        AnimationTimer loop = new AnimationTimer() {
+            double angle = -90;
+            double offset = 0.05;
+            @Override
+            public void handle(long now) {
+                boat.setX(radius * Math.cos(angle * Math.PI/180));
+                boat.setZ(radius * Math.sin(angle * Math.PI/180));
+                boat.setHeading(-angle);
+                angle += offset;
+            }
+        };
+        loop.start();
+    }
 
     /**
      * Method called when the 'host a game' button is pressed.
@@ -58,10 +132,7 @@ public class TitleController extends Controller {
      */
     public void setDayMode(){
         dayModeRD.getScene().getStylesheets().clear();
-        menuPane.getStylesheets().clear();
-        imgSun.setImage(new Image(getClass().getResource("/visualiser/images/sun.png").toExternalForm()));
         dayModeRD.getScene().getStylesheets().add("/css/dayMode.css");
-        menuPane.setStyle("-fx-background-color:  #6be6ff;");
         nightModeRD.setSelected(false);
         App.dayMode = true;
     }
@@ -71,10 +142,7 @@ public class TitleController extends Controller {
      */
     public void setNightMode(){
         nightModeRD.getScene().getStylesheets().clear();
-        menuPane.getStylesheets().clear();
-        imgSun.setImage(new Image(getClass().getResource("/visualiser/images/sunsleep.png").toExternalForm()));
         nightModeRD.getScene().getStylesheets().add("/css/nightMode.css");
-        menuPane.setStyle("-fx-background-color: #1f2c60;");
         dayModeRD.setSelected(false);
         App.dayMode = false;
     }

racevisionGame/src/main/java/visualiser/app/App.java

@@ -134,7 +134,6 @@ public class App extends Application {
         FXMLLoader loader = new FXMLLoader(getClass().getResource
                 ("/visualiser/scenes/title.fxml"));
         Parent root = loader.load();
-        stage.setResizable(false);
         Scene scene = new Scene(root);
         stage.setTitle("The Boat Game - Burgers & Boats");
         stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png")));

racevisionGame/src/main/java/visualiser/layout/View3D.java

@@ -174,7 +174,7 @@ public class View3D extends Pane {
             PickResult result = e.getPickResult();
             if(result != null && result.getIntersectedNode() != null && result.getIntersectedNode() instanceof Shape3D) {
                 untrackSubject();
-                trackSubject(shapeMap.get(result.getIntersectedNode()));
+                trackSubject(shapeMap.get(result.getIntersectedNode()), 0);
                 setThirdPerson();
             }
         });
@@ -215,15 +215,16 @@ public class View3D extends Pane {
     /**
      * Set camera to follow the selected subject
      * @param subject to track
+     * @param yaw to add to boat heading
      */
-    public void trackSubject(Subject3D subject) {
+    public void trackSubject(Subject3D subject, double yaw) {
         target.set(subject);
 
         this.trackBoat = new AnimationTimer() {
             @Override
             public void handle(long now) {
                 updatePivot(target.get().getPosition());
-                setYaw(target.get().getHeading().getAngle());
+                setYaw(target.get().getHeading().getAngle() + yaw);
             }
         };
         trackBoat.start();
@@ -268,8 +269,10 @@ public class View3D extends Pane {
     public void updateDistance(double delta) {
         double newDistance = -this.distance.getZ() + delta;
         if (target.get() == null){
-            if (newDistance > MAX_ZOOM_LIMIT){
+            if (newDistance > MAX_ZOOM_LIMIT) {
                 setDistance(MAX_ZOOM_LIMIT);
+            } else if (newDistance <= ZOOM_IN_LIMIT) {
+                setDistance(ZOOM_IN_LIMIT);
             } else {
                 setDistance(newDistance);
             }

racevisionGame/src/main/java/visualiser/layout/WindCompass.java

@@ -25,7 +25,7 @@ public class WindCompass extends View3D {
     };
 
     public WindCompass(View3D view3D, Property<Wind> wind){
-        super();
+        super(false);
         this.wind = wind;
         this.view3D = view3D;
         this.followView3D.start();

racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java

@@ -647,7 +647,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
 
         //rounding lines
         if (isFullScreen){
-            drawRoundingLines();
+//            drawRoundingLines();
             drawRaceLine();
         }
 
@@ -794,19 +794,12 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     }
 
     private Color getLineColor(Leg leg) {
-        for (VisualiserBoat boat : raceState.getBoats()) {
+        if(ThisBoat.getInstance().getLegNumber() == leg.getLegNumber()){
-            if (boat.isClientBoat()) {
-                if (boat.getCurrentLeg() == leg) {
             return Color.ORANGE;
-                } else {
-                    return Color.MEDIUMAQUAMARINE;
-                }
         }else{
             return Color.MEDIUMAQUAMARINE;
         }
     }
-        return Color.MEDIUMAQUAMARINE;
-    }
 
     private void drawArrowHead(GPSCoordinate start, GPSCoordinate end){
 

racevisionGame/src/main/java/visualiser/model/ThisBoat.java

@@ -35,6 +35,14 @@ public class ThisBoat {
         }
     }
 
+    public int getLegNumber(){
+        if(this.boat != null){
+            return this.boat.getCurrentLeg().getLegNumber();
+        }else{
+            return 0;
+        }
+    }
+
     public void setBoat(VisualiserBoat boat) {
         this.boat = boat;
     }

racevisionGame/src/main/resources/mock/mockXML/ac35MapLayout.xml

@@ -37,16 +37,16 @@
         </CompoundMark>
     </Course>
     <CourseLimit>
-        <Limit Lat="32.313922" Lon="-64.837168" SeqID="1"/>
+        <Limit Lat="32.311922" Lon="-64.841168" SeqID="1"/>
-        <Limit Lat="32.317379" Lon="-64.839291" SeqID="2"/>
+        <Limit Lat="32.319379" Lon="-64.841291" SeqID="2"/>
-        <Limit Lat="32.317911" Lon="-64.836996" SeqID="3"/>
+        <Limit Lat="32.319911" Lon="-64.836996" SeqID="3"/>
-        <Limit Lat="32.317257" Lon="-64.83626" SeqID="4"/>
+        <Limit Lat="32.319257" Lon="-64.83326" SeqID="4"/>
-        <Limit Lat="32.304273" Lon="-64.822834" SeqID="5"/>
+        <Limit Lat="32.305273" Lon="-64.821834" SeqID="5"/>
-        <Limit Lat="32.279097" Lon="-64.841545" SeqID="6"/>
+        <Limit Lat="32.276097" Lon="-64.839545" SeqID="6"/>
-        <Limit Lat="32.279604" Lon="-64.849871" SeqID="7"/>
+        <Limit Lat="32.275604" Lon="-64.851871" SeqID="7"/>
-        <Limit Lat="32.289545" Lon="-64.854162" SeqID="8"/>
+        <Limit Lat="32.286545" Lon="-64.856162" SeqID="8"/>
-        <Limit Lat="32.290198" Lon="-64.858711" SeqID="9"/>
+        <Limit Lat="32.288198" Lon="-64.860711" SeqID="9"/>
-        <Limit Lat="32.297164" Lon="-64.856394" SeqID="10"/>
+        <Limit Lat="32.299164" Lon="-64.857394" SeqID="10"/>
-        <Limit Lat="32.296148" Lon="-64.849184" SeqID="11"/>
+        <Limit Lat="32.299148" Lon="-64.851184" SeqID="11"/>
     </CourseLimit>
 </Race>

racevisionGame/src/main/resources/mock/mockXML/raceSinglePlayer.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Race>
-    <RaceID>5326</RaceID>
-    <RaceType>FLEET</RaceType>
-    <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
-    <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
-    <Participants>
-    </Participants>
-    <CompoundMarkSequence>
-        <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="3" CompoundMarkID="4" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="4" CompoundMarkID="3" Rounding="Starboard" ZoneSize="3" />
-        <Corner SeqID="5" CompoundMarkID="4" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="6" CompoundMarkID="5" Rounding="SP" ZoneSize="3"/>
-    </CompoundMarkSequence>
-    <Course>
-        <CompoundMark CompoundMarkID="1" Name="Start Line">
-            <Mark SeqId="1" Name="PRO" TargetLat="32.296577" TargetLng="-64.854304" SourceID="101"/>
-            <Mark SeqId="2" Name="PIN" TargetLat="32.293771" TargetLng="-64.855242" SourceID="102"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="2" Name="Marker 1">
-            <Mark Name="Marker1" TargetLat="32.293039" TargetLng="-64.843983" SourceID="103"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="3" Name="Windward Gate">
-            <Mark Name="WGL" SeqId="1" TargetLat="32.28468" TargetLng="-64.850045" SourceID="104"/>
-            <Mark Name="WGR" SeqId="2" TargetLat="32.280164" TargetLng="-64.847591" SourceID="105"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="4" Name="Leeward Gate">
-            <Mark Name="LGL" SeqId="1" TargetLat="32.309693" TargetLng="-64.835249" SourceID="106"/>
-            <Mark Name="LGR" SeqId="2" TargetLat="32.308046" TargetLng="-64.831785" SourceID="107"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="5" Name="Finish Line">
-            <Mark Name="FL" SeqId="1" TargetLat="32.317379" TargetLng="-64.839291" SourceID="108"/>
-            <Mark Name="FR" SeqId="2" TargetLat="32.317257" TargetLng="-64.83626" SourceID="109"/>
-        </CompoundMark>
-    </Course>
-    <CourseLimit>
-        <Limit Lat="32.313922" Lon="-64.837168" SeqID="1"/>
-        <Limit Lat="32.317379" Lon="-64.839291" SeqID="2"/>
-        <Limit Lat="32.317911" Lon="-64.836996" SeqID="3"/>
-        <Limit Lat="32.317257" Lon="-64.83626" SeqID="4"/>
-        <Limit Lat="32.304273" Lon="-64.822834" SeqID="5"/>
-        <Limit Lat="32.279097" Lon="-64.841545" SeqID="6"/>
-        <Limit Lat="32.279604" Lon="-64.849871" SeqID="7"/>
-        <Limit Lat="32.289545" Lon="-64.854162" SeqID="8"/>
-        <Limit Lat="32.290198" Lon="-64.858711" SeqID="9"/>
-        <Limit Lat="32.297164" Lon="-64.856394" SeqID="10"/>
-        <Limit Lat="32.296148" Lon="-64.849184" SeqID="11"/>
-    </CourseLimit>
-</Race>

racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Race>
-    <RaceID>5326</RaceID>
-    <RaceType>FLEET</RaceType>
-    <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
-    <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
-    <Participants>
-    </Participants>
-    <CompoundMarkSequence>
-        <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="3" CompoundMarkID="4" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="4" CompoundMarkID="3" Rounding="Starboard" ZoneSize="3" />
-        <Corner SeqID="5" CompoundMarkID="4" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="6" CompoundMarkID="5" Rounding="SP" ZoneSize="3"/>
-    </CompoundMarkSequence>
-    <Course>
-        <CompoundMark CompoundMarkID="1" Name="Start Line">
-            <Mark SeqId="1" Name="PRO" TargetLat="32.296577" TargetLng="-64.854304" SourceID="101"/>
-            <Mark SeqId="2" Name="PIN" TargetLat="32.293771" TargetLng="-64.855242" SourceID="102"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="2" Name="Marker 1">
-            <Mark Name="Marker1" TargetLat="32.293039" TargetLng="-64.843983" SourceID="103"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="3" Name="Windward Gate">
-            <Mark Name="WGL" SeqId="1" TargetLat="32.28468" TargetLng="-64.850045" SourceID="104"/>
-            <Mark Name="WGR" SeqId="2" TargetLat="32.280164" TargetLng="-64.847591" SourceID="105"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="4" Name="Leeward Gate">
-            <Mark Name="LGL" SeqId="1" TargetLat="32.309693" TargetLng="-64.835249" SourceID="106"/>
-            <Mark Name="LGR" SeqId="2" TargetLat="32.308046" TargetLng="-64.831785" SourceID="107"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="5" Name="Finish Line">
-            <Mark Name="FL" SeqId="1" TargetLat="32.317379" TargetLng="-64.839291" SourceID="108"/>
-            <Mark Name="FR" SeqId="2" TargetLat="32.317257" TargetLng="-64.83626" SourceID="109"/>
-        </CompoundMark>
-    </Course>
-    <CourseLimit>
-        <Limit Lat="32.313922" Lon="-64.837168" SeqID="1"/>
-        <Limit Lat="32.317379" Lon="-64.839291" SeqID="2"/>
-        <Limit Lat="32.317911" Lon="-64.836996" SeqID="3"/>
-        <Limit Lat="32.317257" Lon="-64.83626" SeqID="4"/>
-        <Limit Lat="32.304273" Lon="-64.822834" SeqID="5"/>
-        <Limit Lat="32.279097" Lon="-64.841545" SeqID="6"/>
-        <Limit Lat="32.279604" Lon="-64.849871" SeqID="7"/>
-        <Limit Lat="32.289545" Lon="-64.854162" SeqID="8"/>
-        <Limit Lat="32.290198" Lon="-64.858711" SeqID="9"/>
-        <Limit Lat="32.297164" Lon="-64.856394" SeqID="10"/>
-        <Limit Lat="32.296148" Lon="-64.849184" SeqID="11"/>
-    </CourseLimit>
-</Race>

racevisionGame/src/main/resources/visualiser/scenes/arrow.fxml

@@ -1,49 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
-<GridPane fx:id="arrowGridPane" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ArrowController">
+
+<GridPane fx:id="arrowGridPane" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ArrowController">
    <columnConstraints>
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
    </columnConstraints>
    <rowConstraints>
-      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="20.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
    </rowConstraints>
    <children>
-      <Pane fx:id="compass" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0">
+      <GridPane GridPane.rowIndex="1">
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints minHeight="50.0" vgrow="SOMETIMES" />
+         </rowConstraints>
          <children>
-            <StackPane fx:id="arrowStackPane" prefHeight="125.0" prefWidth="125.0">
+            <StackPane fx:id="arrowStackPane" prefHeight="50.0" prefWidth="50.0">
                <children>
-                  <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0">
+                  <ImageView fx:id="arrowImage" fitHeight="30.0" fitWidth="30.0" StackPane.alignment="CENTER">
                      <image>
                         <Image url="@../images/arrow.png" />
                      </image>
                   </ImageView>
+                  <Circle fx:id="circle" fill="#1f93ff00" radius="30.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" StackPane.alignment="TOP_LEFT" />
                </children>
             </StackPane>
-            <Circle fx:id="circle" fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" />
+            <Label fx:id="northLabel" text="N" GridPane.halignment="CENTER" GridPane.valignment="TOP">
-            <Label fx:id="northLabel" layoutX="55.0" layoutY="1.0" text="N">
                <font>
-                  <Font name="System Bold" size="18.0" />
+                  <Font name="System Bold" size="10.0" />
                </font>
+               <padding>
+                  <Insets top="5.0" />
+               </padding>
             </Label>
-            <Label fx:id="windLabel" layoutX="42.0" layoutY="95.0" text="Wind">
+            <Label fx:id="windLabel" text="Wind" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
                <font>
-                  <Font name="System Bold" size="16.0" />
+                  <Font name="System Bold" size="9.0" />
                </font>
+               <padding>
+                  <Insets bottom="5.0" />
+               </padding>
             </Label>
          </children>
-      </Pane>
+      </GridPane>
-      <Label fx:id="speedLabel" text="SPEED" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="1">
+      <Label fx:id="speedLabel" text="SPEED" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.valignment="TOP">
          <font>
-            <Font name="System Bold" size="16.0" />
+            <Font name="System Bold" size="10.0" />
          </font>
          <GridPane.margin>
             <Insets />

racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.image.*?>
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.chart.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <?import java.lang.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.chart.*?>
 <?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
@@ -27,13 +21,14 @@
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
@@ -49,13 +44,6 @@
                             <rowConstraints>
                                 <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                             </rowConstraints>
-                     <children>
-                              <StackPane fx:id="nextMarkPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
-                                  <children>
-                                      <fx:include fx:id="nextMark" source="nextMark.fxml" />
-                                  </children>
-                              </StackPane>
-                     </children>
                         </GridPane>
                         <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
                             <children>
@@ -100,6 +88,21 @@
                                 </Accordion>
                             </children>
                         </Pane>
+                  <ImageView fitHeight="250.0" fitWidth="272.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="1.0">
+                     <image>
+                        <Image url="@../../images/raceViewUI_LowerRight.png" />
+                     </image>
+                  </ImageView>
+                  <ImageView fitHeight="250.0" fitWidth="272.0" layoutX="10.0" layoutY="10.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
+                     <image>
+                        <Image url="@../../images/raceViewUI_LowerLeft.png" />
+                     </image>
+                  </ImageView>
+                        <Label fx:id="FPS" mouseTransparent="true" text="FPS: 0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                            <font>
+                                <Font name="System Bold" size="15.0" />
+                            </font>
+                        </Label>
                   <GridPane fx:id="playerHealthContainer" prefHeight="75.0" prefWidth="75.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <columnConstraints>
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -111,44 +114,16 @@
                         <Insets left="10.0" top="10.0" />
                      </padding>
                   </GridPane>
-                  <VBox alignment="CENTER" prefHeight="54.0" prefWidth="608.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                        <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="150.0" />
-                     <children>
+                  <StackPane fx:id="speedPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="2.0">
-
-                                    <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" text="0:0">
-                                  <font>
-                                      <Font name="System Bold" size="15.0" />
-                                  </font>
-                              </Label>
-                              <Label fx:id="timeZone" text="Label">
-                                  <font>
-                                      <Font name="System Bold" size="15.0" />
-                                  </font>
-                              </Label>
-                     </children>
-                  </VBox>
-                        <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
-                            <font>
-                                <Font name="System Bold" size="15.0" />
-                            </font>
-                            <padding>
-                                <Insets bottom="200.0" />
-                            </padding>
-                        </Label>
-                        <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                            <children>
-                                <fx:include fx:id="arrow" source="arrow.fxml" />
-                            </children>
-                        </StackPane>
-                        <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" />
-                  <StackPane fx:id="speedPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="20.0">
                      <padding>
                         <Insets right="20.0" />
                      </padding></StackPane>
-                  <AnchorPane maxHeight="200.0" maxWidth="200.0" mouseTransparent="true" opacity="0.6" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
+                  <AnchorPane maxHeight="145.0" maxWidth="145.0" minHeight="145.0" minWidth="145.0" mouseTransparent="true" prefHeight="145.0" prefWidth="145.0" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="30.0">
                      <children>
-                        <AnchorPane maxHeight="200.0" maxWidth="200.0" prefHeight="200.0" prefWidth="216.0">
+                        <AnchorPane maxHeight="145.0" maxWidth="145.0" minHeight="145.0" minWidth="145.0" prefHeight="145.0" prefWidth="145.0">
                            <children>
-                                <GridPane fx:id="canvasBase1" maxHeight="200.0" maxWidth="200.0" prefHeight="200.0" prefWidth="216.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                <GridPane fx:id="canvasBase1" maxHeight="145.0" maxWidth="145.0" minHeight="145.0" minWidth="145.0" prefHeight="145.0" prefWidth="145.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                     <columnConstraints>
                                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
                                     </columnConstraints>
@@ -229,6 +204,49 @@
                   </StackPane>
                     </children>
                 </AnchorPane>
+            <ImageView fitHeight="150.0" fitWidth="200.0" focusTraversable="true" mouseTransparent="true" pickOnBounds="true" preserveRatio="true" StackPane.alignment="BOTTOM_CENTER">
+               <image>
+                  <Image url="@../../images/raceViewUI_LowerMiddle.png" />
+               </image>
+            </ImageView>
+            <ImageView fitHeight="115.0" fitWidth="255.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true" StackPane.alignment="TOP_CENTER">
+               <image>
+                  <Image url="@../../images/raceViewUI_UpperMiddle.png" />
+               </image>
+            </ImageView>
+            <StackPane fx:id="arrowPane" maxHeight="60.0" maxWidth="60.0" minHeight="60.0" minWidth="60.0" prefHeight="60.0" prefWidth="60.0" StackPane.alignment="BOTTOM_CENTER">
+               <StackPane.margin>
+                  <Insets bottom="25.0" left="2.0" />
+               </StackPane.margin>
+            </StackPane>
+            <StackPane fx:id="nextMarkPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
+                <children>
+                    <fx:include fx:id="nextMark" source="nextMark.fxml" />
+                </children>
+               <StackPane.margin>
+                  <Insets top="4.0" />
+               </StackPane.margin>
+            </StackPane>
+                  <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" mouseTransparent="true" text="0:0" StackPane.alignment="TOP_CENTER">
+                      <font>
+                          <Font size="9.0" />
+                      </font>
+               <padding>
+                  <Insets top="101.0" />
+               </padding>
+                  </Label>
+            <AnchorPane maxHeight="600.0" maxWidth="600.0" minHeight="600.0" minWidth="600.0" mouseTransparent="true" prefHeight="600.0" prefWidth="600.0" StackPane.alignment="CENTER">
+               <children>
+                  <GridPane fx:id="canvasBase2" maxHeight="600.0" maxWidth="600.0" minHeight="600.0" minWidth="600.0" prefHeight="600.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                     <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                     </columnConstraints>
+                     <rowConstraints>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                     </rowConstraints>
+                  </GridPane>
+               </children>
+            </AnchorPane>
               <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false">
                   <children>
                   <GridPane layoutX="-2.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="40.0" AnchorPane.topAnchor="40.0">

racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml

@@ -10,11 +10,11 @@
 
 <GridPane fx:id="arrowGridPane" alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.NextMarkController">
    <children>
-      <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
+      <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="100.0">
          <children>
-            <StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0">
+            <StackPane fx:id="arrowStackPane2d" prefHeight="100.0" prefWidth="100.0">
                <children>
-                  <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="25.0">
+                  <ImageView fx:id="arrowImage" fitHeight="70.0" fitWidth="25.0">
                      <image>
                         <Image url="@../../images/nextMarkArrow2d.png" />
                      </image>
@@ -23,9 +23,9 @@
             </StackPane>
          </children>
       </Pane>
-      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
+      <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="100.0">
          <children>
-            <StackPane fx:id="arrowStackPane3d" prefHeight="112.0" prefWidth="112.0" />
+            <StackPane fx:id="arrowStackPane3d" prefHeight="100.0" prefWidth="100.0" />
          </children>
       </Pane>
    </children>

racevisionGame/src/main/resources/visualiser/scenes/title.fxml

@@ -8,91 +8,53 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
 
 <AnchorPane fx:id="titleWrapper" maxHeight="600.0" maxWidth="800.0" minHeight="600.0" minWidth="800.0" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
    <children>
-      <GridPane layoutY="39.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <GridPane fx:id="view3DContainer" prefHeight="600.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+      </GridPane>
+      <GridPane layoutY="39.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="318.0" minWidth="10.0" prefWidth="245.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="301.0" minWidth="10.0" prefWidth="301.0" />
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
         </columnConstraints>
         <rowConstraints>
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="175.0" minHeight="10.0" prefHeight="173.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="96.0" minHeight="10.0" prefHeight="27.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Pane prefHeight="20.0" prefWidth="20.0" style="-fx-background-color: #0061ff;" GridPane.columnSpan="4" GridPane.rowIndex="4" GridPane.rowSpan="2">
+            <Button fx:id="btnJoin" mnemonicParsing="false" onAction="#joinAGame" prefHeight="31.0" prefWidth="130.0" text="Join a Game" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
-               <children>
-                  <Text fx:id="txtTitle" layoutX="167.0" layoutY="136.0" strokeType="OUTSIDE" strokeWidth="0.0" text="The Boat Game!">
-                     <font>
-                        <Font name="Comic Sans MS" size="64.0" />
-                     </font>
-                  </Text>
-                  <Text layoutX="690.0" layoutY="80.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TM">
-                     <font>
-                        <Font name="Comic Sans MS" size="12.0" />
-                     </font>
-                  </Text>
-                  <RadioButton fx:id="nightModeRD" layoutX="681.0" layoutY="168.0" mnemonicParsing="false" onAction="#setNightMode" text="Night Mode" />
-                  <RadioButton fx:id="dayModeRD" layoutX="574.0" layoutY="168.0" mnemonicParsing="false" onAction="#setDayMode" selected="true" text="Day Mode" />
-                  <Button layoutX="28.0" layoutY="152.0" mnemonicParsing="false" onAction="#showControls" text="Controls" />
-               </children>
-            </Pane>
-            <Pane fx:id="menuPane" prefHeight="20.0" prefWidth="20.0" style="-fx-background-color: #6be6ff;" GridPane.columnSpan="4" GridPane.rowSpan="4">
-               <children>
-                  <ImageView fx:id="imgBoat" fitHeight="404.0" fitWidth="296.0" layoutX="268.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../images/boat.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="imgCloud1" fitHeight="291.0" fitWidth="307.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../images/cloud.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="imgWhale" fitHeight="113.0" fitWidth="98.0" layoutX="69.0" layoutY="302.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../images/whale.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="imgCloud2" fitHeight="291.0" fitWidth="307.0" layoutX="501.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../images/cloud.png" />
-                     </image>
-                  </ImageView>
-                  <ImageView fx:id="imgSun" fitHeight="154.0" fitWidth="145.0" layoutX="701.0" layoutY="-39.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../images/sun.png" />
-                     </image>
-                  </ImageView>
-                  <Button fx:id="btnJoin" layoutX="78.0" layoutY="149.0" mnemonicParsing="false" onAction="#joinAGame" prefHeight="31.0" prefWidth="130.0" text="Join a Game">
                <font>
-                        <Font name="Comic Sans MS Bold" size="16.0" />
+                  <Font name="System Font" size="13.0" />
                </font>
             </Button>
-                  <Button layoutX="578.0" layoutY="150.0" mnemonicParsing="false" onAction="#hostAGame" prefHeight="31.0" prefWidth="130.0" text="Host a Game">
+            <Button mnemonicParsing="false" onAction="#showControls" text="Controls" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
+            <Button fx:id="tutorialButton" mnemonicParsing="false" onAction="#tutorialStartPressed" text="How to Play" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
+            <Button mnemonicParsing="false" onAction="#hostAGame" prefHeight="31.0" prefWidth="130.0" text="Host a Game" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+            <RadioButton fx:id="nightModeRD" mnemonicParsing="false" onAction="#setNightMode" text="Night Mode" textFill="WHITE" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <RadioButton fx:id="dayModeRD" mnemonicParsing="false" onAction="#setDayMode" selected="true" text="Day Mode" textFill="WHITE" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+            <Label text="Smooth Sailing" textFill="WHITE" GridPane.columnSpan="2" GridPane.halignment="RIGHT">
                <font>
-                        <Font name="Comic Sans MS Bold" size="16.0" />
+                  <Font name="Futura Medium Italic" size="72.0" />
                </font>
-                  </Button>
+            </Label>
-                  <Label fx:id="tutorialLabel" alignment="CENTER" layoutX="94.0" layoutY="223.0" onMouseClicked="#tutorialStartPressed" prefHeight="167.0" prefWidth="206.0" style="-fx-shape: &quot;M 45.673,0 C 67.781,0 85.703,12.475 85.703,27.862 C 85.703,43.249 67.781,55.724 45.673,55.724 C 38.742,55.724 32.224,54.497 26.539,52.34 C 15.319,56.564 0,64.542 0,64.542 C 0,64.542 9.989,58.887 14.107,52.021 C 15.159,50.266 15.775,48.426 16.128,46.659 C 9.618,41.704 5.643,35.106 5.643,27.862 C 5.643,12.475 23.565,0 45.673,0 M 45.673,2.22 C 24.824,2.22 7.862,13.723 7.862,27.863 C 7.862,34.129 11.275,40.177 17.472,44.893 L 18.576,45.734 L 18.305,47.094 C 17.86,49.324 17.088,51.366 16.011,53.163 C 15.67,53.73 15.294,54.29 14.891,54.837 C 18.516,53.191 22.312,51.561 25.757,50.264 L 26.542,49.968 L 27.327,50.266 C 32.911,52.385 39.255,53.505 45.673,53.505 C 66.522,53.505 83.484,42.002 83.484,27.862 C 83.484,13.722 66.522,2.22 45.673,2.22 L 45.673,2.22 z &quot;; -fx-background-color: black, white; -fx-background-insets: 0,1; -fx-padding: 50;" text="How do you play this game? Click here!" textAlignment="CENTER" wrapText="true" />
-               </children>
-            </Pane>
          </children>
       </GridPane>
    </children>