Skip to content

Commit 0f6fcaf

Browse files
authored
Merge pull request #75 from nadia12-p/background-sound
Background sounds
2 parents 8cd14d0 + 27966e3 commit 0f6fcaf

11 files changed

+13
-67
lines changed

.idea/libraries/Maven__org_openjfx_javafx_base_win_17_0_2.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_openjfx_javafx_controls_win_17_0_1.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_openjfx_javafx_fxml_win_17_0_1.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_openjfx_javafx_graphics_win_17_0_2.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_openjfx_javafx_media_win_17_0_0_1.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/main/java/com/dinosaur/dinosaurexploder/controller/DinosaurController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void initGame() {
5050

5151
player = spawn("player", getAppCenter().getX() - 45, getAppHeight()-200);
5252

53-
FXGL.play("engine.wav");
53+
FXGL.play("gameBackground.wav");
5454

5555
/* At each second that passes, we have 2 out of 3 chances of spawning a green dinosaur
5656
* This spawns dinosaurs randomly

src/main/java/com/dinosaur/dinosaurexploder/view/DinosaurMenu.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import javafx.scene.control.Button;
99
import javafx.scene.layout.Pane;
1010
import javafx.scene.layout.StackPane;
11+
import javafx.scene.media.Media;
12+
import javafx.scene.media.MediaPlayer;
1113
import javafx.scene.paint.Color;
1214
import javafx.scene.shape.Rectangle;
1315

@@ -16,6 +18,11 @@ public class DinosaurMenu extends FXGLMenu {
1618
public DinosaurMenu() {
1719
super(MenuType.MAIN_MENU);
1820

21+
Media media = new Media(getClass().getResource("/assets/sounds/mainMenu.wav").toExternalForm());
22+
MediaPlayer mainMenuSound = new MediaPlayer(media);
23+
mainMenuSound.play();
24+
mainMenuSound.setCycleCount(MediaPlayer.INDEFINITE);
25+
1926
var bg = new Rectangle(getAppWidth(), getAppHeight(), Color.BLACK);
2027

2128
var title = FXGL.getUIFactoryService().newText("Dinosaur Exploder", Color.LIME, FontType.MONO, 35);
@@ -36,7 +43,10 @@ public DinosaurMenu() {
3643
quitButton.setTranslateX(getAppWidth() / 2 - 100);
3744
quitButton.setStyle("-fx-font-size:20");
3845

39-
startButton.setOnAction(event -> fireNewGame());
46+
startButton.setOnAction(event -> {
47+
fireNewGame();
48+
mainMenuSound.stop();
49+
});
4050
quitButton.setOnAction(event -> fireExit());
4151

4252
getContentRoot().getChildren().addAll(

src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
requires javafx.controls;
33
requires com.almasb.fxgl.all;
44
exports com.dinosaur.dinosaurexploder;
5+
requires javafx.media;
56

67
opens assets.textures;
78
opens assets.sounds;
-9.16 MB
Binary file not shown.
68 MB
Binary file not shown.

0 commit comments

Comments
 (0)