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

Ray casting now only supports distance specification.

Browse Source 
#story[1100]
This commit is contained in:
cbt24
2017-08-15 14:26:43 +12:00
parent 7d64a43350
commit 9ca50aa66c
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/shared/model/CompoundMark.java
+7 -6
View File
@@ -146,27 +146,28 @@ public class CompoundMark implements Collider {
}
@Override
public boolean rayCast(MockBoat boat, Collision collision) {
public boolean rayCast(MockBoat boat, double distance) {
GPSCoordinate position = boat.getCurrentPosition();
double distance = GPSCoordinate.calculateDistanceMeters(position, closestMark(position).getPosition());
double actualDistance = GPSCoordinate.calculateDistanceMeters(position, closestMark(position).getPosition());
// Compass direction of collider
Bearing absolute = Bearing.fromAzimuth(GPSCoordinate.calculateAzimuth(position, closestMark(position).getPosition()));
// Direction of collider from heading
Bearing relative = Bearing.fromDegrees(absolute.degrees() - boat.getBearing().degrees());
if(distance <= collision.getDistance() && (int)relative.degrees() == (int)collision.getBearing().degrees()) {
onCollisionEnter(collision);
if(actualDistance <= distance) {
onCollisionEnter(new Collision(relative, distance));
return true;
} else return false;
}
@Override
public boolean rayCast(MockBoat boat) {
return rayCast(boat, new Collision(Bearing.fromDegrees(0), 100));
return rayCast(boat, 100);
}
@Override
public void onCollisionEnter(Collision e) {
System.out.println(e.getBearing().degrees());
if(e.getBearing().degrees() < 90) System.out.println("Starboard");
else if(e.getBearing().degrees() > 270) System.out.println("Port");
}
}