From f25e2bac323c870f05bbf3c4ccbd941ce8a978cb Mon Sep 17 00:00:00 2001 From: Erika Savell Date: Mon, 17 Apr 2017 15:25:54 +1200 Subject: [PATCH] Changed countdown length to two minutes --- src/main/java/seng302/App.java | 2 - .../seng302/Controllers/MainController.java | 2 + src/main/java/seng302/Model/Race.java | 2 +- src/main/resources/scenes/race.fxml | 40 ++++++++++++++----- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java index 0022579c..cf9d3ed2 100644 --- a/src/main/java/seng302/App.java +++ b/src/main/java/seng302/App.java @@ -22,7 +22,6 @@ public class App extends Application { } public void start(Stage stage) throws Exception { - FXMLLoader loader = new FXMLLoader(getClass().getResource("/scenes/main.fxml")); Parent root = loader.load(); Scene scene = new Scene(root, 1200, 800); @@ -30,7 +29,6 @@ public class App extends Application { stage.show(); } - // /** // * Loads and sets up the GUI elements // * diff --git a/src/main/java/seng302/Controllers/MainController.java b/src/main/java/seng302/Controllers/MainController.java index adc94f12..0d09391f 100644 --- a/src/main/java/seng302/Controllers/MainController.java +++ b/src/main/java/seng302/Controllers/MainController.java @@ -21,6 +21,8 @@ public class MainController extends Controller { } + + /** * Main Controller for the applications will house the menu and the displayed pane. * diff --git a/src/main/java/seng302/Model/Race.java b/src/main/java/seng302/Model/Race.java index 4defdeb6..4dd58b34 100644 --- a/src/main/java/seng302/Model/Race.java +++ b/src/main/java/seng302/Model/Race.java @@ -31,7 +31,7 @@ public abstract class Race implements Runnable { protected int scaleFactor; private int SLEEP_TIME = 100; //time in milliseconds to pause in a paced loop - protected int PRERACE_TIME = 15000; //time in milliseconds to pause during pre-race + protected int PRERACE_TIME = 120000; //time in milliseconds to pause during pre-race private boolean timerEnabled = true; //boolean to determine if timer is ran /** diff --git a/src/main/resources/scenes/race.fxml b/src/main/resources/scenes/race.fxml index 2f626404..1a795e84 100644 --- a/src/main/resources/scenes/race.fxml +++ b/src/main/resources/scenes/race.fxml @@ -7,6 +7,7 @@ + @@ -19,16 +20,33 @@ - - - - - - - - - - + + + + + + + + + + +