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

Placed the waypoint arrow in the HUD

Browse Source 
#story[1306]
This commit is contained in:
hba56
2017-09-27 13:39:27 +13:00
parent 2f6fa73349
commit 4e8f1a2b19
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+2 -2
View File
@@ -67,9 +67,9 @@ public class NextMarkController {
Shape3D arrow = Assets3D.loadX3d(arrowPath); Shape3D arrow = Assets3D.loadX3d(arrowPath);
arrow.setScaleX(25); arrow.setScaleX(15);
arrow.setScaleY(25); arrow.setScaleY(25);
arrow.setScaleZ(100); arrow.setScaleZ(50);
arrow.setRotationAxis(new Point3D(1,0,0)); arrow.setRotationAxis(new Point3D(1,0,0));
arrowStackPane3d.getChildren().add(arrow); arrowStackPane3d.getChildren().add(arrow);
racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+9 -15
View File
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.chart.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.chart.LineChart?> <?import javafx.scene.chart.LineChart?>
<?import javafx.scene.chart.NumberAxis?> <?import javafx.scene.chart.NumberAxis?>
@@ -31,7 +24,7 @@
<?import javafx.scene.layout.StackPane?> <?import javafx.scene.layout.StackPane?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController"> <SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
<items> <items>
<StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0"> <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
<children> <children>
@@ -44,13 +37,6 @@
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<children>
<StackPane fx:id="nextMarkPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
<children>
<fx:include fx:id="nextMark" source="nextMark.fxml" />
</children>
</StackPane>
</children>
</GridPane> </GridPane>
<Pane prefHeight="200.0" prefWidth="400.0" visible="false"> <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
<children> <children>
@@ -235,6 +221,14 @@
<StackPane.margin> <StackPane.margin>
<Insets bottom="25.0" left="2.0" /> <Insets bottom="25.0" left="2.0" />
</StackPane.margin> </StackPane.margin>
</StackPane>
<StackPane fx:id="nextMarkPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false">
<children>
<fx:include fx:id="nextMark" source="nextMark.fxml" />
</children>
<StackPane.margin>
<Insets top="4.0" />
</StackPane.margin>
</StackPane> </StackPane>
<Label fx:id="timer" alignment="CENTER" maxHeight="20.0" mouseTransparent="true" text="0:0" StackPane.alignment="TOP_CENTER"> <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" mouseTransparent="true" text="0:0" StackPane.alignment="TOP_CENTER">
<font> <font>
racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
+5 -5
View File
@@ -10,11 +10,11 @@
<GridPane fx:id="arrowGridPane" alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.NextMarkController"> <GridPane fx:id="arrowGridPane" alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.NextMarkController">
<children> <children>
<Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0"> <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="100.0">
<children> <children>
<StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0"> <StackPane fx:id="arrowStackPane2d" prefHeight="100.0" prefWidth="100.0">
<children> <children>
<ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="25.0"> <ImageView fx:id="arrowImage" fitHeight="70.0" fitWidth="25.0">
<image> <image>
<Image url="@../../images/nextMarkArrow2d.png" /> <Image url="@../../images/nextMarkArrow2d.png" />
</image> </image>
@@ -23,9 +23,9 @@
</StackPane> </StackPane>
</children> </children>
</Pane> </Pane>
<Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0"> <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="100.0" prefWidth="100.0">
<children> <children>
<StackPane fx:id="arrowStackPane3d" prefHeight="112.0" prefWidth="112.0" /> <StackPane fx:id="arrowStackPane3d" prefHeight="100.0" prefWidth="100.0" />
</children> </children>
</Pane> </Pane>
</children> </children>