Created and linked up bouy to race, and added keybindings to git ignore #story[1196]

main
Fan-Wu Yang 8 years ago
parent 7bad0e53ff
commit 5bc382304b

2
.gitignore vendored

@ -183,3 +183,5 @@ local.properties
# IntelliJDEA ignore
*.iml
dedicatedServer/.idea/
.idea/copyright/
settings/keyBindings.xml

@ -182,10 +182,15 @@ public class RaceController extends Controller {
ObservableList<Subject3D> subjects = FXCollections.observableArrayList();
//read 3d Assets
URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl");
StlMeshImporter importer = new StlMeshImporter();
importer.read(asset);
URL markerAsset = HostController.class.getClassLoader().getResource("assets/Bouy V1.1.stl");
StlMeshImporter importerMark = new StlMeshImporter();
importerMark.read(markerAsset);
view3D = new View3D();
view3D.setDistance(1050);
view3D.setYaw(0);
@ -206,7 +211,8 @@ public class RaceController extends Controller {
canvasBase.getChildren().add(0, view3D);
for(Mark mark: race.getVisualiserRaceState().getMarks()) {
Subject3D subject = new Subject3D(new Sphere(5));
MeshView mesh = new MeshView(importerMark.getImport());
Subject3D subject = new Subject3D(mesh);
// subject.setX(mark.getPosition().getLongitude() * scale);
// subject.setZ(mark.getPosition().getLatitude()* scale);
subject.setX(gpsConverter.convertGPS(mark.getPosition()).getX() * scale);

Loading…
Cancel
Save