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

Boats bounce during collision if pointing into collision

Browse Source 
#story[1100]
This commit is contained in:
cbt24
2017-08-16 17:55:33 +12:00
parent eaa0d2e82b
commit f7d0e9d466
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/shared/model/Boat.java
+8
View File
@@ -392,6 +392,11 @@ public class Boat extends Collider {
this.timeAtLastMark = timeAtLastMark;
}
public void bounce(double repulsionRadius) {
Azimuth reverseAzimuth = Azimuth.fromDegrees(getBearing().degrees() - 180d);
setPosition(GPSCoordinate.calculateNewPosition(getPosition(), 2 * repulsionRadius, reverseAzimuth));
}
@Override
public boolean rayCast(Boat boat) {
if(boat != this) {
@@ -401,5 +406,8 @@ public class Boat extends Collider {
@Override
public void onCollisionEnter(Boat collider, Collision e) {
if(e.getBearing().degrees() > 270 || e.getBearing().degrees() < 90) {
collider.bounce(100);
}
}
}
racevisionGame/src/main/java/shared/model/Mark.java
+1 -2
View File
@@ -90,7 +90,6 @@ public class Mark extends Collider {
@Override
public void onCollisionEnter(Boat collider, Collision e) {
Azimuth reverseAzimuth = Azimuth.fromDegrees(collider.getBearing().degrees() - 180d);
collider.setPosition(GPSCoordinate.calculateNewPosition(collider.getPosition(), 2 * repulsionRadius, reverseAzimuth));
collider.bounce(repulsionRadius);
}
}