From c038010bd283f01fa53104d6a1792a2135eb2a2e Mon Sep 17 00:00:00 2001 From: cbt24 Date: Sat, 6 May 2017 19:22:20 +1200 Subject: [PATCH] Draws track for racing boats only to reduce information clutter. - Add track point only when boat status is "Racing" #story[782] --- visualiser/src/main/java/seng302/Mock/StreamedRace.java | 4 +++- visualiser/src/main/java/seng302/Model/Race.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/visualiser/src/main/java/seng302/Mock/StreamedRace.java b/visualiser/src/main/java/seng302/Mock/StreamedRace.java index 433c2230..dc89a0f3 100644 --- a/visualiser/src/main/java/seng302/Mock/StreamedRace.java +++ b/visualiser/src/main/java/seng302/Mock/StreamedRace.java @@ -65,7 +65,9 @@ public class StreamedRace extends Race { boat.setCurrentLeg(legs.get(legNumber)); } - if (boatStatus == BoatStatus.DNF) { + if (boatStatus == BoatStatus.RACING) { + boat.addTrackPoint(boat.getCurrentPosition()); + } else if (boatStatus == BoatStatus.DNF) { boat.setDnf(true); } else if (boatStatus == BoatStatus.FINISHED || legNumber > raceData.getLegs().size()) { boatsFinished++; diff --git a/visualiser/src/main/java/seng302/Model/Race.java b/visualiser/src/main/java/seng302/Model/Race.java index 7ea0edcb..23ea73dc 100644 --- a/visualiser/src/main/java/seng302/Model/Race.java +++ b/visualiser/src/main/java/seng302/Model/Race.java @@ -142,7 +142,6 @@ public abstract class Race implements Runnable { if (boat != null && !boat.isFinished()) { updatePosition(boat, Math.round(1000 / lastFPS) > 20 ? 15 : Math.round(1000 / lastFPS)); checkPosition(boat, totalTimeElapsed); - boat.addTrackPoint(boat.getCurrentPosition()); } } }