From 0a885dd8fd339e80332f396952cb480260b48a49 Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Sat, 23 Sep 2017 15:37:16 +1200 Subject: [PATCH] Clean up changes #story[1274] --- .../dialogs/BoatCustomizeController.java | 20 +++++++++---------- .../fxObjects/assets_3D/BoatModel.java | 3 --- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java index 321f98dd..67fb089a 100644 --- a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java +++ b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java @@ -55,14 +55,14 @@ public class BoatCustomizeController implements Initializable{ private LobbyController lobbyController; private BoatMeshType currentBoat; private Double maxSpeedMultiplier = 1.0; - private Double maxTurnRate = 1.0; - private Double maxAcceleration = 1.0; + private Double maxTurnRateMultiplier = 1.0; + private Double maxAccelerationMultiplier = 1.0; @Override public void initialize(URL location, ResourceBundle resources) { socketThread = ViewManager.getInstance().getGameClient().getServerThread(); - generateMaxStats(); + findMaxStats(); RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator(); playerNameReqValidator.setMessage("Player name required."); @@ -158,23 +158,23 @@ public class BoatCustomizeController implements Initializable{ refreshStatBars(currentBoat); } - private void generateMaxStats() { + private void findMaxStats() { for (BoatMeshType bmt: BoatMeshType.values()) { - if (bmt.turnStep > maxTurnRate) { - maxTurnRate = bmt.turnStep; + if (bmt.turnStep > maxTurnRateMultiplier) { + maxTurnRateMultiplier = bmt.turnStep; } if (bmt.maxSpeedMultiplier > maxSpeedMultiplier) { maxSpeedMultiplier = bmt.maxSpeedMultiplier; } - if (bmt.accelerationMultiplier > maxAcceleration) { - maxAcceleration = bmt.accelerationMultiplier; + if (bmt.accelerationMultiplier > maxAccelerationMultiplier) { + maxAccelerationMultiplier = bmt.accelerationMultiplier; } } } private void refreshStatBars(BoatMeshType bo) { speedBar.setProgress((bo.maxSpeedMultiplier) / maxSpeedMultiplier); - accelBar.setProgress(bo.accelerationMultiplier / maxAcceleration); - handleBar.setProgress(bo.turnStep / maxTurnRate); + accelBar.setProgress(bo.accelerationMultiplier / maxAccelerationMultiplier); + handleBar.setProgress(bo.turnStep / maxTurnRateMultiplier); } } diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatModel.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatModel.java index 960ceacf..e056b14d 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatModel.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatModel.java @@ -18,9 +18,6 @@ public class BoatModel extends Model { private static final int SAIL_INDEX = 2; private BoatMeshType meshType; - private Double maxSpeedMultiplier; - private Double turnStep; - private Double accelerationMultiplier; /** * Stores a model and it's optional animation.