diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java index ee6f665d..2a2b7cb7 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java @@ -181,29 +181,33 @@ public class RaceController extends Controller { view3D.setItems(subjects); canvasBase.getChildren().add(0, view3D); - /*for(Mark mark: race.getVisualiserRaceState().getMarks()) { + for(Mark mark: race.getVisualiserRaceState().getMarks()) { Subject3D subject = new Subject3D(new Sphere(2)); - subject.setX(mark.getPosition().getLongitude() * 1000); - subject.setZ(mark.getPosition().getLatitude() * 1000); + subject.setX(mark.getPosition().getLongitude()); + subject.setZ(mark.getPosition().getLatitude()); + System.out.println(subject.getPosition().toString()); subjects.add(subject); - }*/ + } - URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl"); + try { + VisualiserBoat boat = race.getVisualiserRaceState().getBoat(race.getVisualiserRaceState().getPlayerBoatID()); - StlMeshImporter importer = new StlMeshImporter(); - importer.read(asset); - Subject3D subject = new Subject3D(new MeshView(importer.getImport())); + URL asset = HostController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl"); - subjects.add(subject); + StlMeshImporter importer = new StlMeshImporter(); + importer.read(asset); + Subject3D subject = new Subject3D(new MeshView(importer.getImport())); + subject.setX(boat.getPosition().getLongitude()); + subject.setZ(boat.getPosition().getLatitude()); - view3D.setPivot(subject); - view3D.setDistance(500); - view3D.setYaw(45); - view3D.setPitch(20); + System.out.println(subject.getPosition().toString()); + subjects.add(subject); - try { - VisualiserBoat boat = race.getVisualiserRaceState().getBoat(race.getVisualiserRaceState().getPlayerBoatID()); + view3D.setPivot(subject); + view3D.setDistance(500); + view3D.setYaw(0); + view3D.setPitch(20); AnimationTimer rotate = new AnimationTimer() { @Override public void handle(long now) { diff --git a/racevisionGame/src/main/java/visualiser/layout/Subject3D.java b/racevisionGame/src/main/java/visualiser/layout/Subject3D.java index 2812f980..f472ea12 100644 --- a/racevisionGame/src/main/java/visualiser/layout/Subject3D.java +++ b/racevisionGame/src/main/java/visualiser/layout/Subject3D.java @@ -38,16 +38,8 @@ public class Subject3D { return mesh; } - public double getX() { - return position.getTx(); - } - - public double getY() { - return position.getTy(); - } - - public double getZ() { - return position.getTz(); + public Translate getPosition() { + return this.position; } public void setX(double x) { diff --git a/racevisionGame/src/main/java/visualiser/layout/View3D.java b/racevisionGame/src/main/java/visualiser/layout/View3D.java index 62c913b9..00066a4a 100644 --- a/racevisionGame/src/main/java/visualiser/layout/View3D.java +++ b/racevisionGame/src/main/java/visualiser/layout/View3D.java @@ -117,9 +117,7 @@ public class View3D extends Pane { * @param pivot centred object */ public void setPivot(Subject3D pivot) { - this.pivot.setX(pivot.getX()); - this.pivot.setY(pivot.getY()); - this.pivot.setZ(pivot.getZ()); + this.pivot = pivot.getPosition(); } /**