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

Placed the wind arrow in the HUD

Browse Source 
#story[1306]
This commit is contained in:
hba56
2017-09-27 12:04:56 +13:00
parent fc267a6a49
commit 173b4444da
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+1 -1
View File
@@ -117,7 +117,6 @@ public class RaceViewController extends Controller {
tutorialCheck(); tutorialCheck();
initKeypressHandler(); initKeypressHandler();
initialiseRaceVisuals(); initialiseRaceVisuals();
initialiseRaceCanvas();
} }
/** /**
@@ -305,6 +304,7 @@ public class RaceViewController extends Controller {
initialiseView3D(this.visualiserRace); initialiseView3D(this.visualiserRace);
initialiseRaceClock(); initialiseRaceClock();
initialiseSpeedometer(); initialiseSpeedometer();
initialiseRaceCanvas();
raceTimer(); // start the timer raceTimer(); // start the timer
speedometerLoop(); speedometerLoop();
new Sparkline(this.raceState, this.sparklineChart); new Sparkline(this.raceState, this.sparklineChart);
racevisionGame/src/main/java/visualiser/layout/WindCompass.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class WindCompass extends View3D {
}; };
public WindCompass(View3D view3D, Property<Wind> wind){ public WindCompass(View3D view3D, Property<Wind> wind){
super(); super(false);
this.wind = wind; this.wind = wind;
this.view3D = view3D; this.view3D = view3D;
this.followView3D.start(); this.followView3D.start();
racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+1 -1
View File
@@ -647,7 +647,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
//rounding lines //rounding lines
if (isFullScreen){ if (isFullScreen){
drawRoundingLines(); // drawRoundingLines();
drawRaceLine(); drawRaceLine();
} }
racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+13 -9
View File
@@ -1,5 +1,12 @@
<?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?>
@@ -24,7 +31,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.0.65" 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" 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>
@@ -217,14 +224,11 @@
<Image url="@../../images/raceViewUI_UpperMiddle.png" /> <Image url="@../../images/raceViewUI_UpperMiddle.png" />
</image> </image>
</ImageView> </ImageView>
<StackPane fx:id="arrowPane" alignment="TOP_CENTER" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" StackPane.alignment="TOP_CENTER"> <StackPane fx:id="arrowPane" maxHeight="60.0" maxWidth="60.0" minHeight="60.0" minWidth="60.0" prefHeight="60.0" prefWidth="60.0" StackPane.alignment="BOTTOM_CENTER">
<children> <StackPane.margin>
<fx:include fx:id="arrow" source="arrow.fxml" /> <Insets bottom="25.0" left="2.0" />
</children> </StackPane.margin>
<padding> </StackPane>
<Insets left="2.0" top="5.0" />
</padding>
</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>
<Font size="9.0" /> <Font size="9.0" />