From 1cd31bc2a10210134121442c9878072c5c3eba17 Mon Sep 17 00:00:00 2001
From: ZIRTR0X <76250995+ZIRTR0X@users.noreply.github.com>
Date: Sat, 11 Dec 2021 10:38:16 +0100
Subject: [PATCH] Musique fini

---
 .../code/fxml/ConfigurationMenu.fxml          |  24 ++++++-------
 .../code/fxml/GameConfigurationMenu.fxml      |  32 ++++++++++++------
 .../code/image/personnage/Perso2.png          | Bin 0 -> 1099 bytes
 .../code/image/personnage/Perso3.png          | Bin 0 -> 1099 bytes
 code/src/launcher/Main.java                   |  15 ++++----
 code/src/model/Album.java                     |   6 +++-
 6 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 code/out/production/code/image/personnage/Perso2.png
 create mode 100644 code/out/production/code/image/personnage/Perso3.png

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.effect.Shadow?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.paint.*?>
 <?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.*?>
-<?import java.net.URL?>
 
-<AnchorPane>
-    <ImageView fitHeight="600.0" fitWidth="1300" layoutX="133.0" layoutY="150.0" pickOnBounds="true" preserveRatio="true"
-               AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-               AnchorPane.topAnchor="0.0">
-        <Image url="/image/plaine.gif"/>
-    </ImageView>
-    <Rectangle arcHeight="5.0" arcWidth="5.0" height="600.0" layoutX="50" opacity="0.42" stroke="BLACK"
-               strokeType="INSIDE" width="800.0"/>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <ImageView fitHeight="662.0" fitWidth="979.0" pickOnBounds="true" preserveRatio="true">
+         <image>
+            <Image url="/image/plaine.gif" />
+         </image>
+      </ImageView>
+      <Rectangle arcHeight="5.0" arcWidth="5.0" height="600.0" layoutX="78.0" opacity="0.42" stroke="BLACK" strokeType="INSIDE" width="745.0" />
+   </children>
 </AnchorPane>
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 @@
 <?import javafx.scene.text.Font?>
 
 
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.ToggleGroup?>
 <AnchorPane fx:id="levelRoot" xmlns:fx="http://javafx.com/fxml/1" id="pane" maxHeight="-Infinity" maxWidth="-Infinity"
             minHeight="-Infinity"
             minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0"
@@ -37,13 +39,21 @@
         </Label>
         <Line endX="181.0" endY="-3.0517578125E-5" layoutX="107.0" layoutY="160.0" startX="1.0889129638671875"
               startY="-1.52587890625E-5" stroke="#535252"/>
-                <JFXToggleButton prefHeight="33.0" prefWidth="75.0" selected="true" textFill="WHITE"
-                                 toggleColor="#8e8c8c"
-                                 toggleLineColor="WHITE" unToggleLineColor="#99999981"/>
-                <JFXToggleButton prefHeight="33.0" prefWidth="75.0" textFill="WHITE" toggleColor="#8e8c8c"
-                                 toggleLineColor="WHITE" unToggleLineColor="#99999981"/>
-                <JFXToggleButton prefHeight="33.0" prefWidth="75.0" textFill="WHITE" toggleColor="#8e8c8c"
-                                 toggleLineColor="WHITE" unToggleLineColor="#99999981"/>
+                <RadioButton fx:id="radioButton1" layoutX="85" layoutY="200" prefHeight="33.0" prefWidth="75.0" selected="true" textFill="WHITE">
+                    <toggleGroup>
+                        <ToggleGroup fx:id="group"/>
+                    </toggleGroup>
+                </RadioButton>
+                <RadioButton fx:id="radioButton2" layoutX="160" layoutY="200" prefHeight="33.0" prefWidth="75.0" textFill="WHITE">
+                    <toggleGroup>
+                        <fx:reference source="group"/>
+                    </toggleGroup>
+                </RadioButton>
+                <RadioButton fx:id="radioButton3" layoutX="238" layoutY="200" prefHeight="33.0" prefWidth="75.0" textFill="WHITE">
+                    <toggleGroup>
+                        <fx:reference source="group"/>
+                    </toggleGroup>
+                </RadioButton>
         <Line endX="240.5999755859375" endY="-3.0517578125E-5" layoutX="47.0" layoutY="467.0"
               startX="1.0889129638671875"
               startY="-1.52587890625E-5" stroke="#535252"/>
