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

fix to keep boats in the bounds

Browse Source 
#story[#874, 873]
This commit is contained in:
hba56
2017-05-23 15:17:19 +12:00
parent db3f4a5b2b
commit 2ac932b4f3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mock/src/main/java/seng302/Model/Race.java
+4 -5
View File
@@ -591,15 +591,14 @@ public class Race implements Runnable {
Azimuth azimuth = Azimuth.fromBearing(boat.getBearing());
GPSCoordinate testBounds = GPSCoordinate.calculateNewPosition(boat.getCurrentPosition(),
(100.0 / Constants.NMToMetersConversion), azimuth);
//If the new vmg improves velocity, use it. //If the new vmg improves velocity, use it.
if (improvesVelocity(boat, newVMG)) { if (improvesVelocity(boat, newVMG)) {
boat.setVMG(newVMG); boat.setVMG(newVMG);
}else if (!GPSCoordinate.isInsideBoundary(boat.getCurrentPosition(), boundary)){ }else if (!GPSCoordinate.isInsideBoundary(testBounds, boundary)){
//checks to see if the new vmg sends the boat out of bounds and if so mirrors its direction in the wind //checks to see if the new vmg sends the boat out of bounds and if so mirrors its direction in the wind
Azimuth azimuth = Azimuth.fromBearing(boat.getBearing());
GPSCoordinate test = GPSCoordinate.calculateNewPosition(boat.getCurrentPosition(),
(100.0 / Constants.NMToMetersConversion), azimuth);
double currDegrees = newVMG.getBearing().degrees(); double currDegrees = newVMG.getBearing().degrees();
double windDirectionDegrees = this.windDirection.degrees(); double windDirectionDegrees = this.windDirection.degrees();
double tempHeading = (currDegrees - windDirectionDegrees +90)%360; double tempHeading = (currDegrees - windDirectionDegrees +90)%360;