Merge branch 'master' into story70

# Conflicts:
#	dedicatedServer/src/main/java/app/App.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml

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

@@ -1,29 +1,28 @@
 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.Alert;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.SplitPane;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
-import javafx.scene.shape.MeshView;
+import javafx.stage.Stage;
 import mock.app.Event;
 import org.xml.sax.SAXException;
 import mock.exceptions.EventConstructionException;
-import visualiser.layout.Subject3D;
-import visualiser.layout.View3D;
+import shared.exceptions.InvalidBoatDataException;
+import shared.exceptions.InvalidRaceDataException;
+import shared.exceptions.InvalidRegattaDataException;
+import shared.exceptions.XMLReaderException;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
-import java.util.Optional;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -35,64 +34,47 @@ public class HostController extends Controller {
 
 
     @FXML
-    private ImageView imageView;
+    TextField gameNameField;
+
+    @FXML
+    TextField hostNameField;
 
     @FXML
     AnchorPane hostWrapper;
 
     @FXML
-    AnchorPane imagePane;
+    Button previousButton;
 
     @FXML
-    SplitPane splitPane;
+    Button nextButton;
 
     @FXML
-    AnchorPane specPane;
-
-    @FXML
-    GridPane playerContainer;
+    ImageView mapImage;
 
     private Event game;
 
-    private int gameType = 0;
+    private ArrayList<Image> listOfMaps;
+    private int currentMapIndex = 0;
 
-    private View3D view3D;
 
     @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        ObservableList<Subject3D> subjects = FXCollections.observableArrayList();
+    public void initialize(URL location, ResourceBundle resources){
+        Image ac35Map = new Image(getClass().getClassLoader().getResourceAsStream("images/AC35_Racecourse_MAP.png"));
+        Image oMap = new Image(getClass().getClassLoader().getResourceAsStream("images/oMapLayout.png"));
+        Image iMap = new Image(getClass().getClassLoader().getResourceAsStream("images/iMapLayout.png"));
+        Image mMap = new Image(getClass().getClassLoader().getResourceAsStream("images/mMapLayout.png"));
 
-        view3D = new View3D();
-        view3D.setItems(subjects);
-        playerContainer.add(view3D, 0,0);
-
-        URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl");
-
-        StlMeshImporter importer = new StlMeshImporter();
-        importer.read(asset);
-        Subject3D subject = new Subject3D(new MeshView(importer.getImport()));
-
-        subjects.add(subject);
-
-        view3D.setDistance(50);
-        view3D.setYaw(45);
-        view3D.setPitch(20);
-
-        AnimationTimer rotate = new AnimationTimer() {
-            @Override
-            public void handle(long now) {
-                subject.setHeading(subject.getHeading().getAngle() + 0.1);
-            }
-        };
-        rotate.start();
+        listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap, mMap));
+        mapImage.setImage(listOfMaps.get(currentMapIndex));
     }
 
     /**
      * Hosts a game
+     * @throws IOException if socket cannot be connected to
      */
-    public void hostGamePressed() {
+    public void hostGamePressed() throws IOException{
         try {
-            this.game = new Event(gameType);
+            this.game = new Event(false, currentMapIndex);
             connectSocket("localhost", 4942);
         } catch (EventConstructionException e) {
             Logger.getGlobal().log(Level.SEVERE, "Could not create Event.", e);
@@ -125,10 +107,7 @@ public class HostController extends Controller {
      * Hosts a game.
      */
     public void hostGame(){
-        splitPane.setResizableWithParent(specPane, false);
-        splitPane.lookupAll(".split-pane-divider").stream().forEach(div -> div.setMouseTransparent(true));
-        imageView.fitWidthProperty().bind(imagePane.widthProperty());
-        imageView.fitHeightProperty().bind(imagePane.heightProperty());
+        mapImage.fitWidthProperty().bind(((Stage) mapImage.getScene().getWindow()).widthProperty().multiply(0.6));
         hostWrapper.setVisible(true);
     }
 
@@ -136,23 +115,25 @@ public class HostController extends Controller {
      * Menu button pressed. Prompt alert then return to menu
      */
     public void menuBtnPressed(){
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Quitting race");
-        alert.setContentText("Do you wish to quit the race?");
-        alert.setHeaderText("You are about to quit the race");
-        Optional<ButtonType> result = alert.showAndWait();
-        if(result.get() == ButtonType.OK){
-            hostWrapper.setVisible(false);
-            parent.enterTitle();
-        }
+        hostWrapper.setVisible(false);
+        parent.enterTitle();
     }
 
-    /**
-     * Start button pressed. Currently only prints out start
-     */
-    public void startBtnPressed(){
-        //System.out.println("Should start the race. This button is only visible for the host");
-        hostGamePressed();
+    public void nextImage(){
+        increaseIndex();
+        mapImage.setImage(listOfMaps.get(currentMapIndex));
+    }
+
+    public void previousImage(){
+        decreaseIndex();
+        mapImage.setImage(listOfMaps.get(currentMapIndex));
+    }
+    private void increaseIndex(){
+        currentMapIndex = (currentMapIndex + 1)%listOfMaps.size();
+    }
+
+    private void decreaseIndex(){
+        currentMapIndex = ((((currentMapIndex - 1)%listOfMaps.size())+listOfMaps.size())%listOfMaps.size());
     }
 
     public void setGameType(int gameType){