- Added circle to boat to indicate which boat is the players and to show where the arrow is pointing.

#tags [1276]

src/main/java/seng302/visualiser/GameView3D.java

@@ -32,7 +32,6 @@ import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Corner;
 import seng302.model.mark.Mark;
 import seng302.model.token.Token;
-import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
 import seng302.utilities.Sounds;
 import seng302.visualiser.cameras.ChaseCamera;

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatObject.java

@@ -31,6 +31,7 @@ public class BoatObject extends Group {
     private BoatModel boatAssets;
     private Group wake;
     private Group markIndicator;
+    private Group playerIndicator;
     private Color colour = Color.BLACK;
     private Boolean isSelected = false;
     private Rotate rotation = new Rotate(0, new Point3D(0,0,1));
@@ -93,8 +94,8 @@ public class BoatObject extends Group {
         Double angle = Math.toDegrees(
             Math.atan2(boatLoc.getY() - markPoint.getY(), boatLoc.getX() - markPoint.getX())) - 90;
 
-        Double radius = 3.0;
-        Double scale = 0.4;
+        Double radius = 2.7;
+        Double scale = 0.5;
 
         Double originX = this.getLayoutX();
         Double originY = this.getLayoutY();
@@ -106,7 +107,7 @@ public class BoatObject extends Group {
         markIndicator.getTransforms().clear();
         markIndicator.getTransforms().addAll(
             new Rotate(angle, new Point3D(0, 0, 1)),
-            new Translate(0, -3, -0.1),
+            new Translate(0, -radius, -0.1),
             new Scale(scale, scale, scale / 3)
         );
     }
@@ -153,6 +154,13 @@ public class BoatObject extends Group {
     public void setMarkIndicator(Group indicator) {
         this.markIndicator = indicator;
         this.getChildren().add(markIndicator);
+        Model torus = ModelFactory.importModel(ModelType.PLAYER_IDENTIFIER_TORUS);
+        torus.getAssets().getTransforms().addAll(
+            new Rotate(90, new Point3D(1, 0, 0)),
+            new Scale(0.7, 0.7, 0.7),
+            new Translate(0, 0, 0)
+        );
+        this.getChildren().add(torus.getAssets());
     }
 
     public Group getWake () {

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -154,6 +154,8 @@ public class ModelFactory {
             assets.setCacheHint(CacheHint.SCALE_AND_ROTATE);
         }
         switch (tokenType) {
+            case PLAYER_IDENTIFIER_TORUS:
+                return makeIdentifierTorus(assets);
             case NEXT_MARK_INDICATOR:
                 return makeNextMarkIndicator(assets);
             case VELOCITY_PICKUP:
@@ -190,6 +192,11 @@ public class ModelFactory {
         }
     }
 
+    private static Model makeIdentifierTorus(Group assets) {
+        assets.getChildren().add(new AmbientLight());
+        return new Model(new Group(assets), null);
+    }
+
     private static Model makeNextMarkIndicator(Group assets) {
         assets.getChildren().add(new AmbientLight());
         return new Model(new Group(assets), null);

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java

@@ -27,7 +27,8 @@ public enum ModelType {
     PLAIN_ARROW ("arrow.dae"),
     START_ARROW ("start_arrow.dae"),
     FINISH_ARROW("finish_arrow.dae"),
-    NEXT_MARK_INDICATOR("indicator_arrow.dae");
+    NEXT_MARK_INDICATOR("indicator_arrow.dae"),
+    PLAYER_IDENTIFIER_TORUS("torus.dae");
 
     final String filename;