From 5ccf1a731b30f5c47d0d75c2891d0a2c4705649d Mon Sep 17 00:00:00 2001
From: Chiara <chiara.relevat@oulook.fr>
Date: Mon, 27 Apr 2020 13:56:34 +0200
Subject: [PATCH] changement des

---
 src/ihm/Main.java                             |  2 +-
 src/ihm/SpriteAnimation.java                  | 47 +++++++++++++++++++
 .../controller/JouerSonTour1Controller.java   |  8 ----
 .../ressources/Jouer_tour(1)lancer_des.fxml   |  8 ----
 src/ihm/ressources/img/des.fxml               | 11 +++++
 5 files changed, 59 insertions(+), 17 deletions(-)
 create mode 100644 src/ihm/SpriteAnimation.java
 create mode 100644 src/ihm/ressources/img/des.fxml

diff --git a/src/ihm/Main.java b/src/ihm/Main.java
index e2ad2e7..ea9fd09 100644
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -12,7 +12,7 @@ public class Main extends Application {
 	public void start(Stage primaryStage) throws Exception {
 		System.out.println("Lancement de l'application");
 
-		Pane root = FXMLLoader.load(getClass().getResource("ressources/Menu.fxml")); // "ressources/Jouer_tour(1)lancer_des.fxml"
+		Pane root = FXMLLoader.load(getClass().getResource("ressources/des.fxml")); // "ressources/Jouer_tour(1)lancer_des.fxml"
 
 		primaryStage.setTitle("Shadow Hunters");
 		primaryStage.setScene(new Scene(root));
diff --git a/src/ihm/SpriteAnimation.java b/src/ihm/SpriteAnimation.java
new file mode 100644
index 0000000..b9d58af
--- /dev/null
+++ b/src/ihm/SpriteAnimation.java
@@ -0,0 +1,47 @@
+package ihm;
+
+import javafx.animation.Interpolator;
+import javafx.animation.Transition;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.image.ImageView;
+import javafx.util.Duration;
+
+public class SpriteAnimation extends Transition {
+
+    private final ImageView imageView;
+    private final int count;
+    private final int columns;
+    private final int offsetX;
+    private final int offsetY;
+    private final int width;
+    private final int height;
+
+    private int lastIndex;
+
+    public SpriteAnimation(
+            ImageView imageView, 
+            Duration duration, 
+            int count,   int columns,
+            int offsetX, int offsetY,
+            int width,   int height) {
+        this.imageView = imageView;
+        this.count     = count;
+        this.columns   = columns;
+        this.offsetX   = offsetX;
+        this.offsetY   = offsetY;
+        this.width     = width;
+        this.height    = height;
+        setCycleDuration(duration);
+        setInterpolator(Interpolator.LINEAR);
+    }
+
+    protected void interpolate(double k) {
+        final int index = Math.min((int) Math.floor(k * count), count - 1);
+        if (index != lastIndex) {
+            final int x = (index % columns) * width  + offsetX;
+            final int y = (index / columns) * height + offsetY;
+            imageView.setViewport(new Rectangle2D(x, y, width, height));
+            lastIndex = index;
+        }
+    }
+}
diff --git a/src/ihm/controller/JouerSonTour1Controller.java b/src/ihm/controller/JouerSonTour1Controller.java
index bf8d497..f641fbd 100644
--- a/src/ihm/controller/JouerSonTour1Controller.java
+++ b/src/ihm/controller/JouerSonTour1Controller.java
@@ -19,8 +19,6 @@ public class JouerSonTour1Controller implements Initializable{
 	private Joueur joueur;
 	
 	@FXML private Pane rootPane;
-	@FXML private Label d6;
-	@FXML private Label d4;
 	@FXML private Label nomJoueur;
 	
 	@Override
@@ -30,13 +28,7 @@ public class JouerSonTour1Controller implements Initializable{
 	
 	@FXML 
 	public void lancerDes(MouseEvent mouseEvent) throws IOException, InterruptedException{
-		//lancer d6
-		int d6 = new Random().nextInt(6) + 1;
-		this.d6.setText(Integer.toString(d6));
 		
-		//lancer d4
-		int d4 = new Random().nextInt(4) + 1;
-		this.d6.setText(Integer.toString(d4));
 		
 		Thread.sleep(1000);
 		
diff --git a/src/ihm/ressources/Jouer_tour(1)lancer_des.fxml b/src/ihm/ressources/Jouer_tour(1)lancer_des.fxml
index 6415e41..dc83f10 100644
--- a/src/ihm/ressources/Jouer_tour(1)lancer_des.fxml
+++ b/src/ihm/ressources/Jouer_tour(1)lancer_des.fxml
@@ -20,14 +20,6 @@
          <font>
             <Font size="18.0" />
          </font></Button>
-      <Label fx:id="d6" layoutX="199.0" layoutY="190.0" styleClass="des" text="6">
-         <font>
-            <Font size="64.0" />
-         </font></Label>
-      <Label fx:id="d4" layoutX="433.0" layoutY="211.0" styleClass="des" text="4">
-         <font>
-            <Font size="64.0" />
-         </font></Label>
       <Label fx:id="nomJoueur" layoutX="405.0" layoutY="29.0" text="joueur 1">
          <font>
             <Font size="36.0" />
diff --git a/src/ihm/ressources/img/des.fxml b/src/ihm/ressources/img/des.fxml
new file mode 100644
index 0000000..c91e044
--- /dev/null
+++ b/src/ihm/ressources/img/des.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+
+
+<ImageView fitHeight="33.0" fitWidth="200.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+   <image>
+      <Image url="@dice.sprite.png" />
+   </image>
+</ImageView>
\ No newline at end of file