diff --git a/code/out/production/code/fxml/ConfigurationMenu.fxml b/code/out/production/code/fxml/ConfigurationMenu.fxml index c1f5b6f..4a61b55 100644 --- a/code/out/production/code/fxml/ConfigurationMenu.fxml +++ b/code/out/production/code/fxml/ConfigurationMenu.fxml @@ -1,22 +1,18 @@ - - - - - - - - - - - + + + + + + + + + + diff --git a/code/out/production/code/fxml/GameConfigurationMenu.fxml b/code/out/production/code/fxml/GameConfigurationMenu.fxml index c821e00..6c8b7f7 100644 --- a/code/out/production/code/fxml/GameConfigurationMenu.fxml +++ b/code/out/production/code/fxml/GameConfigurationMenu.fxml @@ -13,6 +13,8 @@ + + - - - + + + + + + + + + + + + + + + @@ -69,7 +79,7 @@ - @@ -78,9 +88,9 @@ - - - + + + diff --git a/code/out/production/code/image/personnage/Perso2.png b/code/out/production/code/image/personnage/Perso2.png new file mode 100644 index 0000000..bd7f8e7 Binary files /dev/null and b/code/out/production/code/image/personnage/Perso2.png differ diff --git a/code/out/production/code/image/personnage/Perso3.png b/code/out/production/code/image/personnage/Perso3.png new file mode 100644 index 0000000..04af49a Binary files /dev/null and b/code/out/production/code/image/personnage/Perso3.png differ diff --git a/code/src/launcher/Main.java b/code/src/launcher/Main.java index 72f2da5..1e55333 100644 --- a/code/src/launcher/Main.java +++ b/code/src/launcher/Main.java @@ -20,11 +20,7 @@ import java.util.Objects; public class Main extends Application { private static Database currentd; - @Override - public void stop(){ - System.out.println("Stopping"); - - } + private Album song; @Override public void start(Stage primaryStage) throws Exception { @@ -40,7 +36,7 @@ public class Main extends Application { Musique song2 = new Musique("/musique/medieval_musique2.mp3",248000); Musique song3 = new Musique("/musique/medieval_musique3.mp3",248000); Musique song4 = new Musique("/musique/medieval_musique4.mp3",209000); - Album song = new Album(musiqueListe); + song = new Album(musiqueListe); song.addList(song1); song.addList(song2); song.addList(song3); @@ -70,6 +66,13 @@ public class Main extends Application { } + @Override + public void stop(){ + System.out.println("Stopping"); + song.stop(); + + } + public static Database getDatabase() { return currentd; diff --git a/code/src/model/Album.java b/code/src/model/Album.java index 3704b3e..358d718 100644 --- a/code/src/model/Album.java +++ b/code/src/model/Album.java @@ -10,6 +10,7 @@ import java.util.Objects; public class Album { private ArrayList listeMusiques; + private Thread musicThread; public Album(ArrayList listeMusiques) { this.listeMusiques = listeMusiques; @@ -36,7 +37,7 @@ public class Album { i++; }*/ - Thread musicThread = new Thread("musique") { + musicThread = new Thread("musique") { public void run(){ int i; Media media; @@ -60,6 +61,9 @@ public class Album { } + public void stop() { + musicThread.stop(); + } public void addList(Musique musique){ listeMusiques.add(musique);