From a82d3081fcaaaa290c6e8f51196fb5e711bdced2 Mon Sep 17 00:00:00 2001 From: Joseph Gardner Date: Tue, 19 Sep 2017 15:43:22 +1200 Subject: [PATCH] Replace the class use of highlight with shockwave. #story[1298] --- .../Controllers/InGameLobbyController.java | 5 +++-- .../Controllers/RaceViewController.java | 3 ++- .../java/visualiser/layout/BoatHighlight.java | 18 ------------------ 3 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 racevisionGame/src/main/java/visualiser/layout/BoatHighlight.java diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java index a621c8e5..862953b2 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java @@ -23,8 +23,8 @@ import network.Messages.Enums.RaceStatusEnum; import network.Messages.Enums.RequestToJoinEnum; import visualiser.app.App; import visualiser.gameController.ControllerClient; -import visualiser.layout.BoatHighlight; import visualiser.layout.SeaSurface; +import visualiser.layout.Shockwave; import visualiser.layout.Subject3D; import visualiser.layout.View3D; import visualiser.model.VisualiserBoat; @@ -158,7 +158,8 @@ public class InGameLobbyController extends Controller { 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.setY(subject.getPosition().getY()); boatHighlight.setZ(subject.getPosition().getZ()); diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index 4137b9b9..a6e6fca0 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -300,7 +300,8 @@ public class RaceViewController extends Controller { for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) { 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); AnimationTimer highlightTrack = new AnimationTimer() { @Override diff --git a/racevisionGame/src/main/java/visualiser/layout/BoatHighlight.java b/racevisionGame/src/main/java/visualiser/layout/BoatHighlight.java deleted file mode 100644 index 1bcda0ee..00000000 --- a/racevisionGame/src/main/java/visualiser/layout/BoatHighlight.java +++ /dev/null @@ -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)); - } -}