From 37c745c139c9e9eab9fdcd6ee366a5206324127c Mon Sep 17 00:00:00 2001 From: William Muir Date: Tue, 25 Jul 2017 22:27:26 +1200 Subject: [PATCH] Polar velocities should now work as intended. Snapping to VMG still needs to be implemented. Still an issue of not being able to pass the total upwind or downwind point tags: #story[986] --- .../seng302/controllers/LobbyController.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java index 5e5c4aea..32578ac3 100644 --- a/src/main/java/seng302/controllers/LobbyController.java +++ b/src/main/java/seng302/controllers/LobbyController.java @@ -17,8 +17,6 @@ import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.scene.layout.Pane; -import javafx.scene.media.Media; -import javafx.scene.media.MediaPlayer; import javafx.scene.text.Text; import seng302.client.ClientState; import seng302.client.ClientStateQueryingRunnable; @@ -210,29 +208,29 @@ public class LobbyController implements Initializable, Observer{ @FXML public void readyButtonPressed() { // setContentPane("/views/RaceView.fxml"); - playTheme(); +// playTheme(); GameState.setCurrentStage(GameStages.RACING); mainServerThread.startGame(); } - private static MediaPlayer mediaPlayer; - - private void playTheme() { - Random random = new Random(System.currentTimeMillis()); - Integer rand = random.nextInt(); - if(rand == 10) { - URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3"); - Media hit = new Media(file.toString()); - mediaPlayer = new MediaPlayer(hit); - mediaPlayer.play(); - } else if(rand == 9) { - URL file = getClass().getResource("/music/Owl City - Fireflies.mp3"); - Media hit = new Media(file.toString()); - mediaPlayer = new MediaPlayer(hit); - mediaPlayer.play(); - } - } +// private static MediaPlayer mediaPlayer; +// +// private void playTheme() { +// Random random = new Random(System.currentTimeMillis()); +// Integer rand = random.nextInt(); +// if(rand == 10) { +// URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3"); +// Media hit = new Media(file.toString()); +// mediaPlayer = new MediaPlayer(hit); +// mediaPlayer.play(); +// } else if(rand == 9) { +// URL file = getClass().getResource("/music/Owl City - Fireflies.mp3"); +// Media hit = new Media(file.toString()); +// mediaPlayer = new MediaPlayer(hit); +// mediaPlayer.play(); +// } +// } private void switchToRaceView() { if (!switchedPane) {