michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed map, parrot and camera.

Browse Source
This commit is contained in:
Calum
2017-09-28 16:17:19 +13:00
parent 83218ae0a0
commit ece45ff967
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameView3D.java
+3 -2
View File
@@ -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);
});
src/main/java/seng302/visualiser/cameras/TopDownCamera.java
+2 -2
View File
@@ -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<Transform> 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;
}