|
|
|
|
@ -218,20 +218,20 @@ public class RaceController extends Controller {
|
|
|
|
|
for(Mark mark: race.getVisualiserRaceState().getMarks()) {
|
|
|
|
|
MeshView mesh = new MeshView(importerMark.getImport());
|
|
|
|
|
Subject3D markModel = new Subject3D(mesh);
|
|
|
|
|
Subject3D markRadius = new MarkRadius(3);
|
|
|
|
|
// Subject3D markRadius = new MarkRadius(3);
|
|
|
|
|
|
|
|
|
|
double x = gpsConverter.convertGPS(mark.getPosition()).getX();
|
|
|
|
|
double z = gpsConverter.convertGPS(mark.getPosition()).getY();
|
|
|
|
|
|
|
|
|
|
markModel.setX(x);
|
|
|
|
|
markModel.setZ(z);
|
|
|
|
|
markModel.setScale(0.1);
|
|
|
|
|
markModel.setScale(3.5);
|
|
|
|
|
|
|
|
|
|
markRadius.setX(x);
|
|
|
|
|
markRadius.setZ(z);
|
|
|
|
|
// markRadius.setX(x);
|
|
|
|
|
// markRadius.setZ(z);
|
|
|
|
|
|
|
|
|
|
viewSubjects.add(markModel);
|
|
|
|
|
viewSubjects.add(markRadius);
|
|
|
|
|
// viewSubjects.add(markRadius);
|
|
|
|
|
}
|
|
|
|
|
// Position and add each boat to view
|
|
|
|
|
for(VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
|
|
|
|
|
@ -242,12 +242,12 @@ public class RaceController extends Controller {
|
|
|
|
|
mesh = new MeshView(importerBurgerBoat.getImport());
|
|
|
|
|
}
|
|
|
|
|
Subject3D boatModel = new Subject3D(mesh);
|
|
|
|
|
Subject3D boatArrow = new BoatArrow(12);
|
|
|
|
|
//Subject3D boatArrow = new BoatArrow(12);
|
|
|
|
|
|
|
|
|
|
boatModel.setScale(0.1);
|
|
|
|
|
boatModel.setScale(1.5);
|
|
|
|
|
|
|
|
|
|
viewSubjects.add(boatModel);
|
|
|
|
|
viewSubjects.add(boatArrow);
|
|
|
|
|
//viewSubjects.add(boatArrow);
|
|
|
|
|
|
|
|
|
|
// Track this boat's movement with the new subject
|
|
|
|
|
AnimationTimer trackBoat = new AnimationTimer() {
|
|
|
|
|
@ -261,9 +261,9 @@ public class RaceController extends Controller {
|
|
|
|
|
boatModel.setX(x);
|
|
|
|
|
boatModel.setZ(z);
|
|
|
|
|
|
|
|
|
|
boatArrow.setHeading(heading);
|
|
|
|
|
boatArrow.setX(x);
|
|
|
|
|
boatArrow.setZ(z);
|
|
|
|
|
// boatArrow.setHeading(heading);
|
|
|
|
|
// boatArrow.setX(x);
|
|
|
|
|
// boatArrow.setZ(z);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
trackBoat.start();
|
|
|
|
|
|