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

Fixed null pointer when race finishes #story[1299]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-27 13:08:29 +13:00
parent 13f3f595d2
commit 7ac181f33d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/NextMarkController.java
+8
View File
@@ -49,9 +49,13 @@ public class NextMarkController {
AnimationTimer arrow2d = new AnimationTimer() { AnimationTimer arrow2d = new AnimationTimer() {
@Override @Override
public void handle(long now) { public void handle(long now) {
if (boat.getCurrentLeg().getEndCompoundMark() != null) {
CompoundMark target = boat.getCurrentLeg().getEndCompoundMark(); CompoundMark target = boat.getCurrentLeg().getEndCompoundMark();
Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate()); Bearing headingToMark = GPSCoordinate.calculateBearing(boat.getPosition(), target.getAverageGPSCoordinate());
arrowStackPane2d.setRotate(headingToMark.degrees()); arrowStackPane2d.setRotate(headingToMark.degrees());
} else {
stop();
}
} }
}; };
arrow2d.start(); arrow2d.start();
@@ -73,10 +77,14 @@ public class NextMarkController {
AnimationTimer arrow3d = new AnimationTimer() { AnimationTimer arrow3d = new AnimationTimer() {
@Override @Override
public void handle(long now) { public void handle(long now) {
if (boat.getCurrentLeg().getEndCompoundMark() != null) {
arrow.getTransforms().clear(); arrow.getTransforms().clear();
double zRotation = calculateZRotate(); double zRotation = calculateZRotate();
arrow.setRotate(calculateXRotate(zRotation)); arrow.setRotate(calculateXRotate(zRotation));
arrow.getTransforms().add(new Rotate(zRotation, new Point3D(0, 0, 1))); arrow.getTransforms().add(new Rotate(zRotation, new Point3D(0, 0, 1)));
} else {
stop();
}
} }
}; };
arrow3d.start(); arrow3d.start();