From de9f4e22ebcafc2250232ae509557625bfd413a3 Mon Sep 17 00:00:00 2001 From: cbt24 Date: Wed, 13 Sep 2017 16:10:41 +1200 Subject: [PATCH] Direction to mark arrow is now displayed relative to camera #story[1195] --- .../main/java/visualiser/Controllers/RaceController.java | 6 +++--- racevisionGame/src/main/java/visualiser/layout/View3D.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java index a9ba893a..deaba17e 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java @@ -371,9 +371,9 @@ public class RaceController extends Controller { CompoundMark target = boat.getCurrentLeg().getEndCompoundMark(); Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate()); - nextMarkArrow.setY(10); - nextMarkArrow.setX(subject3D.getPosition().getX()); - nextMarkArrow.setZ(subject3D.getPosition().getZ()); + nextMarkArrow.setX(view3D.getPivot().getX()); + nextMarkArrow.setY(view3D.getPivot().getY()); + nextMarkArrow.setZ(view3D.getPivot().getZ() + 10); nextMarkArrow.setHeading(headingToMark.degrees()); }; diff --git a/racevisionGame/src/main/java/visualiser/layout/View3D.java b/racevisionGame/src/main/java/visualiser/layout/View3D.java index 4ae207ad..c62fe22e 100644 --- a/racevisionGame/src/main/java/visualiser/layout/View3D.java +++ b/racevisionGame/src/main/java/visualiser/layout/View3D.java @@ -251,6 +251,10 @@ public class View3D extends Pane { this.farClip = farClip; } + public Translate getPivot() { + return pivot; + } + /** * Sets the coordinates of the camera pivot once. * @param pivot source of coordinates