Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction

racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java

@@ -32,13 +32,11 @@ public class NextMarkController {
     private @FXML StackPane arrowStackPane3d;
     private @FXML Pane pane2d;
     private @FXML Pane pane3d;
-    private @FXML Label nextMarkLabel;
 
     private VisualiserBoat boat;
 
     public void initialiseArrowView(VisualiserBoat boat) {
         this.boat = boat;
-        this.nextMarkLabel.setVisible(false);
         pane2d.setVisible(true);
         pane3d.setVisible(false);
         initialise2dArrowView();
@@ -70,13 +68,13 @@ public class NextMarkController {
         AmbientLight ambientLight = new AmbientLight(Color.web("#777777"));
         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));
 
         arrowStackPane3d.getChildren().add(arrow);
-        arrowStackPane3d.getChildren().add(ambientLight);
+        //arrowStackPane3d.getChildren().add(ambientLight);
 
         AnimationTimer arrow3d = new AnimationTimer() {
             @Override

racevisionGame/src/main/resources/visualiser/scenes/nextMark.fxml

@@ -1,7 +1,5 @@
 <?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.ImageView?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -9,14 +7,12 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?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">
    <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>
-            <StackPane fx:id="arrowStackPane2d" prefHeight="125.0" prefWidth="125.0">
+            <StackPane fx:id="arrowStackPane2d" prefHeight="112.0" prefWidth="112.0">
                <children>
                   <ImageView fx:id="arrowImage" fitHeight="75.0" fitWidth="75.0">
                      <image>
@@ -25,20 +21,11 @@
                   </ImageView>
                </children>
             </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>
       </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>
-            <StackPane fx:id="arrowStackPane3d" prefHeight="125.0" prefWidth="125.0" />
+            <StackPane fx:id="arrowStackPane3d" prefHeight="112.0" prefWidth="112.0" />
          </children>
       </Pane>
    </children>
@@ -47,6 +34,5 @@
    </columnConstraints>
    <rowConstraints>
       <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
    </rowConstraints>
 </GridPane>