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 -