From ab74bb0fdf5cf1699abec511c08fd5cacb6a249d Mon Sep 17 00:00:00 2001 From: Chiara Date: Wed, 29 Apr 2020 16:56:15 +0200 Subject: [PATCH 1/6] lancement jouer tour auto plateau --- .../controller/JouerSonTour1Controller.java | 4 +- src/ihm/controller/PlateauController.java | 39 ++++++--- .../ressources/Jouer_tour(1)lancer_des.fxml | 20 ++--- src/ihm/ressources/Plateau.fxml | 80 +++++++++++++++--- src/ihm/ressources/img/de.gif | Bin 60493 -> 0 bytes src/ihm/ressources/img/diceSprite.png | Bin 92630 -> 0 bytes .../ressources/img/dosCartesPersonnageRot.jpg | Bin 130839 -> 0 bytes src/ihm/ressources/img/dé.png | Bin 149278 -> 0 bytes src/ihm/ressources/img/dé1.jpg | Bin 25440 -> 0 bytes src/ihm/ressources/img/dé2.jpg | Bin 26306 -> 0 bytes src/ihm/ressources/img/dé3.jpg | Bin 27290 -> 0 bytes src/ihm/ressources/img/dé4.jpg | Bin 28657 -> 0 bytes src/ihm/ressources/img/dé5.jpg | Bin 28892 -> 0 bytes src/ihm/ressources/img/dé6.jpg | Bin 30549 -> 0 bytes src/ihm/ressources/img/dés.jpg | Bin 27833 -> 0 bytes 15 files changed, 106 insertions(+), 37 deletions(-) delete mode 100644 src/ihm/ressources/img/de.gif delete mode 100644 src/ihm/ressources/img/diceSprite.png delete mode 100644 src/ihm/ressources/img/dosCartesPersonnageRot.jpg delete mode 100644 src/ihm/ressources/img/dé.png delete mode 100644 src/ihm/ressources/img/dé1.jpg delete mode 100644 src/ihm/ressources/img/dé2.jpg delete mode 100644 src/ihm/ressources/img/dé3.jpg delete mode 100644 src/ihm/ressources/img/dé4.jpg delete mode 100644 src/ihm/ressources/img/dé5.jpg delete mode 100644 src/ihm/ressources/img/dé6.jpg delete mode 100644 src/ihm/ressources/img/dés.jpg diff --git a/src/ihm/controller/JouerSonTour1Controller.java b/src/ihm/controller/JouerSonTour1Controller.java index dac0c00..456b804 100644 --- a/src/ihm/controller/JouerSonTour1Controller.java +++ b/src/ihm/controller/JouerSonTour1Controller.java @@ -38,8 +38,8 @@ public class JouerSonTour1Controller implements Initializable{ int OFFSET_X = 0; int OFFSET_Y = 0; - int WIDTH = 200; - int HEIGHT = 200; + int WIDTH = 80; + int HEIGHT = 80; int COUNT = 6; int COLUMNS = 6; diff --git a/src/ihm/controller/PlateauController.java b/src/ihm/controller/PlateauController.java index 54a100b..634cffb 100644 --- a/src/ihm/controller/PlateauController.java +++ b/src/ihm/controller/PlateauController.java @@ -11,26 +11,17 @@ import java.util.ResourceBundle; import ihm.PopUp; import ihm.PopUpBoolean; -import ihm.SpriteAnimation; -import javafx.animation.Animation; -import javafx.event.Event; -import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; -import javafx.geometry.Rectangle2D; -import javafx.scene.Group; import javafx.scene.Parent; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; -<<<<<<< HEAD -======= -import javafx.util.Duration; ->>>>>>> eea99d2341b1df015a2831034aa39534addff16e import main.Joueur; import main.View; @@ -41,6 +32,7 @@ public class PlateauController implements Initializable { private List -