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

This commit is contained in:
Joseph
2017-09-26 17:54:49 +13:00
2 changed files with 8 additions and 24 deletions
@@ -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.setScaleY(50);
arrow.setScaleZ(300);
arrow.setScaleX(25);
arrow.setScaleY(25);
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