@@ -69,7 +79,7 @@
                 <Font name="Segoe UI Black" size="12.0"/>
             </font>
         </Label>
-        <ImageView fitHeight="126.0" fitWidth="109.0" layoutX="38.0" layoutY="309.0" pickOnBounds="true"
+        <ImageView fx:id="ImageChange" fitHeight="126.0" fitWidth="109.0" layoutX="38.0" layoutY="309.0" pickOnBounds="true"
                    preserveRatio="true">
             <image>
                 <Image url="/image/personnage/Perso1.png"/>
@@ -78,9 +88,9 @@
         <SplitMenuButton alignment="CENTER" contentDisplay="CENTER" layoutX="152.0" layoutY="351.0"
                          mnemonicParsing="false" text="Choix Personnage">
             <items>
-                <MenuItem mnemonicParsing="false" text="Personnage 1"/>
-                <MenuItem mnemonicParsing="false" text="Personnage 2"/>
-                <MenuItem mnemonicParsing="false" text="Personnage 3"/>
+                <MenuItem onAction="#changeSkin" fx:id="choice1" mnemonicParsing="false" text="Personnage 1"/>
+                <MenuItem onAction="#changeSkin" fx:id="choice2" mnemonicParsing="false" text="Personnage 2"/>
+                <MenuItem onAction="#changeSkin" fx:id="choice3" mnemonicParsing="false" text="Personnage 3"/>
             </items>
             <font>
                 <Font name="Segoe UI Black" size="12.0"/>
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 0000000000000000000000000000000000000000..bd7f8e7d2cf9fe7ed643770f5dd9f00bfede5b6b
GIT binary patch
literal 1099
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fgu`a+T#1%;MJ2E@X2HL_X
zEiJV<-BQNi)OA{Q^YM9Z)2j9K^lY1Y)q|q+^z||~?o%>yS>-RB@4|k5W)K4-<C84~
zpH5DAwzcH<ofEI7mrwJS|9NmO&;+2F3=D?rS5D$rGyMPmf3Sc6OV2iT4h|Vv87XlQ
zSvgsKeSLQu<0Kc;LVr6SJ7a!+{$P7!J9B*@A)yQpi=;rO=BiW`McIIW04;UJ?K>8G
z+8STJa-5f!*TMgR2GDGQk|4ieuq{Z0oTmM4AeS-8+ucQBbGB^*ki%Kv5n0T@z;^_M
z8K-LVNdpDhOFVsD*`IPtbLp6W>+8w{Y05A13t>FJsC*U!15=Eri(`n#@v~F%%V!yg
zv>z<n6}tVY)c=-(-DRwzOIDODp8Ed((X#v|tLrSkiuQ}k^gXXEdhgrh_~E`ggMACb
zIrkr$0(QBd8C`w!cWh{_Vks1iS{-corP}qEbk<DmIF6f#|EG5N#l=W(o*BBNVcyrZ
z2D8tnKR;XasoPthJNwKTwjV7=n?yfZY+HU=K(E=+(ELG?-SY3NH{LxorJF%I#xaJa
zKys0-L5An%)JG<pr@Y@L=Eo#`rbu&x{<($Gjt3@bY>?ru;qhZWQ^gb_(zt=CAu?u{
z_lI3yc87Vr-X`3kbaHy=CZ)Md8M1*5>8u?|qTZihdLF;PxLsg!g9nqTx?+&GtmnJa
zmHRz8JOaM|XlBido!pSH-Lyn9>_EG_fjsZt|2-4aKXOc|*cnoh&+=$%*TnL!G>ILp
z5&F}Ay?iN{!`Qpx7i$;WY3;6`)svX#FSzlbIN_g;z<c8W!xc|whS#t$?-xkOnJN}u
zlJIbWH;2IE8=JHYIjdR1awe6ydJ1c|nA`m;+Z&laMdj@F+j|riyH_lmlIrO+G5>ST
zb|pobmbykRgZZkzV<$d8>iOYQ$U++#zMKbn+qF+Dcxuh%^7_qzCQ~l4RepA1uh;1K
z21mBB=7)sd{UP0@B*dpX|6!M&SIFLwMth0bGwWwA*mTG{^rvi1T1kFWm!GV*(Fw=(
z8-Mn0wSD7Xvh~B%Y3r?iJmlC|SH1e=%AfOO`qzubi|2bEKJS_QW7j(Oc(=o+B>wTd
zpJb9di%q!hj^x7|8|w^Y)X%0(ez)=Fd+9kfd*9}?8~>Yj;n6hte)Y-k|1;Gy7(dMx
zb=x~H0GQ}hOI#yLQW8s2t&)pUffR$0fsvuEp`oskd5EEbm5GU!vAMQ^ft7*5`-it`
eQ8eV{r(~v8;?^*4Ptrl41_n=8KbLh*2~7a3m!lT|

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..04af49aec025d5f94c3ccc78d9a2e3c35430ba2f
GIT binary patch
literal 1099
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fgu{yvf#1%;MJ2E@X2HL_X
zEiJV<-O_bhwT!>1+qCND<MZ@@KwnQiD9W~}SINjFbK|~z7xq>D!sllOF)%Vd*;4T7
z<b-EiOMc%uG0j{4)%5b82j>D!0Ghde<s=3M!~g&P^Q#%M^lW42;E<7(krEg2u`^C`
zF)j4BbGI>;m6O%i*S9m*54Jbv=jRs^63XzfND6dnu1Zx=l-<5#v6i}GKtRCdE5|);
zjd^)_!@lp~1{y6;666;Qq)~vJru}W80ArH3yNf(4ufSd)hqJ&VvY3H^?+6GpPSxg<
z1`4v5c>21sKjoI@(&v;pbc7M4DZj`sgz@~M@>vWFO!1yBjv*e$uTH*MHQPX-^`Pfm
zv#qx$rZNj%)=Bsv6`i@_@NfIbbd^0OZdv)&e<TYF>*h-Kb}ahubU?`I!|EU6zn2Ir
z8VJ_kowH3WU4>^ub&=*nuFoEEw_{`D9&D1>CU@OH(eBq@7LJ#1F29^#=O4QK@yv5+
zm%R^6XT0YBf8}TO=cgvw9b((T6CQXdsorUQ-GdO9NoUeJS<{tXb|%=*VN4XxV7<3*
zy_)9JjoG(5Us$|gd$E$U<!;HNxEu8>3-+_iu`u>65e*VhWXOrEN!C?RI4yERcOB!&
zvXj?C(<Do_X0DyWmgf?~e8=>?Zt>Lg0|#1|Hu(r&WZ!X{SHXDhDjpS4Ck7=(%jp$w
z`|oaK5?ZiQlCADRvy#Fmray;cCZDYH`S7EK@5M*=j}6hw^bFJ|PZO(fn7XX;{Zl(;
zuE5<K6*YC&GFKJz8*Dhv()ENxq5Ku|iTi@G4z3qvZmj=vpdo#sU(1u_VG=(Z9eq9r
ztGB$Z-2b2DNbA(*ka>%b%ipz7(mQ3jQfEW3NGs!~@UKaM(~nNt616_>uY--kvKjfW
zssh7Va<<<V57Icq7#bTsTUJ%TQIN60M4^7`&728;fB&tM_Sn#pxS*(x?c3>4F@?OI
zhsvuaNZ;EuP5alZKP{D}Uw$qr<~DF-)cVYLY(_Y{#-Gg8-QRenPWsk0o5Z$SYq!Pi
znXKGobVmBp)1Ob;?mSq(wf>S|JoD!=ix0UOC+_aqf7xhHH&fF7oziu3X1>Xt+kOZ!
z3Gj>UIKC~HyKYKqp?uGSO?mtKHr#z1b!Y19(&(OMhL^W9OysPalDghM?r*!VW}j7k
z{g6{NFx{z^xJHzuB$lLFB^RXvDF!10BST$7LtP{D5JLki6EiDQb8Q0yD+2@FYUbl8
c8glbfGSez?Ylu<X4YGm3)78&qol`;+0J_Mc!2kdN

literal 0
HcmV?d00001

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<Musique> listeMusiques;
+    private Thread musicThread;
 
     public Album(ArrayList<Musique> 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);