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

info full screen map shows on top of hud

Browse Source 
#story[1306]
This commit is contained in:
hba56
2017-09-27 14:17:22 +13:00
parent 2ac3bad6e1
commit 7b5460abc5
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+5 -4
View File
@@ -85,6 +85,7 @@ public class RaceViewController extends Controller {
private @FXML NextMarkController nextMarkController; private @FXML NextMarkController nextMarkController;
private @FXML GridPane canvasBase; private @FXML GridPane canvasBase;
private @FXML GridPane canvasBase1; private @FXML GridPane canvasBase1;
private @FXML GridPane canvasBase2;
private @FXML SplitPane racePane; private @FXML SplitPane racePane;
private @FXML StackPane arrowPane; private @FXML StackPane arrowPane;
private @FXML Pane nextMarkPane; private @FXML Pane nextMarkPane;
@@ -971,14 +972,14 @@ public class RaceViewController extends Controller {
private void bigMap(){ private void bigMap(){
if (mapToggle){ if (mapToggle){
raceCanvas.widthProperty().bind(canvasBase.widthProperty()); raceCanvas.widthProperty().bind(canvasBase2.widthProperty());
raceCanvas.heightProperty().bind(canvasBase.heightProperty()); raceCanvas.heightProperty().bind(canvasBase2.heightProperty());
raceCanvas.setFullScreen(true); raceCanvas.setFullScreen(true);
raceCanvas.setOpacity(0.6); raceCanvas.setOpacity(0.6);
canvasBase1.getChildren().remove(raceCanvas); canvasBase1.getChildren().remove(raceCanvas);
canvasBase.getChildren().add(1, raceCanvas); canvasBase2.getChildren().add(0, raceCanvas);
}else{ }else{
raceCanvas.widthProperty().bind(canvasBase1.widthProperty()); raceCanvas.widthProperty().bind(canvasBase1.widthProperty());
@@ -987,7 +988,7 @@ public class RaceViewController extends Controller {
raceCanvas.setFullScreen(false); raceCanvas.setFullScreen(false);
raceCanvas.setOpacity(1); raceCanvas.setOpacity(1);
canvasBase.getChildren().remove(raceCanvas); canvasBase2.getChildren().remove(raceCanvas);
canvasBase1.getChildren().add(0, raceCanvas); canvasBase1.getChildren().add(0, raceCanvas);
} }
mapToggle = !mapToggle; mapToggle = !mapToggle;
racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+13 -1
View File
@@ -111,7 +111,7 @@
<Font name="System Bold" size="15.0" /> <Font name="System Bold" size="15.0" />
</font> </font>
</Label> </Label>
<Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" /> <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="150.0" />
<StackPane fx:id="speedPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="2.0"> <StackPane fx:id="speedPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="2.0">
<padding> <padding>
<Insets right="20.0" /> <Insets right="20.0" />
@@ -208,6 +208,18 @@
<Insets top="101.0" /> <Insets top="101.0" />
</padding> </padding>
</Label> </Label>
<AnchorPane maxHeight="600.0" maxWidth="600.0" minHeight="600.0" minWidth="600.0" mouseTransparent="true" prefHeight="600.0" prefWidth="600.0" StackPane.alignment="CENTER">
<children>
<GridPane fx:id="canvasBase2" maxHeight="600.0" maxWidth="600.0" minHeight="600.0" minWidth="600.0" prefHeight="600.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
</children>
</AnchorPane>
<AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false"> <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false">
<children> <children>
<GridPane layoutX="-2.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="40.0" AnchorPane.topAnchor="40.0"> <GridPane layoutX="-2.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="40.0" AnchorPane.topAnchor="40.0">