Renamed sharedModel module to racevisionGame - this is intended to be our single module program.
Moved Boat/MockBoat/VisualiserBoat into it. Moved Polars, polarParser, VMG, and polar exception. Moved the networking stuff into it. Moved angle, azimuth, bearing into it. Moved gpscoordinate into it. Moved mark/compoundMark into it. Moved leg into it. Moved trackpoint into it.
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
package visualiser.model;
|
||||
|
||||
|
||||
import shared.model.GPSCoordinate;
|
||||
|
||||
/**
|
||||
* A TrackPoint is a point plotted to display the track a
|
||||
* {@link VisualiserBoat Boat} has travelled in a race. <br>
|
||||
* TrackPoints are displayed on a
|
||||
* {@link seng302.Model.ResizableRaceCanvas ResizableRaceCanvas}, via the
|
||||
* {@link seng302.Controllers.RaceController RaceController}. <br>
|
||||
* Track points can be made visible or hidden via the RaceController's
|
||||
* {@link seng302.Model.Annotations Annotations}.
|
||||
*/
|
||||
public class TrackPoint {
|
||||
private final GPSCoordinate coordinate;
|
||||
private final long timeAdded;
|
||||
private final long expiry;
|
||||
private final double minAlpha;
|
||||
|
||||
/**
|
||||
* Creates a new track point with fixed GPS coordinates and time, to reach minimum opacity on expiry.
|
||||
*
|
||||
* @param coordinate position of point on physical race map
|
||||
* @param timeAdded system clock at time of addition
|
||||
* @param expiry time to minimum opacity after added
|
||||
*/
|
||||
public TrackPoint(GPSCoordinate coordinate, long timeAdded, long expiry) {
|
||||
this.coordinate = coordinate;
|
||||
this.timeAdded = timeAdded;
|
||||
this.expiry = expiry;
|
||||
this.minAlpha = 0.1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the position of the point on physical race map.
|
||||
*
|
||||
* @return GPS coordinate of point
|
||||
*/
|
||||
public GPSCoordinate getCoordinate() {
|
||||
return coordinate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets opacity of point scaled by age in proportion to expiry, between 1 and minimum opacity inclusive.
|
||||
*
|
||||
* @return greater of minimum opacity and scaled opacity
|
||||
*/
|
||||
public double getAlpha() {
|
||||
return Double.max(minAlpha, 1.0 - (double) (System.currentTimeMillis() - timeAdded) / expiry);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets time point was added to track.
|
||||
*
|
||||
* @return system clock at time of addition
|
||||
*/
|
||||
public long getTimeAdded() {
|
||||
return timeAdded;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
package visualiser.model;
|
||||
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.property.StringProperty;
|
||||
import network.Messages.Enums.BoatStatusEnum;
|
||||
import org.geotools.referencing.GeodeticCalculator;
|
||||
import shared.model.Boat;
|
||||
import shared.model.GPSCoordinate;
|
||||
|
||||
import java.awt.geom.Point2D;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.util.Queue;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
/**
|
||||
* Represents a Boat on the visualiser side of a race.
|
||||
* This adds visualiser specific functionality to a boat.
|
||||
* This class is used to represent and store information about a boat which may
|
||||
* travel around in a race. It is displayed on the
|
||||
* {@link seng302.Model.ResizableRaceCanvas ResizableRaceCanvas} via the
|
||||
* {@link seng302.Controllers.RaceController RaceController}.
|
||||
*/
|
||||
public class VisualiserBoat extends Boat {
|
||||
|
||||
|
||||
private final Queue<TrackPoint> track = new ConcurrentLinkedQueue<>();
|
||||
|
||||
private long nextValidTime = 0;
|
||||
|
||||
private ZonedDateTime timeSinceLastMark;
|
||||
|
||||
/**
|
||||
* Boat initializer which keeps all of the information of the boat.
|
||||
*
|
||||
* @param sourceID The source ID of the boat.
|
||||
* @param name Name of the Boat.
|
||||
* @param abbrev The team/country abbreviation of the boat.
|
||||
*/
|
||||
public VisualiserBoat(int sourceID, String name, String abbrev) {
|
||||
super(sourceID, name, abbrev);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the position of the end of the boat's wake, which is 180 degrees
|
||||
* from the boat's heading, and whose length is proportional to the boat's
|
||||
* speed.
|
||||
*
|
||||
* @return GPSCoordinate of wake endpoint.
|
||||
*/
|
||||
public GPSCoordinate getWake() {
|
||||
double reverseHeading = getBearing().degrees() - 180;
|
||||
double wakeScale = 5;
|
||||
double distance = wakeScale * getCurrentSpeed();
|
||||
|
||||
GeodeticCalculator calc = new GeodeticCalculator();
|
||||
calc.setStartingGeographicPoint(
|
||||
new Point2D.Double(getCurrentPosition().getLongitude(), getCurrentPosition().getLatitude())
|
||||
);
|
||||
calc.setDirection(reverseHeading, distance);
|
||||
Point2D endpoint = calc.getDestinationGeographicPoint();
|
||||
return new GPSCoordinate(endpoint.getY(), endpoint.getX());
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a new point to boat's track.
|
||||
* @param coordinate of point on track
|
||||
* @see seng302.Model.TrackPoint
|
||||
*/
|
||||
public void addTrackPoint(GPSCoordinate coordinate) {
|
||||
Boolean added = System.currentTimeMillis() >= nextValidTime;
|
||||
long currentTime = System.currentTimeMillis();
|
||||
if (added && (this.getStatus() == BoatStatusEnum.RACING)) {
|
||||
float trackPointTimeInterval = 5000;
|
||||
nextValidTime = currentTime + (long) trackPointTimeInterval;
|
||||
int TRACK_POINT_LIMIT = 10;
|
||||
track.add(new TrackPoint(coordinate, currentTime, TRACK_POINT_LIMIT * (long) trackPointTimeInterval));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the boat's sampled track between start of race and current time.
|
||||
* @return queue of track points
|
||||
* @see seng302.Model.TrackPoint
|
||||
*/
|
||||
public Queue<TrackPoint> getTrack() {
|
||||
return track;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Print method prints the name of the boat
|
||||
*
|
||||
* @return Name of the boat.
|
||||
*/
|
||||
public String toString() {
|
||||
return getName();
|
||||
}
|
||||
|
||||
public ZonedDateTime getTimeSinceLastMark() {
|
||||
return timeSinceLastMark;
|
||||
}
|
||||
|
||||
public void setTimeSinceLastMark(ZonedDateTime timeSinceLastMark) {
|
||||
this.timeSinceLastMark = timeSinceLastMark;
|
||||
}
|
||||
|
||||
|
||||
public String getFormattedEstTime() {
|
||||
if (getEstimatedTime() < 0) {
|
||||
return " -";
|
||||
}
|
||||
if (getEstimatedTime() <= 60) {
|
||||
return " " + getEstimatedTime() + "s";
|
||||
} else {
|
||||
long seconds = getEstimatedTime() % 60;
|
||||
long minutes = (getEstimatedTime() - seconds) / 60;
|
||||
return String.format(" %dm %ds", minutes, seconds);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user