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

Merge branch 'master' into story_64_sails

Browse Source 
# Conflicts:
#	racevisionGame/src/main/java/shared/model/Boat.java
#	racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
This commit is contained in:
Joseph Gardner
2017-08-17 12:59:25 +12:00
parent d7e0bfa86c 96acb6251e
commit 20c9870fea
29 changed files with 538 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
+3 -4
View File
@@ -9,7 +9,6 @@ import shared.model.GPSCoordinate;
import shared.model.Mark;
import visualiser.model.ThisBoat;
import visualiser.model.VisualiserBoat;
import visualiser.model.VisualiserRaceEvent;
import visualiser.model.VisualiserRaceState;
import java.util.logging.Level;
@@ -69,7 +68,7 @@ public class BoatLocationCommand implements Command {
boatLocation.getLatitude(),
boatLocation.getLongitude());
boat.setCurrentPosition(gpsCoordinate);
boat.setPosition(gpsCoordinate);
//Bearing.
boat.setBearing(boatLocation.getHeading());
@@ -96,8 +95,8 @@ public class BoatLocationCommand implements Command {
* @param boat The boat to add a track point to.
*/
private void attemptAddTrackPoint(VisualiserBoat boat) {
if (boat.getStatus() == BoatStatusEnum.RACING && boat.getSourceID() == ThisBoat.getInstance().getSourceID()) {
boat.addTrackPoint(boat.getCurrentPosition(), visualiserRace.getRaceClock().getCurrentTime());
if (boat.getStatus() == BoatStatusEnum.RACING) {
boat.addTrackPoint(boat.getPosition(), visualiserRace.getRaceClock().getCurrentTime());
}
}