revert stash
This commit is contained in:
@@ -16,6 +16,7 @@ import javafx.scene.image.Image;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
public class MenuController implements Initializable{
|
||||
@@ -49,13 +50,43 @@ public class MenuController implements Initializable{
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void afficherRegle(MouseEvent mouseEvent) {
|
||||
|
||||
@FXML
|
||||
public void ouvrirParametres(MouseEvent mouseEvent) throws IOException{
|
||||
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
||||
EffetSonore.playSoundEffect(fileSound1);
|
||||
|
||||
System.out.println("Passage à l'écran des paramètres");
|
||||
final URL fxmlURL = getClass().getResource("/ihm/ressources/parametre.fxml");
|
||||
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
|
||||
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
|
||||
Pane pane = fxmlLoader.load();
|
||||
|
||||
rootPane.getChildren().setAll(pane);
|
||||
|
||||
|
||||
}
|
||||
@FXML
|
||||
public void quitterLappli(MouseEvent mouseEvent) throws IOException{
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
|
||||
@FXML
|
||||
public void afficherRegle(MouseEvent mouseEvent) throws IOException {
|
||||
|
||||
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
||||
|
||||
EffetSonore.playSoundEffect(fileSound1);
|
||||
System.out.println("blaaaa");
|
||||
System.out.println("Passage à l'écran des règles");
|
||||
final URL fxmlURL = getClass().getResource("/ihm/ressources/Regles.fxml");
|
||||
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
|
||||
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
|
||||
AnchorPane pane = fxmlLoader.load();
|
||||
Scene scene = new Scene(pane);
|
||||
Stage appStage = (Stage) ((Node) mouseEvent.getSource()).getScene().getWindow();
|
||||
appStage.setScene(scene);
|
||||
appStage.show();
|
||||
|
||||
}
|
||||
}
|
||||
|
@@ -28,7 +28,7 @@ public class PauseController implements Initializable {
|
||||
private CheckBox cbEffet;
|
||||
|
||||
String filepathMusique = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav";
|
||||
InputStream fileMusique = getClass().getResourceAsStream("src//ihm//ressources//musique//The_Red_Fox_Tavern.wav");
|
||||
InputStream fileMusique = getClass().getResourceAsStream("/ihm/ressources/musique/The_Red_Fox_Tavern.wav");
|
||||
|
||||
boolean MusiqueLancee = ParametreController.cbMusiqueCoche;
|
||||
boolean SonLance = ParametreController.cbSonCoche;
|
||||
@@ -53,24 +53,21 @@ public class PauseController implements Initializable {
|
||||
// Pour la musique
|
||||
|
||||
if (fileMusique != null) {
|
||||
System.out.println("point d'arret 1");
|
||||
if (cbMusique.isSelected()) {
|
||||
System.out.println("\tLancement de la musique");
|
||||
|
||||
if (Musique.clipTimePosition == 0 && MusiqueLancee == false) { // si la musique n'a jamais été lancé
|
||||
Musique.playMusique(fileMusique);
|
||||
MusiqueLancee = true;
|
||||
System.out.println("point d'arret 2");
|
||||
} else
|
||||
Musique.resumeMusique(Musique.clip); // si elle a deja été lancé mais mis en pause, reprend a partir du point d'arret
|
||||
System.out.println("point d'arret 3");
|
||||
Musique.resumeMusique(Musique.clip); // si elle a deja été lancé mais mis en pause, reprend a partir du point d'arret
|
||||
} else {
|
||||
Musique.pauseMusique(Musique.clip); // met en pause la musique
|
||||
System.out.println("\tMise en pause de la musique");
|
||||
}
|
||||
}
|
||||
else {
|
||||
System.out.println("ON A UN PROBLEME, AUCUN POINT D'ARRET N'EST PASSE");
|
||||
System.out.println("fichier audio non trouvé");
|
||||
}
|
||||
|
||||
// Pour les effets sonores
|
||||
|
@@ -69,7 +69,7 @@ public class PlateauController implements Initializable {
|
||||
}
|
||||
|
||||
for(int i = 0; i<joueursIHM.size(); i++) {
|
||||
joueursIHM.get(i).deplacerPionVie((int) (Math.random()*13));
|
||||
joueursIHM.get(i).deplacerPionVie(0);
|
||||
}
|
||||
|
||||
|
||||
|
90
src/ihm/controller/ReglesControlleur.java
Normal file
90
src/ihm/controller/ReglesControlleur.java
Normal file
@@ -0,0 +1,90 @@
|
||||
package ihm.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.util.Locale;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import ihm.EffetSonore;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.image.Image;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
public class ReglesControlleur implements Initializable {
|
||||
|
||||
@FXML
|
||||
private AnchorPane rootPane;
|
||||
@FXML
|
||||
private ImageView imageRegles;
|
||||
|
||||
private int index = 1;
|
||||
|
||||
@Override
|
||||
public void initialize(URL arg0, ResourceBundle arg1) {
|
||||
|
||||
InputStream input = getClass().getResourceAsStream("/ihm/ressources/img/Regle1.png");
|
||||
Image image = new Image(input);
|
||||
imageRegles.setImage(image);
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void pageSuivante(MouseEvent mouseEvent) throws IOException {
|
||||
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
||||
EffetSonore.playSoundEffect(fileSound1);
|
||||
|
||||
if (index < 4) {
|
||||
index++;
|
||||
}
|
||||
|
||||
System.out.println("Page suivante");
|
||||
InputStream input = getClass().getResourceAsStream("/ihm/ressources/img/Regle" + index + ".png");
|
||||
Image image = new Image(input);
|
||||
imageRegles.setImage(image);
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void pagePrecedente(MouseEvent mouseEvent) throws IOException {
|
||||
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
||||
EffetSonore.playSoundEffect(fileSound1);
|
||||
|
||||
if (index > 1) {
|
||||
index--;
|
||||
}
|
||||
|
||||
System.out.println("Page précédente");
|
||||
InputStream input = getClass().getResourceAsStream("/ihm/ressources/img/Regle" + index + ".png");
|
||||
Image image = new Image(input);
|
||||
imageRegles.setImage(image);
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void retourMenu(MouseEvent mouseEvent) throws IOException {
|
||||
|
||||
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
||||
|
||||
EffetSonore.playSoundEffect(fileSound1);
|
||||
System.out.println("Retour au Menu");
|
||||
final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml");
|
||||
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
|
||||
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
|
||||
AnchorPane pane = fxmlLoader.load();
|
||||
Scene scene = new Scene(pane);
|
||||
Stage appStage = (Stage) ((Node) mouseEvent.getSource()).getScene().getWindow();
|
||||
appStage.setScene(scene);
|
||||
appStage.show();
|
||||
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user