Errors in this commit: mock threads get interrupted

#story[#1188]

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

@@ -78,7 +78,7 @@ public class HostController extends Controller {
         try{
             Socket socket = new Socket(address, port);
             hostWrapper.setVisible(false);
-            parent.enterLobby(socket, true);
+            parent.enterGameLobby(socket, true);
         } catch (IOException e) { /* Never reached */ }
     }
 

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

@@ -2,73 +2,71 @@ package visualiser.Controllers;
 
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.geometry.Insets;
 import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
+import javafx.scene.shape.Box;
 import mock.app.Event;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.Enums.RequestToJoinEnum;
 import visualiser.gameController.ControllerClient;
-import visualiser.model.View3D;
+import visualiser.layout.Subject3D;
+import visualiser.layout.View3D;
+import visualiser.model.VisualiserBoat;
 import visualiser.model.VisualiserRaceEvent;
 import visualiser.model.VisualiserRaceState;
 
 import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
-import java.util.Optional;
-import java.util.ResourceBundle;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Controller for Hosting a game.
  */
-public class InGameLobby extends Controller {
-
-
-//    @FXML
-//    TextField gameNameField;
-//
-//    @FXML
-//    TextField hostNameField;
-
+public class InGameLobbyController extends Controller {
     @FXML
     private ImageView imageView;
 
     @FXML
     AnchorPane gameLobbyWrapper;
 
-    @FXML
-    AnchorPane imagePane;
-
-    @FXML
-    SplitPane splitPane;
-
-    @FXML
-    AnchorPane specPane;
-
     @FXML
     GridPane playerContainer;
 
-    @FXML
-    private Pane playerPane;
 
     @FXML
-    private Pane playerPane4;
+    private Label playerLabel;
 
     @FXML
-    private Button startButton;
+    private Label playerLabel2;
 
     @FXML
-    private Label countdownLable;
+    private Label playerLabel3;
+
+    @FXML
+    private Label playerLabel4;
+
+    @FXML
+    private Label playerLabel5;
+
+    @FXML
+    private Label playerLabel6;
+
+    @FXML
+    private Label countdownLabel;
 
     private Event game;
 
-    private View3D fancyStuff;
+    private View3D playerBoat;
 
     private VisualiserRaceEvent visualiserRaceEvent;
 
@@ -76,28 +74,82 @@ public class InGameLobby extends Controller {
 
     private ControllerClient controllerClient;
 
+    private ArrayList<Label> allPlayerLabels;
+
+    private ObservableList<Subject3D> subjects = FXCollections.observableArrayList();
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        fancyStuff = new View3D();
-        playerPane4.getChildren().add(fancyStuff);
+        allPlayerLabels = new ArrayList(Arrays.asList(playerLabel, playerLabel2,
+                playerLabel3,
+                playerLabel4,
+                playerLabel5,
+                playerLabel6));
+    }
 
-        //centering the 3d object
-        fancyStuff.layoutXProperty().bind(playerPane4.widthProperty().subtract(fancyStuff.widthProperty()).divide(2));
-        fancyStuff.layoutYProperty().bind(playerPane4.heightProperty().subtract(fancyStuff.heightProperty()).divide(2));
-        //playerContainer.add(fancyStuff, 0,0);
+    private void populatePlayers(ListChangeListener.Change change){
+        Platform.runLater(
+                () -> {
+                    while (change.next()){
+                        if (change.wasAdded()){
+                            try{
+                                int count = 0;
+                                int row = 0;
+                                for (VisualiserBoat boat :this.visualiserRaceEvent.getVisualiserRaceState().getBoats()) {
+                                    View3D playerBoatToSet = new View3D();
+                                    playerBoatToSet.setItems(subjects);
+                                    playerContainer.add(playerBoatToSet, (count % 3) , row);
+                                    playerContainer.setMargin(playerBoatToSet, new Insets(10, 10, 10, 10));
 
-        fancyStuff.spinBox();
+                                    Subject3D subject = new Subject3D(new Box());
+                                    subjects.add(subject);
+
+                                    playerBoatToSet.setDistance(50);
+                                    playerBoatToSet.setYaw(45);
+                                    playerBoatToSet.setPitch(20);
+
+
+
+                                    AnimationTimer rotate = new AnimationTimer() {
+                                        @Override
+                                        public void handle(long now) {
+                                            subject.setHeading(subject.getHeading() + 0.1);
+                                        }
+                                    };
+                                    rotate.start();
+
+                                    allPlayerLabels.get(count).setText("Player: " + boat.getSourceID());
+                                    allPlayerLabels.get(count).toFront();
+                                    count += 1;
+                                    if (count > 2){
+                                        row = 1;
+                                    }
+                                }
+                            }
+                            catch(ConcurrentModificationException e){
+                            }
+                        }
+                    }
+                }
+        );
     }
 
     /**
      * Starts the race.
      */
     private void startRace() {
+         //Initialises the race clock.
         initialiseRaceClock(this.visualiserRaceEvent.getVisualiserRaceState());
+
+
         //Starts the race countdown timer.
         countdownTimer();
     }
 
+    public AnchorPane gameLobbyWrapper(){
+        return gameLobbyWrapper;
+    }
+
     /**
      * Initialises the race clock/timer labels for the start time, current time, and remaining time.
      * @param visualiserRace The race to get data from.
@@ -117,7 +169,7 @@ public class InGameLobby extends Controller {
 
         visualiserRace.getRaceClock().durationProperty().addListener((observable, oldValue, newValue) -> {
             Platform.runLater(() -> {
-                countdownLable.setText(newValue);
+                countdownLabel.setText(newValue);
             });
         });
 
@@ -153,23 +205,20 @@ public class InGameLobby extends Controller {
      * Hosts a game.
      */
     public void enterGameLobby(Socket socket, boolean isHost){
-        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());
-        this.isHost = isHost;
-        this.controllerClient = visualiserRaceEvent.getControllerClient();
-
-        if (!isHost){
-            startButton.setVisible(false);
-        }
-
         try {
 
             this.visualiserRaceEvent = new VisualiserRaceEvent(socket, RequestToJoinEnum.PARTICIPANT);
+            this.isHost = isHost;
+            this.controllerClient = visualiserRaceEvent.getControllerClient();
+
+
+            this.visualiserRaceEvent.getVisualiserRaceState().getBoats().addListener((ListChangeListener<? super VisualiserBoat>) c ->{
+                populatePlayers(c);
+            });
+
+
             gameLobbyWrapper.setVisible(true);
             startRace();
-
         } catch (IOException e) {
             //TODO should probably let this propagate, so that we only enter this scene if everything works
             Logger.getGlobal().log(Level.WARNING, "Could not connect to server.", e);

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

@@ -103,7 +103,7 @@ public class LobbyController extends Controller {
             RaceConnection connection = lobbyTable.getSelectionModel().getSelectedItem();
             Socket socket = new Socket(connection.getHostname(), connection.getPort());
             lobbyWrapper.setVisible(false);
-            parent.enterLobby(socket, false);
+            parent.enterGameLobby(socket, false);
         } catch (IOException e) { /* Never reached */
             e.printStackTrace();
         }

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

@@ -27,6 +27,7 @@ public class MainController extends Controller {
     @FXML private TitleController titleController;
     @FXML private HostController hostController;
     @FXML private LobbyController lobbyController;
+    @FXML private InGameLobbyController inGameLobbyController;
 
     private MatchBrowserInterface matchBrowserInterface;
     private DatagramSocket udpSocket;
@@ -57,6 +58,15 @@ public class MainController extends Controller {
 
     public void endEvent() throws IOException { hostController.endEvent(); }
 
+    /**
+     * Transitions from the server selection screen to the pre-race lobby for a given server.
+     * @param socket The server to read data from.
+     * @param isHost is connection a host
+     */
+    public void enterGameLobby(Socket socket, Boolean isHost) {
+        inGameLobbyController.enterGameLobby(socket, isHost);
+    }
+
     /**
      * Transitions from the server selection screen to the pre-race lobby for a given server.
      * @param socket The server to read data from.
@@ -112,12 +122,13 @@ public class MainController extends Controller {
         titleController.setParent(this);
         hostController.setParent(this);
         lobbyController.setParent(this);
+        inGameLobbyController.setParent(this);
 
 
-        AnchorPane.setTopAnchor(startController.startWrapper(), 0.0);
-        AnchorPane.setBottomAnchor(startController.startWrapper(), 0.0);
-        AnchorPane.setLeftAnchor(startController.startWrapper(), 0.0);
-        AnchorPane.setRightAnchor(startController.startWrapper(), 0.0);
+        AnchorPane.setTopAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
+        AnchorPane.setBottomAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
+        AnchorPane.setLeftAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
+        AnchorPane.setRightAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
 
         AnchorPane.setTopAnchor(lobbyController.startWrapper(), 0.0);
         AnchorPane.setBottomAnchor(lobbyController.startWrapper(), 0.0);

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

@@ -0,0 +1,68 @@
+package visualiser.layout;
+
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
+
+/**
+ * Wrapper for controlling the position and heading of rendered 3D models.
+ */
+public class Subject3D {
+    /**
+     * Rendered mesh
+     */
+    private Shape3D mesh;
+
+    /**
+     * Position translation updated by state listeners
+     */
+    private Translate position;
+
+    /**
+     * Heading rotation updated by state listeners
+     */
+    private Rotate heading;
+
+    /**
+     * Constructor for view subject wrapper
+     * @param mesh to be rendered
+     */
+    public Subject3D(Shape3D mesh) {
+        this.mesh = mesh;
+        this.position = new Translate();
+        this.heading = new Rotate(0, Rotate.Y_AXIS);
+
+        this.mesh.getTransforms().addAll(position, heading, new Rotate(90, Rotate.X_AXIS), new Rotate(180, Rotate.Y_AXIS));
+        this.position.xProperty().addListener(((observable, oldValue, newValue) -> System.out.println("Boat x: " + newValue)));
+        this.position.yProperty().addListener(((observable, oldValue, newValue) -> System.out.println("Boat y: " + newValue)));
+        this.position.zProperty().addListener(((observable, oldValue, newValue) -> System.out.println("Boat z: " + newValue)));
+    }
+
+    public Shape3D getMesh() {
+        return mesh;
+    }
+
+    public Translate getPosition() {
+        return this.position;
+    }
+
+    public void setX(double x) {
+        position.setX(x);
+    }
+
+    public void setY(double y) {
+        position.setY(y);
+    }
+
+    public void setZ(double z) {
+        position.setZ(z);
+    }
+
+    public double getHeading() {
+        return heading.getAngle();
+    }
+
+    public void setHeading(double angle) {
+        heading.setAngle(angle);
+    }
+}

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

@@ -0,0 +1,161 @@
+package visualiser.layout;
+
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Point3D;
+import javafx.scene.Group;
+import javafx.scene.PerspectiveCamera;
+import javafx.scene.SubScene;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
+
+/**
+ * Control for rendering 3D objects visible through a PerspectiveCamera. Implements Adapter Pattern to
+ * interface with camera, and allows clients to add shapes to the scene. All scenes contain sea plane and
+ * sky box, whose textures are set with special methods.
+ */
+public class View3D extends Pane {
+    /**
+     * Observable list of renderable items
+     */
+    private ObservableList<Subject3D> items;
+    /**
+     * Rendering container for shapes
+     */
+    private Group world;
+    /**
+     * Near limit of view frustum
+     */
+    private double nearClip;
+    /**
+     * Far limit of view frustum
+     */
+    private double farClip;
+    /**
+     * Camera origin
+     */
+    private Translate pivot;
+    /**
+     * Distance of camera from pivot point
+     */
+    private Translate distance;
+    /**
+     * Angle along ground between z-axis and camera
+     */
+    private Rotate yaw;
+    /**
+     * Angle between ground plane and camera direction
+     */
+    private Rotate pitch;
+
+    private PerspectiveCamera camera;
+
+    /**
+     * Default constructor for View3D. Sets up Scene and PerspectiveCamera.
+     */
+    public View3D() {
+        world = new Group();
+
+        SubScene scene = new SubScene(world, 300, 300);
+        scene.widthProperty().bind(this.widthProperty());
+        scene.heightProperty().bind(this.heightProperty());
+        scene.setFill(new Color(0.2, 0.6, 1, 1));
+
+        scene.setCamera(buildCamera());
+
+        this.getChildren().add(scene);
+    }
+
+    /**
+     * Sets up camera view frustum and binds transformations
+     * @return perspective camera
+     */
+    private PerspectiveCamera buildCamera() {
+        PerspectiveCamera camera = new PerspectiveCamera(true);
+
+        // Set up view frustum
+        nearClip = 0.1;
+        farClip = 3000.0;
+        camera.setNearClip(nearClip);
+        camera.setFarClip(farClip);
+
+        // Set up transformations
+        pivot = new Translate();
+        distance = new Translate();
+        yaw = new Rotate(0, Rotate.Y_AXIS);
+        pitch = new Rotate(0, Rotate.X_AXIS);
+        camera.getTransforms().addAll(pivot, yaw, pitch, distance);
+        centerCamera();
+
+        this.camera = camera;
+        return camera;
+    }
+
+    public void setItems(ObservableList<Subject3D> items) {
+        this.items = items;
+        this.items.addListener((ListChangeListener<? super Subject3D>) c -> {
+            while(c.next()) {
+                if (c.wasRemoved() || c.wasAdded()) {
+                    for (Subject3D shape : c.getRemoved()) world.getChildren().remove(shape.getMesh());
+                    for (Subject3D shape : c.getAddedSubList()) world.getChildren().add(shape.getMesh());
+                }
+            }
+        });
+    }
+
+    public void setNearClip(double nearClip) {
+        this.nearClip = nearClip;
+    }
+
+    public void setFarClip(double farClip) {
+        this.farClip = farClip;
+    }
+
+    public void updatePivot(Translate pivot) {
+        this.pivot.setX(pivot.getX());
+        this.pivot.setY(pivot.getY());
+        this.pivot.setZ(pivot.getZ());
+    }
+
+    public void updatePosition(double x, double y, double z) {
+        this.distance.setX(x);
+        this.distance.setY(y);
+        this.distance.setZ(z);
+    }
+
+    /**
+     * Set distance of camera from pivot
+     * @param distance in units
+     */
+    public void setDistance(double distance) {
+        this.distance.setZ(-distance);
+    }
+
+    /**
+     * Set angle of camera from z-axis along ground
+     * @param yaw in degrees
+     */
+    public void setYaw(double yaw) {
+        this.yaw.setAngle(yaw);
+    }
+
+    /**
+     * Set elevation of camera
+     * @param pitch in degrees
+     */
+    public void setPitch(double pitch) {
+        this.pitch.setAngle(-pitch);
+    }
+
+    public void centerCamera(){
+    }
+
+    public void rotateCamera(double angle, double x, double y, double z){
+        camera.setRotationAxis(new Point3D(x, y, z));
+        camera.setRotate(-90);
+    }
+
+}

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

@@ -1,18 +0,0 @@
-package visualiser.model;
-
-import com.interactivemesh.jfx.importer.Importer;
-import javafx.scene.layout.Pane;
-
-/**
- * Created by fwy13 on 29/08/17.
- */
-public class BoatDisplay3D extends Pane {
-
-
-    public BoatDisplay3D(String filePath){
-        super();
-//        Shape3D
-//        this.getChildren().add();
-    }
-
-}

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

@@ -1,49 +0,0 @@
-package visualiser.model;
-
-import javafx.animation.AnimationTimer;
-import javafx.scene.Group;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.SubScene;
-import javafx.scene.layout.Pane;
-import javafx.scene.shape.Box;
-import javafx.scene.shape.CullFace;
-import javafx.scene.transform.Rotate;
-
-/**
- * Created by connortaylorbrown on 30/08/17.
- */
-public class View3D extends Pane {
-    SubScene scene;
-    PerspectiveCamera camera;
-    Box box;
-
-    public View3D() {
-        scene = new SubScene(this, 500, 500);
-        camera = new PerspectiveCamera();
-        scene.setCamera(camera);
-    }
-
-    public void spinBox() {
-        camera.getTransforms().add(new Rotate(-20, Rotate.X_AXIS));
-
-        box = new Box(50,50,50);
-        box.setTranslateX(100);
-        box.setTranslateY(100);
-        box.setCullFace(CullFace.BACK);
-
-        Rotate ry = new Rotate(0, 0,0,0, Rotate.Y_AXIS);
-        box.getTransforms().add(ry);
-
-        this.getChildren().add(camera);
-        this.getChildren().add(box);
-
-        AnimationTimer rotation = new AnimationTimer() {
-            @Override
-            public void handle(long now) {
-                ry.setAngle(ry.getAngle() + 0.1);
-            }
-        };
-
-        rotation.start();
-    }
-}