- Perspective Camera Works

- Top Down Camera Works
- Started on chase cam but the math is a bit tricky.

tags : #story[1273]
This commit is contained in:
Alistair McIntyre
2017-09-21 14:40:35 +12:00
parent c39582de5c
commit 6ff309a40c
6 changed files with 258 additions and 14 deletions
@@ -29,6 +29,11 @@ import seng302.model.mark.Mark;
import seng302.model.token.Token;
import seng302.utilities.GeoUtility;
import seng302.utilities.Sounds;
import seng302.visualiser.cameras.ChaseCamera;
import seng302.visualiser.cameras.IsometricCamera;
import seng302.visualiser.cameras.RaceCamera;
import seng302.visualiser.cameras.TopDownCamera;
import seng302.visualiser.controllers.ViewManager;
import seng302.visualiser.fxObjects.MarkArrowFactory;
import seng302.visualiser.fxObjects.assets_3D.BoatObject;
import seng302.visualiser.fxObjects.assets_3D.Marker3D;
@@ -51,6 +56,8 @@ public class GameView3D {
private SubScene view;
// ParallelCamera camera;
private PerspectiveCamera camera;
private PerspectiveCamera camera2;
private PerspectiveCamera camera3;
private Group gameObjects;
private double bufferSize = 0;
@@ -87,13 +94,21 @@ public class GameView3D {
}
public GameView3D () {
camera = new PerspectiveCamera(true);
camera.getTransforms().addAll(
new Translate(DEFAULT_CAMERA_X,DEFAULT_CAMERA_Y, DEFAULT_CAMERA_DEPTH)
);
camera = new IsometricCamera(DEFAULT_CAMERA_X, DEFAULT_CAMERA_Y, DEFAULT_CAMERA_DEPTH);
camera.setFarClip(600);
camera.setNearClip(0.1);
camera.setFieldOfView(FOV);
camera2 = new TopDownCamera();
camera2.setFarClip(600);
camera2.setNearClip(0.1);
camera2.setFieldOfView(FOV);
camera3 = new ChaseCamera();
camera3.setFarClip(600);
camera3.setNearClip(0.1);
camera3.setFieldOfView(FOV);
gameObjects = new Group();
root3D = new Group(camera, gameObjects);
view = new SubScene(
@@ -405,35 +420,46 @@ public class GameView3D {
public void cameraMovement(KeyEvent event) {
switch (event.getCode()) {
case NUMPAD8:
camera.getTransforms().addAll(new Rotate(0.5, new Point3D(1,0,0)));
view.getCamera().getTransforms().addAll(new Rotate(0.5, new Point3D(1, 0, 0)));
break;
case NUMPAD2:
camera.getTransforms().addAll(new Rotate(-0.5, new Point3D(1,0,0)));
view.getCamera().getTransforms().addAll(new Rotate(-0.5, new Point3D(1, 0, 0)));
break;
case NUMPAD4:
camera.getTransforms().addAll(new Rotate(-0.5, new Point3D(0,1,0)));
view.getCamera().getTransforms().addAll(new Rotate(-0.5, new Point3D(0, 1, 0)));
break;
case NUMPAD6:
camera.getTransforms().addAll(new Rotate(0.5, new Point3D(0,1,0)));
view.getCamera().getTransforms().addAll(new Rotate(0.5, new Point3D(0, 1, 0)));
break;
case Z:
camera.getTransforms().addAll(new Translate(0, 0, 1.5));
((RaceCamera) view.getCamera()).zoomIn();
break;
case X:
camera.getTransforms().addAll(new Translate(0, 0, -1.5));
((RaceCamera) view.getCamera()).zoomOut();
break;
case W:
camera.getTransforms().addAll(new Translate(0, -1, 0));
view.getCamera().getTransforms().addAll(new Translate(0, -1, 0));
break;
case S:
camera.getTransforms().addAll(new Translate(0, 1, 0));
view.getCamera().getTransforms().addAll(new Translate(0, 1, 0));
break;
case A:
camera.getTransforms().addAll(new Translate(-1, 0, 0));
view.getCamera().getTransforms().addAll(new Translate(-1, 0, 0));
break;
case D:
camera.getTransforms().addAll(new Translate(1, 0, 0));
view.getCamera().getTransforms().addAll(new Translate(1, 0, 0));
break;
case F1:
if (view.getCamera().equals(camera)) {
view.setCamera(camera2);
if (view.getCamera() instanceof TopDownCamera) {
((RaceCamera) view.getCamera()).zoomIn();
}
} else if (view.getCamera().equals(camera2)) {
view.setCamera(camera3);
} else {
view.setCamera(camera);
}
}
}
@@ -470,6 +496,11 @@ public class GameView3D {
Point2D p2d = findScaledXY(lat, lon);
bo.moveTo(p2d.getX(), p2d.getY(), heading, velocity, sailIn, windDir);
});
if (clientYacht.getSourceId().equals(
ViewManager.getInstance().getGameClient().getServerThread().getClientId())) {
((ChaseCamera) camera3).setPlayerBoat(newBoat);
}
}
Platform.runLater(() -> {
gameObjects.getChildren().addAll(wakes);
@@ -0,0 +1,89 @@
package seng302.visualiser.cameras;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.collections.ObservableList;
import javafx.geometry.Point3D;
import javafx.scene.PerspectiveCamera;
import javafx.scene.transform.Rotate;
import javafx.scene.transform.Transform;
import javafx.scene.transform.Translate;
import seng302.visualiser.fxObjects.assets_3D.BoatObject;
public class ChaseCamera extends PerspectiveCamera implements RaceCamera {
private ObservableList<Transform> transforms;
private BoatObject playerBoat;
public ChaseCamera() {
super(true);
transforms = this.getTransforms();
}
public void setPlayerBoat(BoatObject playerBoat) {
this.playerBoat = playerBoat;
this.playerBoat.layoutXProperty().addListener(new ChangeListener<Number>() {
@Override
public void changed(ObservableValue<? extends Number> observable, Number oldValue,
Number newValue) {
updateCameraX((Double) oldValue, (Double) newValue);
}
});
this.playerBoat.layoutYProperty().addListener(new ChangeListener<Number>() {
@Override
public void changed(ObservableValue<? extends Number> observable, Number oldValue,
Number newValue) {
updateCameraY((Double) oldValue, (Double) newValue);
}
});
}
private void updateCameraX(Double oldXValue, Double newXValue) {
if (transforms.size() == 0) { // boat is placed and then moved at start,
transforms.addAll(
new Translate(playerBoat.getLayoutX() - 30, playerBoat.getLayoutY() - 30, -125),
new Rotate(80, new Point3D(0, 0, 1))
);
} else {
transforms.addAll(new Translate(newXValue - oldXValue, 0, 0));
}
}
private void updateCameraY(Double oldYValue, Double newYValue) {
transforms.addAll(new Translate(0, (newYValue - oldYValue), 0));
}
@Override
public void zoomIn() {
transforms.addAll(new Translate(0, 0, 1.5));
}
@Override
public void zoomOut() {
transforms.addAll(new Translate(0, 0, -1.5));
}
/*
These have been left intentionally empty for now. it would be cool to be able to pan around the boat and have the camera move around the boat though.
*/
@Override
public void panLeft() {
}
@Override
public void panRight() {
}
@Override
public void panUp() {
}
@Override
public void panDown() {
}
}
@@ -0,0 +1,47 @@
package seng302.visualiser.cameras;
import javafx.collections.ObservableList;
import javafx.scene.PerspectiveCamera;
import javafx.scene.transform.Transform;
import javafx.scene.transform.Translate;
public class IsometricCamera extends PerspectiveCamera implements RaceCamera {
ObservableList<Transform> transforms;
public IsometricCamera(Double cameraStartX, Double cameraStartY, Double cameraDepth) {
super(true);
transforms = this.getTransforms();
transforms.addAll(new Translate(cameraStartX, cameraStartY, cameraDepth));
}
@Override
public void zoomIn() {
transforms.addAll(new Translate(0, 0, 1.5));
}
@Override
public void zoomOut() {
transforms.addAll(new Translate(0, 0, -1.5));
}
@Override
public void panLeft() {
transforms.addAll(new Translate(-1, 0, 0));
}
@Override
public void panRight() {
transforms.addAll(new Translate(1, 0, 0));
}
@Override
public void panUp() {
transforms.addAll(new Translate(0, -1, 0));
}
@Override
public void panDown() {
transforms.addAll(new Translate(0, 1, 0));
}
}
@@ -0,0 +1,18 @@
package seng302.visualiser.cameras;
public interface RaceCamera {
void zoomIn();
void zoomOut();
void panLeft();
void panRight();
void panUp();
void panDown();
}
@@ -0,0 +1,48 @@
package seng302.visualiser.cameras;
import javafx.collections.ObservableList;
import javafx.scene.PerspectiveCamera;
import javafx.scene.transform.Transform;
import javafx.scene.transform.Translate;
public class TopDownCamera extends PerspectiveCamera implements RaceCamera {
ObservableList<Transform> transforms;
public TopDownCamera() {
super(true);
transforms = this.getTransforms();
transforms.add(new Translate(0, 0, -125));
}
@Override
public void zoomIn() {
transforms.addAll(new Translate(0, 0, 1.5));
}
@Override
public void zoomOut() {
transforms.addAll(new Translate(0, 0, -1.5));
}
@Override
public void panLeft() {
transforms.addAll(new Translate(-1, 0, 0));
}
@Override
public void panRight() {
transforms.addAll(new Translate(1, 0, 0));
}
@Override
public void panUp() {
transforms.addAll(new Translate(0, -1, 0));
}
@Override
public void panDown() {
transforms.addAll(new Translate(0, 1, 0));
}
}