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 0cae6b75f970c840bed9af2b9bfbc6e511772344..45caff0df386611ba63172e15463d7eaea773ce3 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java @@ -6,6 +6,7 @@ import javafx.geometry.Rectangle2D; import javafx.scene.control.Button; import javafx.scene.image.ImageView; import javafx.scene.layout.BorderPane; +import javafx.scene.layout.StackPane; import javafx.scene.media.Media; import javafx.scene.media.MediaPlayer; import javafx.scene.media.MediaView; @@ -22,16 +23,19 @@ public class MenuBorderPaneController implements Initializable { private Button btnRight, btnLeft; @FXML private ImageView imgLeft, imgRight; + @FXML + private StackPane center; private int musicCounter = 1, videoCounter = 0; private final SceneLoader sceneLoader = new SceneLoader(); private MediaPlayer musicPlayer, mediaPlayer; private MediaView mediaView; - private final String[] videoFiles = {"allMyFellas.mp4", "bobama.mp4", "roomba.mp4", "lifeCouldBeMonke.mp4", "russianKid.mp4", "horse.mp4", - "catSitting.mp4", "holyCrap.mp4", "basketball.mp4", "=D.mp4", "banana.mp4", "minecraftCat.mp4", "muecke.mp4", "top10Cats.mp4", "dog.mp4", "frog.mp4", "dog2.mp4", "legCat.mp4"}; + private final String[] videoFiles = {"allMyFellas", "gta", "cat", "bobama", "roomba", "firework", "lifeCouldBeMonke", "parkingTickets", "russianKid", "horse", + "catSitting", "holyCrap", "lessGoo", "basketball", "=D", "banana", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", "bear", "frog", "dog2", "legCat"}; @Override public void initialize(URL url, ResourceBundle resourceBundle) { - parent.setCenter(sceneLoader.loadScene("MainMenu")); + center.getChildren().add(sceneLoader.loadScene("MainMenu")); +// parent.setCenter(sceneLoader.loadScene("MainMenu")); // set size for rusty gear image depending on screen resolution Rectangle2D screen = Screen.getPrimary().getVisualBounds(); final double imageWidth = screen.getWidth() / 6; @@ -63,21 +67,23 @@ public class MenuBorderPaneController implements Initializable { }); btnLeft.setOnMouseClicked(mouseEvent -> { +// make background music continue play after there is no meme left if (!musicPlayer.isAutoPlay()) { musicPlayer.play(); } if (mediaPlayer != null) { mediaPlayer.dispose(); + center.getChildren().remove(mediaView); } if (videoCounter < videoFiles.length) { musicPlayer.stop(); - mediaPlayer = new CreateMediaPlayer().getMediaPlayer(mediaView, new File("src/main/resources/videos/" + videoFiles[videoCounter]), false); + mediaPlayer = new CreateMediaPlayer().getMediaPlayer(mediaView, new File("src/main/resources/videos/" + videoFiles[videoCounter] + ".mp4"), false); mediaView = new MediaView(mediaPlayer); - parent.getChildren().add(mediaView); + center.getChildren().add(mediaView); mediaPlayer.setOnEndOfMedia(() -> { - parent.getChildren().remove(mediaView); + center.getChildren().remove(mediaView); musicPlayer.play(); }); } diff --git a/src/main/resources/fxml/MenuBorderPane.fxml b/src/main/resources/fxml/MenuBorderPane.fxml index a2127bbb82e6e39c4451224a263da6e3cd7f85d7..e9f78a6fe5114b04568e9e6d256ed33c162aa36a 100644 --- a/src/main/resources/fxml/MenuBorderPane.fxml +++ b/src/main/resources/fxml/MenuBorderPane.fxml @@ -4,6 +4,7 @@ <?import javafx.scene.image.Image?> <?import javafx.scene.image.ImageView?> <?import javafx.scene.layout.BorderPane?> +<?import javafx.scene.layout.StackPane?> <BorderPane id="mainMenu" fx:id="parent" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MenuBorderPaneController"> <right> @@ -28,4 +29,7 @@ </graphic> </Button> </left> + <center> + <StackPane fx:id="center" prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER" /> + </center> </BorderPane> diff --git a/src/main/resources/videos/async.mp4 b/src/main/resources/videos/async.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a1fab12d8d746424ae6390ca6fe9eadef6136d62 Binary files /dev/null and b/src/main/resources/videos/async.mp4 differ diff --git a/src/main/resources/videos/bear.mp4 b/src/main/resources/videos/bear.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a74b90e33e6a40e197818a80d149c4626a3bed7d Binary files /dev/null and b/src/main/resources/videos/bear.mp4 differ diff --git a/src/main/resources/videos/cat.mp4 b/src/main/resources/videos/cat.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..f9c8f30586069bb8c693e3278a33c7e0e0c274ce Binary files /dev/null and b/src/main/resources/videos/cat.mp4 differ diff --git a/src/main/resources/videos/firework.mp4 b/src/main/resources/videos/firework.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..f102aa72a92bbe1989cf66c03785bcd937f1d3f7 Binary files /dev/null and b/src/main/resources/videos/firework.mp4 differ diff --git a/src/main/resources/videos/gta.mp4 b/src/main/resources/videos/gta.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..c207c9177e116fde566d8bcd0d3a481d28574609 Binary files /dev/null and b/src/main/resources/videos/gta.mp4 differ diff --git a/src/main/resources/videos/lessGoo.mp4 b/src/main/resources/videos/lessGoo.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a90f7c54729bcd5c78ad95f490520d97fab10920 Binary files /dev/null and b/src/main/resources/videos/lessGoo.mp4 differ diff --git a/src/main/resources/videos/lifeCouldBeMonke.mp4 b/src/main/resources/videos/lifeCouldBeMonke.mp4 index 67a0106470b6e00d968f9930b5081d517545b3e4..13f8bf59c6c1d068156d65e04cdacf19070066c9 100644 Binary files a/src/main/resources/videos/lifeCouldBeMonke.mp4 and b/src/main/resources/videos/lifeCouldBeMonke.mp4 differ diff --git a/src/main/resources/videos/parkingTickets.mp4 b/src/main/resources/videos/parkingTickets.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..cfebfc02ba32074f6415fe842956776a5cf09f3e Binary files /dev/null and b/src/main/resources/videos/parkingTickets.mp4 differ diff --git a/src/main/resources/videos/sadHorse.mp4 b/src/main/resources/videos/sadHorse.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..c71f56706fdc239f72875d6206c91a4d40f80b46 Binary files /dev/null and b/src/main/resources/videos/sadHorse.mp4 differ