From 5bc382304bf9bd5fabc18e8d573555c502c2bd2e Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Fri, 8 Sep 2017 19:15:39 +1200 Subject: [PATCH] Created and linked up bouy to race, and added keybindings to git ignore #story[1196] --- .gitignore | 2 ++ .../visualiser/Controllers/RaceController.java | 8 +++++++- .../src/main/resources/assets/Bouy V1.1.stl | Bin 0 -> 17284 bytes 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 racevisionGame/src/main/resources/assets/Bouy V1.1.stl diff --git a/.gitignore b/.gitignore index 48326a70..c56ab43c 100644 --- a/.gitignore +++ b/.gitignore @@ -183,3 +183,5 @@ local.properties # IntelliJDEA ignore *.iml dedicatedServer/.idea/ +.idea/copyright/ +settings/keyBindings.xml diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java index cd450f18..b2858477 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java @@ -182,10 +182,15 @@ public class RaceController extends Controller { ObservableList 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); diff --git a/racevisionGame/src/main/resources/assets/Bouy V1.1.stl b/racevisionGame/src/main/resources/assets/Bouy V1.1.stl new file mode 100644 index 0000000000000000000000000000000000000000..3ba11615dd45ce3470990c1cd54047feeadd4d58 GIT binary patch literal 17284 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 z