Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules

This commit is contained in:
hba56
2017-05-04 13:11:58 +12:00
@@ -84,17 +84,19 @@ public class ResizableRaceCanvas extends Canvas {
} }
public void displayBoat(Boat boat, double angle, Color colour) { public void displayBoat(Boat boat, double angle, Color colour) {
GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition()); if (boat.getCurrentPosition() != null) {
Paint paint = colour; GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
Paint paint = colour;
double[] x = {pos.getX() - 6, pos.getX(), pos.getX() + 6}; double[] x = {pos.getX() - 6, pos.getX(), pos.getX() + 6};
double[] y = {pos.getY() + 12, pos.getY() - 12, pos.getY() + 12}; double[] y = {pos.getY() + 12, pos.getY() - 12, pos.getY() + 12};
gc.setFill(paint); gc.setFill(paint);
gc.save(); gc.save();
rotate(angle, pos.getX(), pos.getY()); rotate(angle, pos.getX(), pos.getY());
gc.fillPolygon(x, y, 3); gc.fillPolygon(x, y, 3);
gc.restore(); gc.restore();
}
} }
/** /**