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

Chanegd next mark arrow to fit with new UI. #story[1299]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-25 13:11:09 +13:00
parent 327c052b1d
commit f9f5cfef7d
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+4 -6
View File
@@ -32,13 +32,11 @@ public class NextMarkController {
private @FXML StackPane arrowStackPane3d; private @FXML StackPane arrowStackPane3d;
private @FXML Pane pane2d; private @FXML Pane pane2d;
private @FXML Pane pane3d; private @FXML Pane pane3d;
private @FXML Label nextMarkLabel;
private VisualiserBoat boat; private VisualiserBoat boat;
public void initialiseArrowView(VisualiserBoat boat) { public void initialiseArrowView(VisualiserBoat boat) {
this.boat = boat; this.boat = boat;
this.nextMarkLabel.setVisible(false);
pane2d.setVisible(true); pane2d.setVisible(true);
pane3d.setVisible(false); pane3d.setVisible(false);
initialise2dArrowView(); initialise2dArrowView();
@@ -70,13 +68,13 @@ public class NextMarkController {
AmbientLight ambientLight = new AmbientLight(Color.web("#777777")); AmbientLight ambientLight = new AmbientLight(Color.web("#777777"));
ambientLight.setLightOn(true); ambientLight.setLightOn(true);
arrow.setScaleX(50); arrow.setScaleX(25);
arrow.setScaleY(50); arrow.setScaleY(25);
arrow.setScaleZ(300); arrow.setScaleZ(200);
arrow.setRotationAxis(new Point3D(1,0,0)); arrow.setRotationAxis(new Point3D(1,0,0));
arrowStackPane3d.getChildren().add(arrow); arrowStackPane3d.getChildren().add(arrow);
arrowStackPane3d.getChildren().add(ambientLight); //arrowStackPane3d.getChildren().add(ambientLight);
AnimationTimer arrow3d = new AnimationTimer() { AnimationTimer arrow3d = new AnimationTimer() {
@Override @Override
racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml
+4 -18
View File
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.image.Image?> <?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.ColumnConstraints?> <?import javafx.scene.layout.ColumnConstraints?>
@@ -9,14 +7,12 @@
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?> <?import javafx.scene.layout.StackPane?>
<?import javafx.scene.shape.Circle?>
<?import javafx.scene.text.Font?>
<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="125.0" prefWidth="125.0"> <Pane fx:id="pane2d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
<children> <children>
<StackPane fx:id="arrowStackPane2d" prefHeight="125.0" prefWidth="125.0"> <StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0">
<children> <children>
<ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0"> <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0">
<image> <image>
@@ -25,20 +21,11 @@
</ImageView> </ImageView>
</children> </children>
</StackPane> </StackPane>
<Circle fx:id="circle" fill="#1f93ff00" layoutX="63.0" layoutY="63.0" radius="60.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="3.0" visible="false" />
</children> </children>
</Pane> </Pane>
<Label fx:id="nextMarkLabel" text="Next Mark" GridPane.halignment="CENTER" GridPane.hgrow="NEVER" GridPane.rowIndex="1"> <Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="112.0" prefWidth="112.0">
<font>
<Font name="System Bold" size="16.0" />
</font>
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<Pane fx:id="pane3d" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="125.0" prefWidth="125.0">
<children> <children>
<StackPane fx:id="arrowStackPane3d" prefHeight="125.0" prefWidth="125.0" /> <StackPane fx:id="arrowStackPane3d" prefHeight="112.0" prefWidth="112.0" />
</children> </children>
</Pane> </Pane>
</children> </children>
@@ -47,6 +34,5 @@
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
</GridPane> </GridPane>