Removed countdown timer from lobby screen.
This commit is contained in:
@@ -71,15 +71,6 @@ public class InGameLobbyController extends Controller {
|
|||||||
@FXML
|
@FXML
|
||||||
private Label playerLabel6;
|
private Label playerLabel6;
|
||||||
|
|
||||||
@FXML
|
|
||||||
private Label countdownLabel;
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private AnchorPane countdownTenPane;
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private Label countdownTenText;
|
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private Button startButton;
|
private Button startButton;
|
||||||
|
|
||||||
@@ -216,37 +207,13 @@ public class InGameLobbyController extends Controller {
|
|||||||
* Starts the race.
|
* Starts the race.
|
||||||
*/
|
*/
|
||||||
private void startRace() {
|
private void startRace() {
|
||||||
//Initialises the race clock.
|
|
||||||
initialiseRaceClock(this.visualiserRaceEvent.getVisualiserRaceState());
|
|
||||||
|
|
||||||
//Starts the race countdown timer.
|
//Starts the race countdown timer.
|
||||||
countdownTimer();
|
countdownTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialises the race clock/timer labels for the start time, current time, and remaining time.
|
|
||||||
* @param visualiserRace The race to get data from.
|
|
||||||
*/
|
|
||||||
private void initialiseRaceClock(VisualiserRaceState visualiserRace) {
|
|
||||||
//Remaining time.
|
|
||||||
initialiseRaceClockDuration(visualiserRace);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialises the race duration label.
|
|
||||||
* @param visualiserRace The race to get data from.
|
|
||||||
*/
|
|
||||||
private void initialiseRaceClockDuration(VisualiserRaceState visualiserRace) {
|
|
||||||
|
|
||||||
visualiserRace.getRaceClock().durationProperty().addListener((observable, oldValue, newValue) -> {
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
countdownLabel.setText(newValue);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* Countdown timer until race starts.
|
* Countdown timer until race starts.
|
||||||
*/
|
*/
|
||||||
@@ -257,18 +224,6 @@ public class InGameLobbyController extends Controller {
|
|||||||
//Get the current race status.
|
//Get the current race status.
|
||||||
RaceStatusEnum raceStatus = visualiserRaceEvent.getVisualiserRaceState().getRaceStatusEnum();
|
RaceStatusEnum raceStatus = visualiserRaceEvent.getVisualiserRaceState().getRaceStatusEnum();
|
||||||
|
|
||||||
//Try catch for getting interval times
|
|
||||||
try {
|
|
||||||
long interval = ChronoUnit.MILLIS.between(visualiserRaceEvent.getVisualiserRaceState().getRaceClock().getCurrentTime(), visualiserRaceEvent.getVisualiserRaceState().getRaceClock().getStartingTime());
|
|
||||||
if(interval<=10000){
|
|
||||||
countdownLabel.setVisible(false);
|
|
||||||
countdownTenPane.setVisible(true);
|
|
||||||
countdownTenText.setVisible(true);
|
|
||||||
}
|
|
||||||
countdownText(interval);
|
|
||||||
} catch (Exception e){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//If the race has reached the preparatory phase, or has started...
|
//If the race has reached the preparatory phase, or has started...
|
||||||
if (raceStatus == RaceStatusEnum.PREPARATORY || raceStatus == RaceStatusEnum.STARTED) {
|
if (raceStatus == RaceStatusEnum.PREPARATORY || raceStatus == RaceStatusEnum.STARTED) {
|
||||||
@@ -370,48 +325,5 @@ public class InGameLobbyController extends Controller {
|
|||||||
//System.out.println("Empty race user pane pressed. Joining racers");
|
//System.out.println("Empty race user pane pressed. Joining racers");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Countdown interval checker that updates the countdown text
|
|
||||||
* @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);
|
|
||||||
//countdownTenText.setText("5");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//6 seconds left. Display 1 second for countdown
|
|
||||||
if (interval <=6000){
|
|
||||||
countdownTenText.setText("1");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//7 seconds left. Display 2 seconds for countdown
|
|
||||||
if (interval <=7000){
|
|
||||||
countdownTenText.setText("2");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//8 seconds left. Display 3 seconds for countdown
|
|
||||||
if (interval <=8000){
|
|
||||||
countdownTenText.setText("3");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//9 seconds left. Display 4 seconds for countdown
|
|
||||||
if (interval <=9000){
|
|
||||||
countdownTenText.setText("4");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//10 seconds left. Display 5 seconds for countdown
|
|
||||||
if (interval <=10000){
|
|
||||||
countdownTenText.setText("5");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,11 +18,6 @@
|
|||||||
<Insets left="20.0" />
|
<Insets left="20.0" />
|
||||||
</GridPane.margin>
|
</GridPane.margin>
|
||||||
</Button>
|
</Button>
|
||||||
<Label fx:id="countdownLabel" alignment="CENTER" contentDisplay="CENTER" textFill="WHITE" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
|
|
||||||
<font>
|
|
||||||
<Font size="16.0" />
|
|
||||||
</font>
|
|
||||||
</Label>
|
|
||||||
<GridPane fx:id="playerContainer" GridPane.columnSpan="3" GridPane.rowIndex="1">
|
<GridPane fx:id="playerContainer" GridPane.columnSpan="3" GridPane.rowIndex="1">
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
||||||
@@ -84,19 +79,5 @@
|
|||||||
<RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
|
<RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
</GridPane>
|
</GridPane>
|
||||||
<AnchorPane fx:id="countdownTenPane" prefHeight="200.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
|
||||||
<children>
|
|
||||||
<Label fx:id="countdownTenText" alignment="CENTER" text="COUNTDOWN" textFill="#ee0000" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
|
||||||
<font>
|
|
||||||
<Font name="System Bold" size="41.0" />
|
|
||||||
</font>
|
|
||||||
</Label>
|
|
||||||
<Label fx:id="preRacelabel" alignment="CENTER" text="Entering Race In:" textFill="RED" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
|
||||||
<font>
|
|
||||||
<Font name="System Bold" size="18.0" />
|
|
||||||
</font>
|
|
||||||
</Label>
|
|
||||||
</children>
|
|
||||||
</AnchorPane>
|
|
||||||
</children>
|
</children>
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
|
|||||||
Reference in New Issue
Block a user