Merge remote-tracking branch 'remotes/origin/master' into C_keybindings

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

@@ -71,8 +71,10 @@ public class FinishController extends Controller {
 
 
         //Winner label.
-        raceWinnerLabel.setText("Winner: "+ boatNameColumn.getCellObservableValue(0).getValue());
-        raceWinnerLabel.setWrapText(true);
+        if (boats.size() > 0) {
+            raceWinnerLabel.setText("Winner: " + boatNameColumn.getCellObservableValue(0).getValue());
+            raceWinnerLabel.setWrapText(true);
+        }
 
     }
 

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

@@ -1,21 +1,29 @@
 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.TextField;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.SplitPane;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.shape.Box;
+import javafx.scene.shape.Mesh;
+import javafx.scene.shape.MeshView;
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
 import mock.app.Event;
-import org.xml.sax.SAXException;
 import mock.exceptions.EventConstructionException;
-import shared.exceptions.InvalidBoatDataException;
-import shared.exceptions.InvalidRaceDataException;
-import shared.exceptions.InvalidRegattaDataException;
-import shared.exceptions.XMLReaderException;
+import visualiser.model.View3D;
 
-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.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -26,27 +34,70 @@ import java.util.logging.Logger;
 public class HostController extends Controller {
 
 
-    @FXML
-    TextField gameNameField;
+//    @FXML
+//    TextField gameNameField;
+//
+//    @FXML
+//    TextField hostNameField;
 
     @FXML
-    TextField hostNameField;
+    private ImageView imageView;
 
     @FXML
     AnchorPane hostWrapper;
 
+    @FXML
+    AnchorPane imagePane;
+
+    @FXML
+    SplitPane splitPane;
+
+    @FXML
+    AnchorPane specPane;
+
+    @FXML
+    GridPane playerContainer;
+
     private Event game;
 
+    private View3D view3D;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        ObservableList<Shape3D> shapes = FXCollections.observableArrayList();
+
+        view3D = new View3D();
+        view3D.setItems(shapes);
+        playerContainer.add(view3D, 0,0);
+
+        URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl");
+
+        StlMeshImporter importer = new StlMeshImporter();
+        importer.read(asset);
+        MeshView mesh = new MeshView(importer.getImport());
+        shapes.add(mesh);
+
+        view3D.setPivot(mesh);
+        view3D.setDistance(50);
+        view3D.setYaw(45);
+        view3D.setPitch(20);
+
+        Rotate rotation = new Rotate(0, Rotate.Y_AXIS);
+        mesh.getTransforms().addAll(rotation, new Rotate(-90, Rotate.X_AXIS));
+
+        AnimationTimer rotate = new AnimationTimer() {
+            @Override
+            public void handle(long now) {
+                rotation.setAngle(rotation.getAngle() + 0.1);
+            }
+        };
+        rotate.start();
     }
 
     /**
      * Hosts a game
-     * @throws IOException if socket cannot be connected to
      */
-    public void hostGamePressed() throws IOException{
+    public void hostGamePressed() {
         try {
             this.game = new Event(false);
             connectSocket("localhost", 4942);
@@ -81,12 +132,34 @@ 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());
         hostWrapper.setVisible(true);
     }
 
+    /**
+     * Menu button pressed. Prompt alert then return to menu
+     */
     public void menuBtnPressed(){
-        hostWrapper.setVisible(false);
-        parent.enterTitle();
+        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();
+        }
+    }
+
+    /**
+     * 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();
     }
 
 }

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

@@ -21,7 +21,7 @@ import java.util.ResourceBundle;
 public class LobbyController extends Controller {
 
     @FXML
-    AnchorPane lobbyWrapper;
+    private AnchorPane lobbyWrapper;
     @FXML
     private TableView<RaceConnection> lobbyTable;
     @FXML

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

@@ -355,7 +355,7 @@ public class RaceController extends Controller {
     private void initialiseRaceCanvas(VisualiserRaceEvent race) {
 
         //Create canvas.
-        raceCanvas = new ResizableRaceCanvas(race);
+        raceCanvas = new ResizableRaceCanvas(race.getVisualiserRaceState());
 
         //Set properties.
         raceCanvas.setMouseTransparent(true);

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

@@ -83,7 +83,6 @@ public class TitleController extends Controller {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-
     }
 
     /**