From d1edbc4b8a145f46fbd18b65473a1355ce5f67b7 Mon Sep 17 00:00:00 2001 From: Calum Date: Thu, 28 Sep 2017 10:19:32 +1300 Subject: [PATCH] Put the arrows into the minimap. Fixed the issue with curved section of port marks. #fix #implement --- src/main/java/seng302/visualiser/MiniMap.java | 2 +- .../java/seng302/visualiser/fxObjects/MarkArrowFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng302/visualiser/MiniMap.java b/src/main/java/seng302/visualiser/MiniMap.java index 5cfa843b..3d626c14 100644 --- a/src/main/java/seng302/visualiser/MiniMap.java +++ b/src/main/java/seng302/visualiser/MiniMap.java @@ -30,7 +30,7 @@ public class MiniMap extends MapPreview { this.boats = boats; this.player = player; setBoats(boats); -// player.addMarkRoundingListener(this::updateMarkArrows); + player.addMarkRoundingListener(this::updateMarkArrows); } public void setBoats(List yachts) { diff --git a/src/main/java/seng302/visualiser/fxObjects/MarkArrowFactory.java b/src/main/java/seng302/visualiser/fxObjects/MarkArrowFactory.java index 4f871801..a5d8175b 100644 --- a/src/main/java/seng302/visualiser/fxObjects/MarkArrowFactory.java +++ b/src/main/java/seng302/visualiser/fxObjects/MarkArrowFactory.java @@ -106,7 +106,7 @@ public class MarkArrowFactory { Arc roundSection = new Arc( 0, 0, MARK_ARROW_SEPARATION, MARK_ARROW_SEPARATION, //Where to start drawing arc from - (roundingSide == RoundingSide.PORT ? 0 : angleOfEntry), + (roundingSide == RoundingSide.PORT ? 180 + angleOfEntry : angleOfEntry), //Which way to go around the mark. (clockwise vs anticlockwise) roundingSide == RoundingSide.PORT ? Math.abs(angleOfExit - angleOfEntry) : -Math.abs(angleOfEntry - angleOfExit) );