From 172cdae2597f6e8e1a9e015f99f47ccf69cfa5b3 Mon Sep 17 00:00:00 2001
From: Ismail TAHA JANAN <istahajana@iutclinfa1018l.iut.local>
Date: Wed, 21 Sep 2022 15:21:28 +0200
Subject: [PATCH] second commit

---
 .idea/vcs.xml                                 |  6 ++++
 .../Project1/FXML/FormAddPlayer.fxml          | 36 ++++++++++++-------
 rsrc/FXML/FormAddPlayer.fxml                  | 36 ++++++++++++-------
 src/Launcher.java                             | 13 +++++++
 src/model/De.java                             | 12 +++++++
 src/model/Game.java                           | 11 ++++++
 src/model/Player.java                         |  6 ++++
 src/model/Result.java                         |  6 ++++
 src/view/FormAddPlayer.java                   | 17 +++++++++
 9 files changed, 117 insertions(+), 26 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 src/model/De.java
 create mode 100644 src/model/Game.java
 create mode 100644 src/model/Player.java
 create mode 100644 src/model/Result.java
 create mode 100644 src/view/FormAddPlayer.java

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/out/production/Project1/FXML/FormAddPlayer.fxml b/out/production/Project1/FXML/FormAddPlayer.fxml
index dbaa6fe..2de543c 100644
--- a/out/production/Project1/FXML/FormAddPlayer.fxml
+++ b/out/production/Project1/FXML/FormAddPlayer.fxml
@@ -3,23 +3,33 @@
 <?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.GridPane?>
 
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  >
-    <VBox style="-fx-padding: 10;">
-    <HBox>
-        <VBox style="-fx-padding: 10;">
 
-            <TextField promptText="hello"/>
-        </VBox>
-        <VBox style="-fx-padding: 10;">
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.shape.Rectangle?>
+<?import javafx.scene.shape.Circle?>
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  alignment="center" hgap="10" vgap="10" >
+    <padding><Insets top="25" right="25" bottom="10" left="25"/></padding>
+
+
+                        <Label text="player 1" GridPane.rowIndex="0" GridPane.columnIndex="0" />
+                        <TextField GridPane.rowIndex="1" GridPane.columnIndex="0" />
+
+
+                        <Label text="player 2" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                        <TextField GridPane.rowIndex="1" GridPane.columnIndex="1" />
+
+
+
+                <Button fx:id="boutonJ1" mnemonicParsing="false" text="Start"
+                        GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.halignment="CENTER">
+                    <BorderPane.margin>
+                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+                    </BorderPane.margin>
+                </Button>
+
 
-            <TextField promptText="hello"/>
 
-        </VBox>
 
-    </HBox>
-        <Button text="Click me!" style="-fx-margin: 10;width:100%;" />
-    </VBox>
 
 </GridPane>
\ No newline at end of file
diff --git a/rsrc/FXML/FormAddPlayer.fxml b/rsrc/FXML/FormAddPlayer.fxml
index dbaa6fe..2de543c 100644
--- a/rsrc/FXML/FormAddPlayer.fxml
+++ b/rsrc/FXML/FormAddPlayer.fxml
@@ -3,23 +3,33 @@
 <?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.GridPane?>
 
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  >
-    <VBox style="-fx-padding: 10;">
-    <HBox>
-        <VBox style="-fx-padding: 10;">
 
-            <TextField promptText="hello"/>
-        </VBox>
-        <VBox style="-fx-padding: 10;">
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.shape.Rectangle?>
+<?import javafx.scene.shape.Circle?>
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  alignment="center" hgap="10" vgap="10" >
+    <padding><Insets top="25" right="25" bottom="10" left="25"/></padding>
+
+
+                        <Label text="player 1" GridPane.rowIndex="0" GridPane.columnIndex="0" />
+                        <TextField GridPane.rowIndex="1" GridPane.columnIndex="0" />
+
+
+                        <Label text="player 2" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                        <TextField GridPane.rowIndex="1" GridPane.columnIndex="1" />
+
+
+
+                <Button fx:id="boutonJ1" mnemonicParsing="false" text="Start"
+                        GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.halignment="CENTER">
+                    <BorderPane.margin>
+                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+                    </BorderPane.margin>
+                </Button>
+
 
-            <TextField promptText="hello"/>
 
-        </VBox>
 
-    </HBox>
-        <Button text="Click me!" style="-fx-margin: 10;width:100%;" />
-    </VBox>
 
 </GridPane>
\ No newline at end of file
diff --git a/src/Launcher.java b/src/Launcher.java
index 605cf19..03c3d2a 100644
--- a/src/Launcher.java
+++ b/src/Launcher.java
@@ -5,10 +5,18 @@ import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.scene.layout.StackPane;
 import javafx.scene.control.Button;
+import model.Game;
+import model.Player;
+import model.Result;
 
 
 public class Launcher extends Application {
 
+    public Player player1;
+    public Player player2;
+    public Game theGame;
+    public Result res;
+
     @Override
     public void start(Stage stage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("/FXML/FormAddPlayer.fxml"));
@@ -18,4 +26,9 @@ public class Launcher extends Application {
         stage.setScene(scene);
         stage.show();
     }
+
+    public void setPlayers(Player p1, Player p2){
+        player1 = p1;
+        player2 = p2;
+    }
 }
diff --git a/src/model/De.java b/src/model/De.java
new file mode 100644
index 0000000..3bbbf19
--- /dev/null
+++ b/src/model/De.java
@@ -0,0 +1,12 @@
+package model;
+
+import java.util.Random;
+
+public class De {
+    final int NumFaces = 6;
+
+    public int getRandomFace(){
+        Random rn = new Random();
+        return rn.nextInt(10-1+1)+1;
+    }
+}
diff --git a/src/model/Game.java b/src/model/Game.java
new file mode 100644
index 0000000..faa342e
--- /dev/null
+++ b/src/model/Game.java
@@ -0,0 +1,11 @@
+package model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Game {
+    public Player player1;
+    public  Player player2;
+    public De de;
+    List<Result> results = new ArrayList<Result>();
+}
diff --git a/src/model/Player.java b/src/model/Player.java
new file mode 100644
index 0000000..021dc1c
--- /dev/null
+++ b/src/model/Player.java
@@ -0,0 +1,6 @@
+package model;
+
+public class Player {
+    public String Nom;
+
+}
diff --git a/src/model/Result.java b/src/model/Result.java
new file mode 100644
index 0000000..17094fd
--- /dev/null
+++ b/src/model/Result.java
@@ -0,0 +1,6 @@
+package model;
+
+public class Result {
+    public int resPlayer1;
+    public int resPlayer2;
+}
diff --git a/src/view/FormAddPlayer.java b/src/view/FormAddPlayer.java
new file mode 100644
index 0000000..31945f6
--- /dev/null
+++ b/src/view/FormAddPlayer.java
@@ -0,0 +1,17 @@
+package view;
+
+import javafx.fxml.FXML;
+import model.Player;
+
+import java.awt.*;
+
+public class FormAddPlayer {
+
+    public TextField player1;
+    public TextField player2;
+
+    @FXML
+    public void clickStartGame(){
+        
+    }
+}