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 00000000..3ba11615 Binary files /dev/null and b/racevisionGame/src/main/resources/assets/Bouy V1.1.stl differ