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

Resolved issue #42 - "putting sails out changes boat bearing to face target gate"

Browse Source 
#story[1196]
This commit is contained in:
cbt24
2017-09-07 13:23:56 +12:00
parent 00cedf4d4d
commit 844b48a81a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/MockRace.java
-5
View File
@@ -356,11 +356,6 @@ public class MockRace extends RaceState {
checkPosition(boat, totalElapsedMilliseconds); checkPosition(boat, totalElapsedMilliseconds);
if (boat.getCurrentSpeed() == 0) {
newOptimalVMG(boat);
boat.setBearing(boat.calculateBearingToNextMarker());
}
setBoatSpeed(boat); setBoatSpeed(boat);
//Calculates the distance travelled, in meters, in the current timeslice. //Calculates the distance travelled, in meters, in the current timeslice.
racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
+3 -1
View File
@@ -7,8 +7,9 @@ import java.util.Observable;
public class SailsCommand extends ObserverCommand { public class SailsCommand extends ObserverCommand {
private boolean sailsOut; private boolean sailsOut;
private double goalVelocity;
public SailsCommand(MockRace race, MockBoat boat, Boolean sailsOut) { public SailsCommand(MockRace race, MockBoat boat, boolean sailsOut) {
super(race, boat); super(race, boat);
this.sailsOut = sailsOut; this.sailsOut = sailsOut;
} }
@@ -16,6 +17,7 @@ public class SailsCommand extends ObserverCommand {
@Override @Override
public void execute() { public void execute() {
this.boat.setSailsOut(this.sailsOut); this.boat.setSailsOut(this.sailsOut);
} }
@Override @Override