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

Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-19 15:35:13 +12:00
parent cfdbf5896f
commit 9fbd5df626
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+10
View File
@@ -15,6 +15,7 @@ import javafx.scene.control.Label;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.paint.Color;
import javafx.scene.paint.PhongMaterial; import javafx.scene.paint.PhongMaterial;
import javafx.scene.shape.MeshView; import javafx.scene.shape.MeshView;
import mock.app.Event; import mock.app.Event;
@@ -22,6 +23,7 @@ import network.Messages.Enums.RaceStatusEnum;
import network.Messages.Enums.RequestToJoinEnum; import network.Messages.Enums.RequestToJoinEnum;
import visualiser.app.App; import visualiser.app.App;
import visualiser.gameController.ControllerClient; import visualiser.gameController.ControllerClient;
import visualiser.layout.BoatHighlight;
import visualiser.layout.SeaSurface; import visualiser.layout.SeaSurface;
import visualiser.layout.Subject3D; import visualiser.layout.Subject3D;
import visualiser.layout.View3D; import visualiser.layout.View3D;
@@ -155,6 +157,14 @@ public class InGameLobbyController extends Controller {
playerBoatToSet.setPitch(20); playerBoatToSet.setPitch(20);
if (boat.isClientBoat()) {
BoatHighlight boatHighlight = new BoatHighlight(10, new Color(1, 1, 0, 0.1));
boatHighlight.setX(subject.getPosition().getX());
boatHighlight.setY(subject.getPosition().getY());
boatHighlight.setZ(subject.getPosition().getZ());
subjects.add(boatHighlight);
subject.getMesh().toFront();
}
AnimationTimer rotate = new AnimationTimer() { AnimationTimer rotate = new AnimationTimer() {
@Override @Override
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+16 -15
View File
@@ -297,6 +297,22 @@ public class RaceViewController extends Controller {
viewSubjects.add(markModel); viewSubjects.add(markModel);
} }
for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
if (boat.isClientBoat()) {
BoatHighlight boatHighlight = new BoatHighlight(10, new Color(1, 1, 0, 0.1));
viewSubjects.add(boatHighlight);
AnimationTimer highlightTrack = new AnimationTimer() {
@Override
public void handle(long now) {
boatHighlight.setX(gpsConverter.convertGPS(boat.getPosition()).getX());
boatHighlight.setZ(gpsConverter.convertGPS(boat.getPosition()).getY());
}
};
highlightTrack.start();
}
}
// Position and add each boat to view // Position and add each boat to view
for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) { for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
MeshView mesh; MeshView mesh;
@@ -322,21 +338,6 @@ public class RaceViewController extends Controller {
}; };
trackBoat.start(); trackBoat.start();
if (boat.isClientBoat()) {
BoatHighlight boatHighlight = new BoatHighlight(10, new Color(1, 1, 0, 0.1));
viewSubjects.add(boatHighlight);
boatModel.getMesh().toFront();
AnimationTimer highlightTrack = new AnimationTimer() {
@Override
public void handle(long now) {
boatHighlight.setX(boatModel.getPosition().getX());
boatHighlight.setY(boatModel.getPosition().getY());
boatHighlight.setZ(boatModel.getPosition().getZ());
}
};
highlightTrack.start();
}
Material markColor = new PhongMaterial(new Color(0.15,0.9,0.2,1)); Material markColor = new PhongMaterial(new Color(0.15,0.9,0.2,1));
CompoundMark nextMark = boat.getCurrentLeg().getEndCompoundMark(); CompoundMark nextMark = boat.getCurrentLeg().getEndCompoundMark();
view3D.getShape(nextMark.getMark1().getSourceID()).getMesh().setMaterial(markColor); view3D.getShape(nextMark.getMark1().getSourceID()).getMesh().setMaterial(markColor);