From 6d6cc5b0139b4cc6cf986a6d4658bcf1a657a807 Mon Sep 17 00:00:00 2001 From: "antoine.perederii" Date: Fri, 8 Dec 2023 13:19:06 +0100 Subject: [PATCH] update javafx's tp with beautiful graphics --- .../tp/JavaFX/tpjeude/res/fxml/Fenetre.fxml | 33 ++++++++++--------- 2A/Java/tp/JavaFX/tpjeude/src/data/Stub.java | 13 ++++++++ .../JavaFX/tpjeude/src/launcher/Launch.java | 3 -- .../tp/JavaFX/tpjeude/src/view/Fenetre.java | 28 +++++++++------- 4 files changed, 47 insertions(+), 30 deletions(-) create mode 100644 2A/Java/tp/JavaFX/tpjeude/src/data/Stub.java diff --git a/2A/Java/tp/JavaFX/tpjeude/res/fxml/Fenetre.fxml b/2A/Java/tp/JavaFX/tpjeude/res/fxml/Fenetre.fxml index c9dd117..61dce2f 100644 --- a/2A/Java/tp/JavaFX/tpjeude/res/fxml/Fenetre.fxml +++ b/2A/Java/tp/JavaFX/tpjeude/res/fxml/Fenetre.fxml @@ -1,23 +1,24 @@ - - + + - - - - -
- -
- - - + + + + +
+ +
+ + +
+ diff --git a/2A/Java/tp/JavaFX/tpjeude/src/data/Stub.java b/2A/Java/tp/JavaFX/tpjeude/src/data/Stub.java new file mode 100644 index 0000000..ad6afdd --- /dev/null +++ b/2A/Java/tp/JavaFX/tpjeude/src/data/Stub.java @@ -0,0 +1,13 @@ +package data; + +import model.Game; +import model.Player; + +public class Stub { + public Game loadPlayer() { + Game game = new Game(); + game.addPlayer(new Player("Cedric")); + game.addPlayer(new Player("Jérome")); + return game; + } +} diff --git a/2A/Java/tp/JavaFX/tpjeude/src/launcher/Launch.java b/2A/Java/tp/JavaFX/tpjeude/src/launcher/Launch.java index c49c037..f105861 100644 --- a/2A/Java/tp/JavaFX/tpjeude/src/launcher/Launch.java +++ b/2A/Java/tp/JavaFX/tpjeude/src/launcher/Launch.java @@ -5,10 +5,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import view.Fenetre; - import java.io.IOException; -import java.util.Objects; public class Launch extends Application { Parent root = FXMLLoader.load(getClass().getResource("/fxml/Fenetre.fxml")); diff --git a/2A/Java/tp/JavaFX/tpjeude/src/view/Fenetre.java b/2A/Java/tp/JavaFX/tpjeude/src/view/Fenetre.java index 8680ad3..3e6821b 100644 --- a/2A/Java/tp/JavaFX/tpjeude/src/view/Fenetre.java +++ b/2A/Java/tp/JavaFX/tpjeude/src/view/Fenetre.java @@ -1,5 +1,6 @@ package view; +import data.Stub; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.image.Image; @@ -27,17 +28,7 @@ public class Fenetre { @FXML private ImageView diceImage; private boolean hasRolled = false; - private Game game; - private final Player p1 = new Player("Cedrice"); - private final Player p2 = new Player("Jerome"); - - public void initialize() { - game = new Game(); - game.addPlayer(p1); - game.addPlayer(p2); - updateUI(); - } - + private final Game game = new Stub().loadPlayer(); @FXML private void onButtonHoldClicked() { @@ -85,7 +76,22 @@ public class Fenetre { Image image = new Image(getClass().getResourceAsStream(imagePath)); diceImage.setImage(image); } + + // Vérifier si un joueur a gagné + if (currentPlayer.getTotalScore() >= Game.SCORE_TO_WIN) { + topText.setText(currentPlayer.getName() + " wins the game!"); + topText.setStyle("-fx-fill: #e74c3c;"); // Définir la couleur du texte en rouge + buttonRoll.setDisable(true); + buttonHold.setDisable(true); + } else { + // Si le jeu n'est pas terminé, utilisez la couleur par défaut ou une autre couleur de votre choix + topText.setStyle("-fx-fill: black;"); + } } + public void initialize() { +// topText.textProperty().bind(game.getCurrentPlayer()); + updateUI(); + } }