michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polar velocities should now work as intended.

Browse Source 
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]
This commit is contained in:
William Muir
2017-07-25 22:27:26 +12:00
parent 7880039801
commit 37c745c139
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/LobbyController.java
+18 -20
View File
@@ -17,8 +17,6 @@ import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
import javafx.scene.media.Media;
import javafx.scene.media.MediaPlayer;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import seng302.client.ClientState; import seng302.client.ClientState;
import seng302.client.ClientStateQueryingRunnable; import seng302.client.ClientStateQueryingRunnable;
@@ -210,29 +208,29 @@ public class LobbyController implements Initializable, Observer{
@FXML @FXML
public void readyButtonPressed() { public void readyButtonPressed() {
// setContentPane("/views/RaceView.fxml"); // setContentPane("/views/RaceView.fxml");
playTheme(); // playTheme();
GameState.setCurrentStage(GameStages.RACING); GameState.setCurrentStage(GameStages.RACING);
mainServerThread.startGame(); mainServerThread.startGame();
} }
private static MediaPlayer mediaPlayer; // private static MediaPlayer mediaPlayer;
//
private void playTheme() { // private void playTheme() {
Random random = new Random(System.currentTimeMillis()); // Random random = new Random(System.currentTimeMillis());
Integer rand = random.nextInt(); // Integer rand = random.nextInt();
if(rand == 10) { // if(rand == 10) {
URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3"); // URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3");
Media hit = new Media(file.toString()); // Media hit = new Media(file.toString());
mediaPlayer = new MediaPlayer(hit); // mediaPlayer = new MediaPlayer(hit);
mediaPlayer.play(); // mediaPlayer.play();
} else if(rand == 9) { // } else if(rand == 9) {
URL file = getClass().getResource("/music/Owl City - Fireflies.mp3"); // URL file = getClass().getResource("/music/Owl City - Fireflies.mp3");
Media hit = new Media(file.toString()); // Media hit = new Media(file.toString());
mediaPlayer = new MediaPlayer(hit); // mediaPlayer = new MediaPlayer(hit);
mediaPlayer.play(); // mediaPlayer.play();
} // }
} // }
private void switchToRaceView() { private void switchToRaceView() {
if (!switchedPane) { if (!switchedPane) {