School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development

Browse Source
This commit is contained in:
Paul Gross 2020-05-08 16:09:01 +02:00
commit abacff2a17
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ihm/Main.java
View File

@ -17,9 +17,9 @@ import javafx.stage.WindowEvent;
import main.GestionnaireJeu; import main.GestionnaireJeu;
public class Main extends Application { public class Main extends Application {
GraphicsDevice Gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); /*GraphicsDevice Gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
int width = Gd.getDisplayMode().getWidth(); int width = Gd.getDisplayMode().getWidth();
int height = Gd.getDisplayMode().getHeight(); int height = Gd.getDisplayMode().getHeight(); */
@Override @Override
public void start(Stage primaryStage) throws Exception { public void start(Stage primaryStage) throws Exception {
@ -29,7 +29,7 @@ public class Main extends Application {
Pane root = fxmlLoader.load(); Pane root = fxmlLoader.load();
primaryStage.setTitle("Shadow Hunters"); primaryStage.setTitle("Shadow Hunters");
primaryStage.setScene(new Scene(root,width,height)); primaryStage.setScene(new Scene(root));
primaryStage.setMaximized(true); primaryStage.setMaximized(true);
primaryStage.centerOnScreen(); primaryStage.centerOnScreen();
primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() { primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() {

12
src/ihm/controller/ParametreController.java
View File

@ -32,10 +32,13 @@ public class ParametreController implements Initializable {
@FXML @FXML
private Slider sliderMusique; private Slider sliderMusique;
public static boolean cbMusiqueCoche = false; // verifi si la checbox musical est coche public static boolean cbMusiqueCoche = false; // verifi si la checbox musical est coche
public static boolean cbSonCoche = false; public static boolean cbSonCoche = false;
public static boolean cbClair = false; public static boolean cbClair = false;
public static double slideValue; public static double slideValue;
public static String langueChoisi;
boolean MusiqueLancee = false; //verifi si la musique a déja été lancé une première fois boolean MusiqueLancee = false; //verifi si la musique a déja été lancé une première fois
@ -67,7 +70,6 @@ public class ParametreController implements Initializable {
public void enregistre(MouseEvent mouseEvent) throws IOException, Exception { public void enregistre(MouseEvent mouseEvent) throws IOException, Exception {
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav"); InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
//Pour la musique //Pour la musique
if (fileMusique!=null) { if (fileMusique!=null) {
@ -116,9 +118,12 @@ public class ParametreController implements Initializable {
if (clair.isSelected()) { if (clair.isSelected()) {
//Pane root = FXMLLoader.load(getClass().getResource("../ressources/menu.fxml")); //Pane root = FXMLLoader.load(getClass().getResource("../ressources/menu.fxml"));
//rootPane.setStyle("-fx-background-color: white;");
rootPane.setStyle("-fx-background-color: white;");
rootPane.applyCss();
} }
rootPane.setStyle("-fx-background-color: white;");
rootPane.applyCss();
/*if (liste != null) { /*if (liste != null) {
for (int i = 0; i < liste.length; i++) { for (int i = 0; i < liste.length; i++) {
@ -143,6 +148,7 @@ public class ParametreController implements Initializable {
EffetSonore.playSoundEffect(fileSound1); //emet un bruit sur le bouton si les effets sonores sont activés EffetSonore.playSoundEffect(fileSound1); //emet un bruit sur le bouton si les effets sonores sont activés
// Quitter les paramètres // Quitter les paramètres
final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml"); final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE); final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);