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

Replace the class use of highlight with shockwave. #story[1298]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-19 15:43:22 +12:00
parent 9fbd5df626
commit a82d3081fc
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+3 -2
View File
@@ -23,8 +23,8 @@ 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.Shockwave;
import visualiser.layout.Subject3D; import visualiser.layout.Subject3D;
import visualiser.layout.View3D; import visualiser.layout.View3D;
import visualiser.model.VisualiserBoat; import visualiser.model.VisualiserBoat;
@@ -158,7 +158,8 @@ public class InGameLobbyController extends Controller {
if (boat.isClientBoat()) { if (boat.isClientBoat()) {
BoatHighlight boatHighlight = new BoatHighlight(10, new Color(1, 1, 0, 0.1)); Shockwave boatHighlight = new Shockwave(10);
boatHighlight.getMesh().setMaterial(new PhongMaterial(new Color(1, 1, 0, 0.1)));
boatHighlight.setX(subject.getPosition().getX()); boatHighlight.setX(subject.getPosition().getX());
boatHighlight.setY(subject.getPosition().getY()); boatHighlight.setY(subject.getPosition().getY());
boatHighlight.setZ(subject.getPosition().getZ()); boatHighlight.setZ(subject.getPosition().getZ());
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+2 -1
View File
@@ -300,7 +300,8 @@ public class RaceViewController extends Controller {
for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) { for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
if (boat.isClientBoat()) { if (boat.isClientBoat()) {
BoatHighlight boatHighlight = new BoatHighlight(10, new Color(1, 1, 0, 0.1)); Shockwave boatHighlight = new Shockwave(10);
boatHighlight.getMesh().setMaterial(new PhongMaterial(new Color(1, 1, 0, 0.1)));
viewSubjects.add(boatHighlight); viewSubjects.add(boatHighlight);
AnimationTimer highlightTrack = new AnimationTimer() { AnimationTimer highlightTrack = new AnimationTimer() {
@Override @Override
racevisionGame/src/main/java/visualiser/layout/BoatHighlight.java
-18
View File
@@ -1,18 +0,0 @@
package visualiser.layout;
import javafx.scene.paint.Color;
import javafx.scene.paint.PhongMaterial;
import javafx.scene.shape.Cylinder;
import javafx.scene.transform.Rotate;
/**
* Created by jjg64 on 19/09/17.
*/
public class BoatHighlight extends Subject3D {
public BoatHighlight(double radius, Color color) {
super(new Cylinder(radius,0),0);
getMesh().getTransforms().add(new Rotate(-90, Rotate.X_AXIS));
getMesh().setMaterial(new PhongMaterial(color));
}
}