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

The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-07 22:03:24 +12:00
parent 18a689b110
commit 7bad0e53ff
4 changed files with 146 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+33 -10
View File
@@ -17,8 +17,10 @@ import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import javafx.scene.shape.MeshView;
import javafx.scene.shape.Sphere;
import javafx.scene.transform.Translate;
import javafx.util.Callback;
import network.Messages.Enums.RaceStatusEnum;
import shared.dataInput.RaceDataSource;
import shared.exceptions.BoatNotFoundException;
import shared.exceptions.MarkNotFoundException;
import shared.model.Leg;
@@ -29,6 +31,7 @@ import visualiser.gameController.Keys.ControlKey;
import visualiser.layout.Subject3D;
import visualiser.layout.View3D;
import visualiser.model.*;
import visualiser.utils.GPSConverter;
import java.io.IOException;
import java.net.URL;
@@ -175,7 +178,7 @@ public class RaceController extends Controller {
}
private void initialiseView3D(VisualiserRaceEvent race) {
int scale = 5000;
int scale = 1;
ObservableList<Subject3D> subjects = FXCollections.observableArrayList();
@@ -184,39 +187,59 @@ public class RaceController extends Controller {
importer.read(asset);
view3D = new View3D();
view3D.setDistance(100);
view3D.setDistance(1050);
view3D.setYaw(0);
view3D.setPitch(20);
view3D.setPitch(60);
//view3D.rotateCamera(-90, 1, 0, 0);
//view3D.updatePosition(0, 200, 0);
RaceDataSource raceData = visualiserRace.getVisualiserRaceState().getRaceDataSource();
double lat1 = raceData.getMapTopLeft().getLatitude();
double long1 = raceData.getMapTopLeft().getLongitude();
double lat2 = raceData.getMapBottomRight().getLatitude();
double long2 = raceData.getMapBottomRight().getLongitude();
System.out.println(view3D.getWidth());
System.out.println(view3D.getHeight());
final GPSConverter gpsConverter = new GPSConverter(lat1, long1, lat2, long2, (int)450, (int)450);
view3D.setItems(subjects);
canvasBase.getChildren().add(0, view3D);
for(Mark mark: race.getVisualiserRaceState().getMarks()) {
Subject3D subject = new Subject3D(new Sphere(5));
subject.setX(mark.getPosition().getLongitude() * scale);
subject.setZ(mark.getPosition().getLatitude() * scale);
// subject.setX(mark.getPosition().getLongitude() * scale);
// subject.setZ(mark.getPosition().getLatitude()* scale);
subject.setX(gpsConverter.convertGPS(mark.getPosition()).getX() * scale);
subject.setZ(gpsConverter.convertGPS(mark.getPosition()).getY() * scale);
subjects.add(subject);
}
for(VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
Subject3D subject = new Subject3D(new MeshView(importer.getImport()));
MeshView mesh = new MeshView(importer.getImport());
Subject3D subject = new Subject3D(mesh);
subjects.add(subject);
AnimationTimer trackBoat = new AnimationTimer() {
@Override
public void handle(long now) {
subject.setHeading(boat.getBearing().degrees());
subject.setX(boat.getPosition().getLongitude() * scale);
subject.setZ(boat.getPosition().getLatitude()* scale);
// subject.setHeading(0);
// subject.setX(boat.getPosition().getLongitude() * scale);
// subject.setZ(boat.getPosition().getLatitude()* scale);
double x = gpsConverter.convertGPS(boat.getPosition()).getX() * scale;
//System.out.println(x);
subject.setX(x);
subject.setZ(gpsConverter.convertGPS(boat.getPosition()).getY() * scale);
if(boat.getSourceID() == race.getVisualiserRaceState().getPlayerBoatID()) {
view3D.updatePivot(subject.getPosition());
//view3D.updatePivot(subject.getPosition());
}
view3D.setYaw(boat.getBearing().degrees());
//view3D.setYaw(boat.getBearing().degrees());
}
};
trackBoat.start();
}
view3D.updatePivot(new Translate(250, 0, 210));
}