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

Fixed sails out / colliding issue. #story[1297]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-25 14:07:29 +13:00
parent 332722e099
commit 7d789c04bb
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/commandFactory/CollisionCommand.java
+1
View File
@@ -36,6 +36,7 @@ public class CollisionCommand extends ObserverCommand {
@Override @Override
public void update(Observable o, Object arg) { public void update(Observable o, Object arg) {
if(GPSCoordinate.calculateDistanceMeters(boat.getPosition(), startingPosition) < distance) { if(GPSCoordinate.calculateDistanceMeters(boat.getPosition(), startingPosition) < distance) {
boat.setVelocityDefault(false);
boat.setPosition(GPSCoordinate.calculateNewPosition(boat.getPosition(), 3, azimuth)); boat.setPosition(GPSCoordinate.calculateNewPosition(boat.getPosition(), 3, azimuth));
} else { } else {
race.deleteObserver(this); race.deleteObserver(this);
racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
+12 -9
View File
@@ -37,15 +37,18 @@ public class SailsCommand extends ObserverCommand {
public void update(Observable o, Object arg) { public void update(Observable o, Object arg) {
double acceleration = 0.5; double acceleration = 0.5;
if(sailsOut && boat.getCurrentSpeed() < goalVelocity) { if (!boat.isColliding()) {
if (!boat.isColliding()) boat.setCurrentSpeed(Math.min(goalVelocity, boat.getCurrentSpeed() + acceleration)); boat.setVelocityDefault(false);
} else if (!sailsOut && boat.getCurrentSpeed() > goalVelocity) { if (sailsOut && boat.getCurrentSpeed() < goalVelocity) {
// Apply deceleration to strictly 0 speed boat.setCurrentSpeed(Math.min(goalVelocity, boat.getCurrentSpeed() + acceleration));
if (!boat.isColliding()) boat.setCurrentSpeed(Math.max(0, boat.getCurrentSpeed() - acceleration)); } else if (!sailsOut && boat.getCurrentSpeed() > goalVelocity) {
} else { // Apply deceleration to strictly 0 speed
// Release boat from SailsCommand control boat.setCurrentSpeed(Math.max(0, boat.getCurrentSpeed() - acceleration));
if(sailsOut) boat.setVelocityDefault(true); } else {
race.deleteObserver(this); // Release boat from SailsCommand control
if (sailsOut) boat.setVelocityDefault(true);
race.deleteObserver(this);
}
} }
} }
} }