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

Merge branch 'master' into storyD-3D

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-14 16:39:55 +12:00
parent 55713f14a1 86de4e7c0c
commit c42e25df86
11 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/NewPolars.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class NewPolars {
public static void addPolars(double trueWindSpeed, Bearing trueWindAngle, double boatSpeed){
double tws = trueWindSpeed;
double bs = boatSpeed;
double twa = trueWindAngle.degrees();
double twa = trueWindAngle.degrees() + 180;
if (!polars.containsKey(tws)){
polars.put(tws, new TreeMap<>());
}
racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
+3 -1
View File
@@ -29,12 +29,14 @@ public class CommandFactory {
}
switch(action.getBoatAction()) {
case AUTO_PILOT: return new VMGCommand(race, boat);
case VMG: return new VMGCommand(race, boat);
case TACK_GYBE: return new TackGybeCommand(race, boat);
case UPWIND: return new WindCommand(race, boat, true);
case DOWNWIND: return new WindCommand(race, boat, false);
case SAILS_OUT: return new SailsCommand(race, boat, true);
case SAILS_IN: return new SailsCommand(race, boat, false);
case ZOOM_IN: return null;
case ZOOM_OUT: return null;
default: throw new CommandConstructionException("Could not create command for BoatAction: " + action + ". Unknown BoatAction.");
}