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

Updated yacht-yacht collision to push back both yacht.

Browse Source 
Tweaked acceleration to increase time to top speed.

#story[1117] #pair[ptg19, zyt10]
This commit is contained in:
Zhi You Tan
2017-08-13 15:14:14 +12:00
parent c58cb1a476
commit 93cb0ca600
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/Yacht.java
+22 -17
View File
@@ -43,7 +43,7 @@ public class Yacht extends Observable {
private static final Double BOUNCE_DISTANCE_MARK = 20.0;
private static final Double BOUNCE_DISTANCE_YACHT = 30.0;
private static final Integer COLLISION_UPDATE_INTERVAL = 100;
private static final Double COLLISION_VELOCITY_PENALTY = 0.3;
//BOTH AFAIK
private String boatType;
@@ -132,7 +132,7 @@ public class Yacht extends Observable {
if (sailIn && velocity <= maxBoatSpeed && maxBoatSpeed != 0d) {
if (velocity < maxBoatSpeed) {
velocity += maxBoatSpeed / 15; // Acceleration
velocity += maxBoatSpeed / 120; // Acceleration
}
if (velocity > maxBoatSpeed) {
velocity = maxBoatSpeed; // Prevent the boats from exceeding top speed
@@ -159,14 +159,18 @@ public class Yacht extends Observable {
Yacht collidedYacht = checkCollision(calculatedPoint);
if (collidedYacht != null) {
location = calculateBounceBack(new GeoPoint(collidedYacht.getLocation().getLat(),
collidedYacht.getLocation().getLng()), BOUNCE_DISTANCE_YACHT);
location = calculateBounceBackYacht(this, collidedYacht, BOUNCE_DISTANCE_YACHT);
velocity *= COLLISION_VELOCITY_PENALTY;
collidedYacht.setLocation(
calculateBounceBackYacht(collidedYacht, this, BOUNCE_DISTANCE_YACHT));
collidedYacht.setVelocity(collidedYacht.getVelocity() * COLLISION_VELOCITY_PENALTY);
setChanged();
notifyObservers(this.sourceId);
} else if (markCollidedWith() != null) {
location = calculateBounceBack(
new GeoPoint(markCollidedWith().getLat(), markCollidedWith().getLng()),
BOUNCE_DISTANCE_MARK);
velocity *= COLLISION_VELOCITY_PENALTY;
setChanged();
notifyObservers(this.sourceId);
} else {
@@ -212,6 +216,19 @@ public class Yacht extends Observable {
return GeoUtility.getGeoCoordinate(location, newHeading.doubleValue(), bounceDistance);
}
private GeoPoint calculateBounceBackYacht(Yacht collidingYacht, Yacht collidedYacht,
Double bounceDistance) {
Double heading = GeoUtility
.getBearing(collidingYacht.getLocation(), collidedYacht.getLocation());
heading -= 180;
Integer faultYachtHeading = Math.floorMod(heading.intValue(), 360);
return GeoUtility
.getGeoCoordinate(collidingYacht.getLocation(), faultYachtHeading.doubleValue(),
bounceDistance);
}
/**
* Calculates the distance to the next mark (closest of the two if a gate mark). For purposes
@@ -690,23 +707,11 @@ public class Yacht extends Observable {
* @return yacht which collided with this yacht
*/
private Yacht checkCollision(GeoPoint calculatedPoint) {
// Basic right of way calculation. (Might be wrong)
Boolean rightOfWay;
Double windDirection = GameState.getWindDirection();
if (windDirection >= 180) {
Double angle = windDirection - 180;
rightOfWay = getHeading() > windDirection || getHeading() <= angle;
} else {
Double angle = 180 - windDirection;
rightOfWay = getHeading() > windDirection && getHeading() < 360 - angle;
}
for (Yacht yacht : GameState.getYachts().values()) {
if (yacht != this) {
Double distance = GeoUtility.getDistance(yacht.getLocation(), calculatedPoint);
if (distance < YACHT_COLLISION_DISTANCE && !rightOfWay) {
return this;
} else if (distance < YACHT_COLLISION_DISTANCE && rightOfWay) {
if (distance < YACHT_COLLISION_DISTANCE) {
return yacht;
}
}