fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed boat track rendering (points were added before boat position set)

Browse Source 
#story[782]
This commit is contained in:
Connor Taylor-Brown
2017-05-03 22:31:34 +12:00
parent 9bab3d3359
commit 0e1bf64177
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Model/Race.java
+1 -1
View File
@@ -217,9 +217,9 @@ public abstract class Race implements Runnable {
for (Boat boat : startingBoats) { for (Boat boat : startingBoats) {
if (boat != null && !boat.isFinished()) { if (boat != null && !boat.isFinished()) {
boat.addTrackPoint(boat.getCurrentPosition());
updatePosition(boat, Math.round(1000 / lastFPS) > 20 ? 15 : Math.round(1000 / lastFPS)); updatePosition(boat, Math.round(1000 / lastFPS) > 20 ? 15 : Math.round(1000 / lastFPS));
checkPosition(boat, totalTimeElapsed); checkPosition(boat, totalTimeElapsed);
boat.addTrackPoint(boat.getCurrentPosition());
} }
} }
if (timerEnabled) if (timerEnabled)
visualiser/src/main/java/seng302/Model/RaceClock.java
+1
View File
@@ -34,6 +34,7 @@ public class RaceClock {
this.zoneId = zoneId; this.zoneId = zoneId;
this.timeString = new SimpleStringProperty(); this.timeString = new SimpleStringProperty();
this.time = (new Date(utcTime)).toInstant().atZone(zoneId); this.time = (new Date(utcTime)).toInstant().atZone(zoneId);
setTime(time);
} }
public static ZonedDateTime getCurrentZonedDateTime(GPSCoordinate gpsCoordinate) { public static ZonedDateTime getCurrentZonedDateTime(GPSCoordinate gpsCoordinate) {
visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
+1 -1
View File
@@ -345,7 +345,7 @@ public class ResizableRaceCanvas extends Canvas {
if (raceAnno) if (raceAnno)
displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition())); displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()));
//TODO this needs to be fixed. //TODO this needs to be fixed.
//drawTrack(boat, colours.get(currentColour)); drawTrack(boat, colours.get(currentColour));
currentColour = (currentColour + 1) % colours.size(); currentColour = (currentColour + 1) % colours.size();
} }
} }