diff --git a/src/main/java/seng302/visualiser/GameView3D.java b/src/main/java/seng302/visualiser/GameView3D.java index 6851d2be..3c6c95e5 100644 --- a/src/main/java/seng302/visualiser/GameView3D.java +++ b/src/main/java/seng302/visualiser/GameView3D.java @@ -89,11 +89,11 @@ public class GameView3D extends GameView { } gameObjects = new Group(); - root3D = new Group(isometricCam, gameObjects); + root3D = new Group(chaseCam, gameObjects); view = new SubScene( root3D, 5000, 3000, true, SceneAntialiasing.BALANCED ); - view.setCamera(isometricCam); + view.setCamera(chaseCam); skybox = new Skybox(new Image(getClass().getResourceAsStream("/images/skybox.jpg")), 100000, isometricCam); skybox.getTransforms().addAll(new Rotate(90, Rotate.X_AXIS)); @@ -361,6 +361,7 @@ public class GameView3D extends GameView { }); } + playerBoat.updateMarkIndicator(scaledPoint.findScaledXY(course.get(0).getMidPoint())); gameObjects.getChildren().addAll(wakes); gameObjects.getChildren().addAll(boatObjectGroup); }); diff --git a/src/main/java/seng302/visualiser/cameras/TopDownCamera.java b/src/main/java/seng302/visualiser/cameras/TopDownCamera.java index d01decd4..aef5e5d1 100644 --- a/src/main/java/seng302/visualiser/cameras/TopDownCamera.java +++ b/src/main/java/seng302/visualiser/cameras/TopDownCamera.java @@ -13,7 +13,7 @@ public class TopDownCamera extends PerspectiveCamera implements RaceCamera { private final Double PAN_LIMIT = 40d; private final Double NEAR_ZOOM_LIMIT = -20.0; - private final Double FAR_ZOOM_LIMIT = -145d; + private final Double FAR_ZOOM_LIMIT = -200d; private final Double ZOOM_STEP = 2.5; private ObservableList transforms; @@ -27,7 +27,7 @@ public class TopDownCamera extends PerspectiveCamera implements RaceCamera { super(true); transforms = this.getTransforms(); - zoomFactor = (FAR_ZOOM_LIMIT + NEAR_ZOOM_LIMIT) / 2.0; + zoomFactor = FAR_ZOOM_LIMIT; horizontalPan = 0.0; verticalPan = 0.0; } diff --git a/src/main/resources/maps/horseshoe.xml b/src/main/resources/maps/horseshoe.xml index 4c43f86e..e3124406 100644 --- a/src/main/resources/maps/horseshoe.xml +++ b/src/main/resources/maps/horseshoe.xml @@ -10,8 +10,8 @@ - - + + @@ -64,7 +64,7 @@ - + diff --git a/src/main/resources/meshes/boatSTLs/parrot_sail.stl b/src/main/resources/meshes/boatSTLs/parrot_sail.stl index efe88eee..4c625cb3 100644 Binary files a/src/main/resources/meshes/boatSTLs/parrot_sail.stl and b/src/main/resources/meshes/boatSTLs/parrot_sail.stl differ