michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into Story64_SailsAnimations

Browse Source 
# Conflicts:
#	src/main/java/seng302/visualiser/GameClient.java
This commit is contained in:
Kusal Ekanayake
2017-08-14 13:32:57 +12:00
parent add6856727 e4cc5a0950
commit 2e892f35ea
24 changed files with 383 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/PolarTable.java
-3
View File
@@ -71,8 +71,6 @@ public final class PolarTable {
} catch (IOException e) {
System.out.println("[PolarTable] IO exception");
}
}
@@ -155,7 +153,6 @@ public final class PolarTable {
public static Double getClosestWindSpeedInPolar(Double thisWindSpeed) {
Double smallestDif = Double.POSITIVE_INFINITY;
Double closestWind = 0d;
for (Double polarWindSpeed : polarTable.keySet()) {
Double difference = Math.abs(polarWindSpeed - thisWindSpeed);
if (difference < smallestDif) {
src/main/java/seng302/model/Yacht.java
+3 -3
View File
@@ -53,7 +53,7 @@ public class Yacht {
private Integer legNumber = 0;
//SERVER SIDE
private final Double TURN_STEP = 5.0;
public static final Double TURN_STEP = 5.0; //This should be in some utils class somewhere 2bh. Public for tests sake.
private Double lastHeading;
private Boolean sailIn = false;
private GeoPoint location;
@@ -452,9 +452,9 @@ public class Yacht {
private void turnTowardsHeading(Double newHeading) {
Double newVal = heading - newHeading;
if (Math.floorMod(newVal.longValue(), 360L) > 180) {
adjustHeading(TURN_STEP);
adjustHeading(TURN_STEP / 5);
} else {
adjustHeading(-TURN_STEP);
adjustHeading(-TURN_STEP / 5);
}
}