From 7a2762a76cbb10bf7349a9520098769fb2cf8eee Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Mon, 25 Dec 2023 14:37:21 +0100
Subject: [PATCH] update(easter egg): make it shuffle #20
---
.../Controller/MenuBorderPaneController.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
index b940b712..d0a9572a 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
@@ -14,7 +14,7 @@ import javafx.stage.Screen;
import java.io.File;
import java.net.URL;
-import java.util.ResourceBundle;
+import java.util.*;
public class MenuBorderPaneController implements Initializable {
@FXML
@@ -34,6 +34,8 @@ public class MenuBorderPaneController implements Initializable {
"lessGoo", "sadCat", "basketball", "msPuff", "=D", "banana", "chaCha", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog",
"pot", "bear", "pancake", "frog", "gtfo", "dog2", "slippery", "wolf", "legCat"};
+ List<String> shuffledVideos = Arrays.asList(videoFiles);
+
Rectangle2D screen = Screen.getPrimary().getVisualBounds();
Screen windows = Screen.getPrimary();
@Override
@@ -45,9 +47,12 @@ public class MenuBorderPaneController implements Initializable {
imgRight.setPreserveRatio(true);
imgLeft.setFitWidth(imageWidth);
imgLeft.setPreserveRatio(true);
+
backgroundMusic("cocBackgroundMusicTest.mp3");
easterEgg();
- System.out.println(windows.getDpi());
+
+// shuffle meme order
+ Collections.shuffle(shuffledVideos);
}
private void easterEgg() {
@@ -76,14 +81,16 @@ public class MenuBorderPaneController implements Initializable {
musicPlayer.play();
}
+// if a meme is already running, current mediaPlayer will be removed
if (mediaPlayer != null) {
mediaPlayer.dispose();
center.getChildren().remove(mediaView);
}
if (videoCounter < videoFiles.length) {
+ String nextVideo = shuffledVideos.get(videoCounter);
musicPlayer.stop();
- mediaPlayer = new CreateMediaPlayer().getMediaPlayer(mediaView, new File("src/main/resources/videos/" + videoFiles[videoCounter] + ".mp4"), false);
+ mediaPlayer = new CreateMediaPlayer().getMediaPlayer(mediaView, new File("src/main/resources/videos/" + nextVideo + ".mp4"), false);
mediaView = new MediaView(mediaPlayer);
center.getChildren().add(mediaView);
mediaPlayer.setOnEndOfMedia(() -> {
--
GitLab