From 5c58ca11ff9df2f8bf484cd24f702bf3958c64d6 Mon Sep 17 00:00:00 2001 From: fjc40 Date: Fri, 15 Sep 2017 00:59:43 +1200 Subject: [PATCH] Boats use their assigned color. Boat name is displayed in lobby instead of source ID. --- .../java/visualiser/Controllers/InGameLobbyController.java | 5 ++++- .../main/java/visualiser/Controllers/RaceViewController.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java index e935847f..733d20e0 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java @@ -15,6 +15,7 @@ import javafx.scene.control.Label; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; +import javafx.scene.paint.PhongMaterial; import javafx.scene.shape.MeshView; import mock.app.Event; import network.Messages.Enums.RaceStatusEnum; @@ -144,6 +145,8 @@ public class InGameLobbyController extends Controller { subjects.add(sea); MeshView mesh = new MeshView(importer.getImport()); + PhongMaterial boatColorMat = new PhongMaterial(boat.getColor()); + mesh.setMaterial(boatColorMat); Subject3D subject = new Subject3D(mesh,0); subjects.add(subject); @@ -161,7 +164,7 @@ public class InGameLobbyController extends Controller { }; rotate.start(); - allPlayerLabels.get(count).setText("Player: " + boat.getSourceID()); + allPlayerLabels.get(count).setText(boat.getName()); allPlayerLabels.get(count).toFront(); count += 1; if (count > 2){ diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index 70d51acb..c2153c1f 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -305,6 +305,8 @@ public class RaceViewController extends Controller { } else { mesh = new MeshView(importerBurgerBoat.getImport()); } + PhongMaterial boatColorMat = new PhongMaterial(boat.getColor()); + mesh.setMaterial(boatColorMat); Subject3D boatModel = new Subject3D(mesh, boat.getSourceID()); viewSubjects.add(boatModel);