From e3266c3b47805109f1d068e5797643211cc1f264 Mon Sep 17 00:00:00 2001 From: David Wu Date: Thu, 14 Sep 2017 12:27:07 +1200 Subject: [PATCH 1/5] Pane removed. --- .../main/java/visualiser/Controllers/InGameLobbyController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java index 3366b790..31e6ee96 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java @@ -322,6 +322,7 @@ public class InGameLobbyController extends Controller { */ private void countdownText(long interval){ + countdownTenPane.setVisible(false); //Do nothing if 5 seconds or less to go if (interval <=5000){ countdownTenPane.setVisible(false); @@ -355,6 +356,7 @@ public class InGameLobbyController extends Controller { //10 seconds left. Display 5 seconds for countdown if (interval <=10000){ + countdownTenText.setText("5"); return; } From 8e6a72055853a8631ebe8e1f33ee28aff3db3136 Mon Sep 17 00:00:00 2001 From: fjc40 Date: Thu, 14 Sep 2017 12:39:41 +1200 Subject: [PATCH 2/5] Appears to fix wind arrow direction. --- .../src/main/java/mock/model/commandFactory/WindCommand.java | 2 +- .../src/main/java/visualiser/Controllers/ArrowController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java index 85eec091..a0424f06 100644 --- a/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java +++ b/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java @@ -21,7 +21,7 @@ public class WindCommand extends ObserverCommand { public WindCommand(MockRace race, MockBoat boat, boolean upwind) { super(race, boat); race.addAngularCommand(this); - this.direction = upwind? -1 : 1; + this.direction = upwind? 1 : -1; } @Override diff --git a/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java b/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java index 739b2f6e..1e93923f 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java @@ -93,7 +93,7 @@ public class ArrowController { */ private void updateWindBearing(Bearing bearing) { //Rotate the wind arrow. - arrowStackPane.setRotate(bearing.degrees()); + arrowStackPane.setRotate(bearing.degrees() + 180); } -} \ No newline at end of file +} From afd923c9fbbcbd6e7cb1119555657508a1aed19a Mon Sep 17 00:00:00 2001 From: fjc40 Date: Thu, 14 Sep 2017 13:22:35 +1200 Subject: [PATCH 3/5] Revert "Appears to fix wind arrow direction." This reverts commit 8e6a72055853a8631ebe8e1f33ee28aff3db3136. --- .../src/main/java/mock/model/commandFactory/WindCommand.java | 2 +- .../src/main/java/visualiser/Controllers/ArrowController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java index a0424f06..85eec091 100644 --- a/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java +++ b/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java @@ -21,7 +21,7 @@ public class WindCommand extends ObserverCommand { public WindCommand(MockRace race, MockBoat boat, boolean upwind) { super(race, boat); race.addAngularCommand(this); - this.direction = upwind? 1 : -1; + this.direction = upwind? -1 : 1; } @Override diff --git a/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java b/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java index 1e93923f..739b2f6e 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java @@ -93,7 +93,7 @@ public class ArrowController { */ private void updateWindBearing(Bearing bearing) { //Rotate the wind arrow. - arrowStackPane.setRotate(bearing.degrees() + 180); + arrowStackPane.setRotate(bearing.degrees()); } -} +} \ No newline at end of file From b59d36f4e5c633fd968a7f7b7c9dc1474bbd68bc Mon Sep 17 00:00:00 2001 From: fjc40 Date: Thu, 14 Sep 2017 13:32:23 +1200 Subject: [PATCH 4/5] Actually fixed the wind arrow direction. --- racevisionGame/src/main/java/mock/model/NewPolars.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/racevisionGame/src/main/java/mock/model/NewPolars.java b/racevisionGame/src/main/java/mock/model/NewPolars.java index 3a40e0e2..89dcbdda 100644 --- a/racevisionGame/src/main/java/mock/model/NewPolars.java +++ b/racevisionGame/src/main/java/mock/model/NewPolars.java @@ -32,7 +32,7 @@ public class NewPolars { public static void addPolars(double trueWindSpeed, Bearing trueWindAngle, double boatSpeed){ double tws = trueWindSpeed; double bs = boatSpeed; - double twa = trueWindAngle.degrees(); + double twa = trueWindAngle.degrees() + 180; if (!polars.containsKey(tws)){ polars.put(tws, new TreeMap<>()); } From 550180f286e163ebdfe48a877dadc0737f402e26 Mon Sep 17 00:00:00 2001 From: David Wu Date: Thu, 14 Sep 2017 14:28:42 +1200 Subject: [PATCH 5/5] Removed countdown pane. --- .../main/java/visualiser/Controllers/InGameLobbyController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java index 3366b790..01151d2b 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java @@ -321,7 +321,7 @@ public class InGameLobbyController extends Controller { * @param interval Countdown interval to check */ private void countdownText(long interval){ - + countdownTenPane.setVisible(false); //Do nothing if 5 seconds or less to go if (interval <=5000){ countdownTenPane.setVisible(false);