fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Wu
2017-08-30 11:52:45 +12:00
parent b724a814b1
commit d2f0c1105a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+6 -1
View File
@@ -7,6 +7,7 @@ import javafx.scene.control.SplitPane;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
import mock.app.Event; import mock.app.Event;
import mock.exceptions.EventConstructionException; import mock.exceptions.EventConstructionException;
import visualiser.model.View3D; import visualiser.model.View3D;
@@ -49,6 +50,9 @@ public class HostController extends Controller {
@FXML @FXML
GridPane playerContainer; GridPane playerContainer;
@FXML
private Pane playerPane;
private Event game; private Event game;
private View3D fancyStuff; private View3D fancyStuff;
@@ -56,7 +60,8 @@ public class HostController extends Controller {
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
fancyStuff = new View3D(); fancyStuff = new View3D();
playerContainer.add(fancyStuff, 0,0); playerPane.getChildren().add(fancyStuff);
//playerContainer.add(fancyStuff, 0,0);
fancyStuff.spinBox(); fancyStuff.spinBox();
} }
racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
+1 -1
View File
@@ -46,7 +46,7 @@
<children> <children>
<AnchorPane GridPane.rowIndex="1"> <AnchorPane GridPane.rowIndex="1">
<children> <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> <GridPane.margin>
<Insets left="20.0" right="20.0" /> <Insets left="20.0" right="20.0" />
</GridPane.margin> </GridPane.margin>