Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction

.mailmap

@@ -19,3 +19,4 @@ Erika Savell <esa46@uclive.ac.nz>
 Connor Taylor-Brown <cbt24@cs17086jp.canterbury.ac.nz> <cbt24@uclive.canterbury.ac.nz>
 Fraser Cope <fjc40@uclive.ac.nz>
 Jessica Syder <jam339@uclive.ac.nz> Jessica Syder <doctorjess@live.com>
+Joseph Gardner <jjg64@uclive.ac.nz>

racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java

@@ -25,6 +25,7 @@ import shared.model.Boat;
 import visualiser.app.App;
 import visualiser.gameController.ControllerClient;
 import visualiser.layout.SeaSurface;
+import visualiser.layout.Shockwave;
 import visualiser.layout.Subject3D;
 import visualiser.layout.View3D;
 import visualiser.model.VisualiserBoat;
@@ -168,6 +169,15 @@ public class InGameLobbyController extends Controller {
                     playerBoatToSet.setPitch(20);
 
 
+                    if (boat.isClientBoat()) {
+                        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());
+                        subjects.add(boatHighlight);
+                        subject.getMesh().toFront();
+                    }
 
                     AnimationTimer rotate = new AnimationTimer() {
                         @Override

racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java

@@ -299,6 +299,23 @@ public class RaceViewController extends Controller {
 
             viewSubjects.add(markModel);
         }
+
+        for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
+            if (boat.isClientBoat()) {
+                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
+                    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
         for (VisualiserBoat boat: race.getVisualiserRaceState().getBoats()) {
             MeshView mesh;

racevisionGame/src/main/java/visualiser/layout/Shockwave.java

@@ -13,5 +13,6 @@ public class Shockwave extends Subject3D {
         super(new Cylinder(radius,0),0);
         getMesh().getTransforms().add(new Rotate(-90, Rotate.X_AXIS));
         getMesh().setMaterial(new PhongMaterial(new Color(0,0,0,0)));
+        getMesh().setMouseTransparent(true);
     }
 }