From 6fedf1c0610df053704dbdb3eeeaeba71d3b42b6 Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Tue, 28 Apr 2020 14:49:47 +0200
Subject: [PATCH] =?UTF-8?q?=C3=A9puration=20du=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ihm/Main.java                           |  6 ------
 src/ihm/Musique.java                        |  1 -
 src/ihm/controller/ParametreController.java | 18 ++++++------------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/ihm/Main.java b/src/ihm/Main.java
index ae4bc0f..ca87e71 100644
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -7,7 +7,6 @@ import java.util.ResourceBundle;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
-import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
@@ -28,11 +27,6 @@ public class Main extends Application {
 	}
 
 	public static void main(String[] args) {
-
-		String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
-																					// https://www.youtube.com/watch?v=LBpKUIyOHdo
-		Musique musiqueObjet = new Musique();
-		//musiqueObjet.playMusique(filepath);
 		launch(args);
 	}
 }
diff --git a/src/ihm/Musique.java b/src/ihm/Musique.java
index 7ee513a..67b930d 100644
--- a/src/ihm/Musique.java
+++ b/src/ihm/Musique.java
@@ -5,7 +5,6 @@ import java.io.File;
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
-import javax.swing.JOptionPane;
 
 public class Musique {
 
diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java
index 3186f5e..97270e3 100644
--- a/src/ihm/controller/ParametreController.java
+++ b/src/ihm/controller/ParametreController.java
@@ -5,18 +5,10 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.Clip;
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.swing.JOptionPane;
-
 import ihm.Musique;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.input.MouseEvent;
@@ -73,12 +65,9 @@ public class ParametreController implements Initializable {
 				}
 
 			}
-			/*
-			 * } catch (IOException e) { // TODO Auto-generated catch block
-			 * e.printStackTrace(); }
-			 */
 
 		}
+		
 
 		/*
 		 * if(clair.isSelected()) { Pane root =
@@ -91,6 +80,11 @@ public class ParametreController implements Initializable {
 		 * 
 		 * }
 		 */
+		
+		
+		Pane pane = FXMLLoader.load(getClass().getResource("../ressources/Jouer_tour(3)attaquer.fxml"));
+
+        rootPane.getChildren().setAll(pane);
 
 	}
 }