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/model/ResizableRaceCanvas.java
+4 -4
View File
@@ -274,7 +274,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
boat.getName(),
boat.getCountry(),
boat.getCurrentSpeed(),
this.map.convertGPS(boat.getCurrentPosition()),
this.map.convertGPS(boat.getPosition()),
boat.getTimeToNextMarkFormatted(this.visualiserRace.getVisualiserRaceState().getRaceClock().getCurrentTime()),
boat.getTimeSinceLastMarkFormatted(this.visualiserRace.getVisualiserRaceState().getRaceClock().getCurrentTime()) );
@@ -325,7 +325,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
}
//Convert position to graph coordinate.
GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
GraphCoordinate pos = this.map.convertGPS(boat.getPosition());
//The x coordinates of each vertex of the boat.
double[] x = {
@@ -361,7 +361,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
private void drawClientBoat(VisualiserBoat boat) {
//Convert position to graph coordinate.
GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
GraphCoordinate pos = this.map.convertGPS(boat.getPosition());
//The x coordinates of each vertex of the boat.
double[] x = {
@@ -459,7 +459,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
private void drawWake(VisualiserBoat boat) {
//Calculate either end of wake line.
GraphCoordinate wakeFrom = this.map.convertGPS(boat.getCurrentPosition());
GraphCoordinate wakeFrom = this.map.convertGPS(boat.getPosition());
GraphCoordinate wakeTo = this.map.convertGPS(boat.getWake());
//Draw.
racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class VisualiserBoat extends Boat {
//Calculate the new coordinate.
GPSCoordinate wakeCoordinate = GPSCoordinate.calculateNewPosition(getCurrentPosition(), wakeDistanceMeters, reverseAzimuth);
GPSCoordinate wakeCoordinate = GPSCoordinate.calculateNewPosition(getPosition(), wakeDistanceMeters, reverseAzimuth);
return wakeCoordinate;
}
racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
+3 -4
View File
@@ -1,7 +1,6 @@
package visualiser.model;
import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.scene.paint.Color;
@@ -229,7 +228,7 @@ public class VisualiserRaceState extends RaceState {
boat.setCurrentLeg(startingLeg);
boat.setTimeAtLastMark(getRaceClock().getCurrentTime());
boat.setCurrentPosition(new GPSCoordinate(0, 0));
boat.setPosition(new GPSCoordinate(0, 0));
}
@@ -254,10 +253,10 @@ public class VisualiserRaceState extends RaceState {
if ((boat.getStatus() == BoatStatusEnum.DNF) || (boat.getStatus() == BoatStatusEnum.PRESTART) || (boat.getCurrentLeg().getLegNumber() < 0)) {
boat.setPosition("-");
boat.setPlacing("-");
} else {
boat.setPosition(Integer.toString(i + 1));
boat.setPlacing(Integer.toString(i + 1));
}
}