diff --git a/code/code.iml b/code/code.iml index fb8e866..95d012e 100644 --- a/code/code.iml +++ b/code/code.iml @@ -3,10 +3,20 @@ + + + + + + + + + + \ No newline at end of file diff --git a/code/out/production/code/musique/medieval_musique1.mp3 b/code/out/production/code/musique/medieval_musique1.mp3 new file mode 100644 index 0000000..44c41ce Binary files /dev/null and b/code/out/production/code/musique/medieval_musique1.mp3 differ diff --git a/code/out/production/code/musique/medieval_musique1.wav b/code/out/production/code/musique/medieval_musique1.wav new file mode 100644 index 0000000..b6cec8c Binary files /dev/null and b/code/out/production/code/musique/medieval_musique1.wav differ diff --git a/code/ressources/image/oui.jpg b/code/ressources/image/oui.jpg deleted file mode 100644 index d62309a..0000000 Binary files a/code/ressources/image/oui.jpg and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.2.png b/code/ressources/image/personnage/Perso1.2.png deleted file mode 100644 index ad14e8a..0000000 Binary files a/code/ressources/image/personnage/Perso1.2.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.3.png b/code/ressources/image/personnage/Perso1.3.png deleted file mode 100644 index 018e4d6..0000000 Binary files a/code/ressources/image/personnage/Perso1.3.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.4.png b/code/ressources/image/personnage/Perso1.4.png deleted file mode 100644 index 4edc99d..0000000 Binary files a/code/ressources/image/personnage/Perso1.4.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.5.png b/code/ressources/image/personnage/Perso1.5.png deleted file mode 100644 index 7b9328f..0000000 Binary files a/code/ressources/image/personnage/Perso1.5.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.6.png b/code/ressources/image/personnage/Perso1.6.png deleted file mode 100644 index bd7f8e7..0000000 Binary files a/code/ressources/image/personnage/Perso1.6.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.7.png b/code/ressources/image/personnage/Perso1.7.png deleted file mode 100644 index b16ec3d..0000000 Binary files a/code/ressources/image/personnage/Perso1.7.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.8.png b/code/ressources/image/personnage/Perso1.8.png deleted file mode 100644 index 7e1550b..0000000 Binary files a/code/ressources/image/personnage/Perso1.8.png and /dev/null differ diff --git a/code/ressources/image/personnage/Perso1.9.png b/code/ressources/image/personnage/Perso1.9.png deleted file mode 100644 index 04af49a..0000000 Binary files a/code/ressources/image/personnage/Perso1.9.png and /dev/null differ diff --git a/code/ressources/musique/medieval_musique1.mp3 b/code/ressources/musique/medieval_musique1.mp3 new file mode 100644 index 0000000..44c41ce Binary files /dev/null and b/code/ressources/musique/medieval_musique1.mp3 differ diff --git a/code/ressources/musique/medieval_musique1.wav b/code/ressources/musique/medieval_musique1.wav new file mode 100644 index 0000000..b6cec8c Binary files /dev/null and b/code/ressources/musique/medieval_musique1.wav differ diff --git a/code/src/launcher/Main.java b/code/src/launcher/Main.java index 76f529c..523aa98 100644 --- a/code/src/launcher/Main.java +++ b/code/src/launcher/Main.java @@ -4,8 +4,14 @@ import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; +import javafx.scene.media.MediaPlayer; import javafx.stage.Stage; import model.Database; +import javafx.scene.media.Media; +import model.Musique; + +import java.io.File; + import java.io.*; import java.util.Objects; @@ -15,19 +21,26 @@ public class Main extends Application { private static Database currentd; @Override - public void start(Stage primaryStage) throws Exception{ + public void start(Stage primaryStage) throws Exception { Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/GameConfigurationMenu.fxml"))); primaryStage.setTitle("Hello World"); primaryStage.setScene(new Scene(root, 900, 600)); primaryStage.setResizable(false); primaryStage.show(); + String pathmusique ="/musique/medieval_musique1.mp3"; + System.out.println(pathmusique); + Musique song = new Musique(); + song.play(pathmusique); + //song.sound.isPlaying() + } - public static Database getDatabase(){ + public static Database getDatabase() { return currentd; } + public static void serialize() throws IOException { try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream("database.txt"))) { out.writeObject(currentd); @@ -36,20 +49,16 @@ public class Main extends Application { System.exit(0); } } - public static void deserialize() throws ClassNotFoundException, IOException{ + + public static void deserialize() throws ClassNotFoundException, IOException { ObjectInputStream in = null; try { - in=new ObjectInputStream (new FileInputStream("database.txt")); - currentd=(Database) in.readObject(); + in = new ObjectInputStream(new FileInputStream("database.txt")); + currentd = (Database) in.readObject(); in.close(); - } - catch (FileNotFoundException | NullPointerException e){ - currentd=new Database(); + } catch (FileNotFoundException | NullPointerException e) { + currentd = new Database(); } } - - - public static void main(String[] args) { - launch(args); - } } + diff --git a/code/src/model/Avatar.java b/code/src/model/Avatar.java deleted file mode 100644 index 06b3c3f..0000000 --- a/code/src/model/Avatar.java +++ /dev/null @@ -1,52 +0,0 @@ -package model; - -public class Avatar { - int idAvatar; - String image; - int coordX; - int coordY; - - public Avatar(int idAvatar, String image, int coordX, int coordY) { - this.idAvatar = idAvatar; - this.image = image; - this.coordX = coordX; - this.coordY = coordY; - } - - public Avatar(int idAvatar, String image) { - this.idAvatar = idAvatar; - this.image = image; - } - - public int getIdAvatar() { - return idAvatar; - } - - public String getImage() { - return image; - } - - public int getCoordX() { - return coordX; - } - - public int getCoordY() { - return coordY; - } - - public void setIdAvatar(int idAvatar) { - this.idAvatar = idAvatar; - } - - public void setImage(String image) { - this.image = image; - } - - public void setCoordX(int coordX) { - this.coordX = coordX; - } - - public void setCoordY(int coordY) { - this.coordY = coordY; - } -} diff --git a/code/src/model/Case.java b/code/src/model/Case.java deleted file mode 100644 index b868a6b..0000000 --- a/code/src/model/Case.java +++ /dev/null @@ -1,57 +0,0 @@ -package model; - -public class Case { - int idCase; - int coordX; - int coordY; - boolean isStart; - boolean isEnd; - - public Case(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd) { - this.idCase = idCase; - this.coordX = coordX; - this.coordY = coordY; - this.isStart = isStart; - this.isEnd = isEnd; - } - - public int getIdCase() { - return idCase; - } - - public int getCoordX() { - return coordX; - } - - public int getCoordY() { - return coordY; - } - - public boolean isStart() { - return isStart; - } - - public boolean isEnd() { - return isEnd; - } - - public void setIdCase(int idCase) { - this.idCase = idCase; - } - - public void setCoordX(int coordX) { - this.coordX = coordX; - } - - public void setCoordY(int coordY) { - this.coordY = coordY; - } - - public void setStart(boolean start) { - isStart = start; - } - - public void setEnd(boolean end) { - isEnd = end; - } -} diff --git a/code/src/model/Musique.java b/code/src/model/Musique.java new file mode 100644 index 0000000..ace6ff3 --- /dev/null +++ b/code/src/model/Musique.java @@ -0,0 +1,19 @@ +package model; + + +import javafx.scene.media.AudioClip; +import javafx.scene.media.Media; +import javafx.scene.media.MediaPlayer; + +import java.util.Objects; + +public class Musique { + + public void play(String path) { + Media media = new Media(Objects.requireNonNull(getClass().getResource(path)).toExternalForm()); + AudioClip mediaPlayer = new AudioClip(media.getSource()); + mediaPlayer.volumeProperty().setValue(0.025); + mediaPlayer.play(); + + } +}