fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boats and marks are sized realistically in 3rd person

Browse Source 
- Changed SeaSurface to Subject3D to suppress scaling
- Cameras can now be selected through View3D interface

#story[1190]
This commit is contained in:
Connor Taylor-Brown
2017-09-13 12:25:52 +12:00
parent bcc827b554
commit 963c8a43ad
6 changed files with 64 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+12 -35
View File
@@ -202,11 +202,10 @@ public class RaceController extends Controller {
StlMeshImporter importerBurgerBoat = new StlMeshImporter();
importerBurgerBoat.read(alternateBoatAsset);
view3D = new View3D(false);
view3D.setItems(viewSubjects);
view3D.setDistance(1050);
view3D.setYaw(0);
view3D.setPitch(60);
view3D.setBirdsEye();
view3D.enableTracking();
view3D.addAmbientLight(ambientLight);
view3D.addPointLight(pointLight);
@@ -216,14 +215,13 @@ public class RaceController extends Controller {
RaceDataSource raceData = visualiserRace.getVisualiserRaceState().getRaceDataSource();
final GPSConverter gpsConverter = new GPSConverter(raceData, 450, 450);
view3D.setItems(viewSubjects);
// Set up sea surface
SeaSurface sea = new SeaSurface(750, 200);
sea.setX(250);
sea.setZ(210);
viewSubjects.add(sea);
//viewSubjects.add(new Subject3D(new MeshView(new Plane3D(50, 50, 1, 1))));
SeaSurface sea = new SeaSurface(750, 200, 250, 0, 210);
SkyBox skyBox = new SkyBox(750, 200, 250, 0, 210);
viewSubjects.add(sea.getSurface());
viewSubjects.addAll(skyBox.getSkyBoxPlanes());
Boundary3D boundary3D = new Boundary3D(visualiserRace.getVisualiserRaceState().getRaceDataSource().getBoundary(), gpsConverter);
@@ -234,20 +232,11 @@ public class RaceController extends Controller {
for(Mark mark: race.getVisualiserRaceState().getMarks()) {
MeshView mesh = new MeshView(importerMark.getImport());
Subject3D markModel = new Subject3D(mesh);
// Subject3D markRadius = new MarkRadius(3);
double x = gpsConverter.convertGPS(mark.getPosition()).getX();
double z = gpsConverter.convertGPS(mark.getPosition()).getY();
markModel.setX(x);
markModel.setZ(z);
markModel.setScale(3.5);
// markRadius.setX(x);
// markRadius.setZ(z);
markModel.setX(gpsConverter.convertGPS(mark.getPosition()).getX());
markModel.setZ(gpsConverter.convertGPS(mark.getPosition()).getY());
viewSubjects.add(markModel);
// viewSubjects.add(markRadius);
}
// Position and add each boat to view
for(VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
@@ -258,28 +247,16 @@ public class RaceController extends Controller {
mesh = new MeshView(importerBurgerBoat.getImport());
}
Subject3D boatModel = new Subject3D(mesh);
//Subject3D boatArrow = new BoatArrow(12);
boatModel.setScale(1.5);
viewSubjects.add(boatModel);
//viewSubjects.add(boatArrow);
// Track this boat's movement with the new subject
AnimationTimer trackBoat = new AnimationTimer() {
@Override
public void handle(long now) {
double heading = boat.getBearing().degrees();
double x = gpsConverter.convertGPS(boat.getPosition()).getX();
double z = gpsConverter.convertGPS(boat.getPosition()).getY();
boatModel.setHeading(heading);
boatModel.setX(x);
boatModel.setZ(z);
// boatArrow.setHeading(heading);
// boatArrow.setX(x);
// boatArrow.setZ(z);
boatModel.setHeading(boat.getBearing().degrees());
boatModel.setX(gpsConverter.convertGPS(boat.getPosition()).getX());
boatModel.setZ(gpsConverter.convertGPS(boat.getPosition()).getY());
}
};
trackBoat.start();