Annotations go on top and boundaries now update
- Fixed FPS and other annotations being hidden under the map - Fixed boundaries not updating with the visualiser. #story[782]
This commit is contained in:
@@ -84,6 +84,7 @@ public class RaceController extends Controller {
|
|||||||
public void updateMap(ObservableList<Boat> boats) {
|
public void updateMap(ObservableList<Boat> boats) {
|
||||||
raceMap.setBoats(boats);
|
raceMap.setBoats(boats);
|
||||||
raceMap.update();
|
raceMap.update();
|
||||||
|
raceBoundaries.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -124,15 +125,6 @@ public class RaceController extends Controller {
|
|||||||
StreamedRace newRace = new StreamedRace(visualiserInput, this);
|
StreamedRace newRace = new StreamedRace(visualiserInput, this);
|
||||||
//newRace.initialiseBoats();
|
//newRace.initialiseBoats();
|
||||||
|
|
||||||
|
|
||||||
raceBoundaries = new ResizableRaceMap(visualiserInput.getCourse());
|
|
||||||
raceBoundaries.setMouseTransparent(true);
|
|
||||||
raceBoundaries.widthProperty().bind(canvasBase.widthProperty());
|
|
||||||
raceBoundaries.heightProperty().bind(canvasBase.heightProperty());
|
|
||||||
raceBoundaries.draw();
|
|
||||||
raceBoundaries.setVisible(true);
|
|
||||||
canvasBase.getChildren().add(raceBoundaries);
|
|
||||||
|
|
||||||
raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
|
raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
|
||||||
raceMap.setMouseTransparent(true);
|
raceMap.setMouseTransparent(true);
|
||||||
raceMap.widthProperty().bind(canvasBase.widthProperty());
|
raceMap.widthProperty().bind(canvasBase.widthProperty());
|
||||||
@@ -141,7 +133,15 @@ public class RaceController extends Controller {
|
|||||||
raceMap.draw();
|
raceMap.draw();
|
||||||
raceMap.setVisible(true);
|
raceMap.setVisible(true);
|
||||||
|
|
||||||
canvasBase.getChildren().add(raceMap);
|
canvasBase.getChildren().add(0, raceMap);
|
||||||
|
|
||||||
|
raceBoundaries = new ResizableRaceMap(visualiserInput.getCourse());
|
||||||
|
raceBoundaries.setMouseTransparent(true);
|
||||||
|
raceBoundaries.widthProperty().bind(canvasBase.widthProperty());
|
||||||
|
raceBoundaries.heightProperty().bind(canvasBase.heightProperty());
|
||||||
|
raceBoundaries.draw();
|
||||||
|
raceBoundaries.setVisible(true);
|
||||||
|
canvasBase.getChildren().add(0, raceBoundaries);
|
||||||
|
|
||||||
race.setVisible(true);
|
race.setVisible(true);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user