michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added drawing to fx thread

Browse Source 
#fix
This commit is contained in:
Calum
2017-09-28 14:57:52 +13:00
parent c98297ea79
commit e1ebbc71c1
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/MiniMap.java
+2
View File
@@ -43,12 +43,14 @@ public class MiniMap extends MapPreview {
boatIcons.put(yacht, boatIcon); boatIcons.put(yacht, boatIcon);
boatIcon.getTransforms().add(new Rotate(0)); boatIcon.getTransforms().add(new Rotate(0));
yacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> { yacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
Platform.runLater(() -> {
Polygon bi = boatIcons.get(boat); Polygon bi = boatIcons.get(boat);
Point2D p2d = scaledPoint.findScaledXY(lat, lon); Point2D p2d = scaledPoint.findScaledXY(lat, lon);
bi.setLayoutX(p2d.getX()); bi.setLayoutX(p2d.getX());
bi.setLayoutY(p2d.getY()); bi.setLayoutY(p2d.getY());
((Rotate) bi.getTransforms().get(0)).setAngle(heading); ((Rotate) bi.getTransforms().get(0)).setAngle(heading);
}); });
});
} }
Platform.runLater(() -> { Platform.runLater(() -> {
gameObjects.getChildren().addAll(boatIcons.values()); gameObjects.getChildren().addAll(boatIcons.values());
src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java
+4 -9
View File
@@ -28,8 +28,7 @@ public class Marker2D extends Group {
mark.setRadius(5); mark.setRadius(5);
mark.setCenterX(0); mark.setCenterX(0);
mark.setCenterY(0); mark.setCenterY(0);
Platform.runLater(() -> this.getChildren() Platform.runLater(() -> this.getChildren().add(mark));
.addAll(mark, new Group())); //Empty group placeholder or arrows.
} }
/** /**
@@ -82,13 +81,9 @@ public class Marker2D extends Group {
private void showArrow(List<Group> arrowList, int arrowListIndex) { private void showArrow(List<Group> arrowList, int arrowListIndex) {
if (arrowListIndex < arrowList.size()) { if (arrowListIndex < arrowList.size()) {
if (arrowListIndex == 1) { Platform.runLater(() ->
; this.getChildren().setAll(mark, arrowList.get(arrowListIndex))
} );
Platform.runLater(() -> {
this.getChildren().remove(1);
this.getChildren().add(arrowList.get(arrowListIndex));
});
} }
} }