Merged 3d branch. Added 3d item to one of the player pane. #story[1188]

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

@@ -7,6 +7,7 @@ import javafx.scene.control.SplitPane;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 import mock.app.Event;
 import mock.exceptions.EventConstructionException;
 import visualiser.model.View3D;
@@ -49,6 +50,9 @@ public class HostController extends Controller {
     @FXML
     GridPane playerContainer;
 
+    @FXML
+    private Pane playerPane;
+
     private Event game;
 
     private View3D fancyStuff;
@@ -56,7 +60,8 @@ public class HostController extends Controller {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         fancyStuff = new View3D();
-        playerContainer.add(fancyStuff, 0,0);
+        playerPane.getChildren().add(fancyStuff);
+        //playerContainer.add(fancyStuff, 0,0);
         fancyStuff.spinBox();
     }
 

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

@@ -46,7 +46,7 @@
                      <children>
                         <AnchorPane GridPane.rowIndex="1">
                            <children>
-                              <Pane layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
+                              <Pane fx:id="playerPane" layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
                                  <GridPane.margin>
                                     <Insets left="20.0" right="20.0" />
                                  </GridPane.margin>