From 33a02891fccaffef672009756b35ee68bae058d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 27 May 2021 02:19:42 +0200
Subject: [PATCH 1/4] =?UTF-8?q?Ajout=20des=20d=C3=A9pendances=20=C3=A0=20J?=
 =?UTF-8?q?avaFX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 438626a..7f927f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,11 @@
 		<artifactId>lwjgl-stb</artifactId>
 		<classifier>${lwjgl.natives}</classifier>
 	</dependency>
+	<dependency>
+		<groupId>org.openjfx</groupId>
+		<artifactId>javafx-controls</artifactId>
+		<version>11</version>
+	</dependency>
 </dependencies>
   
 	<url>https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat</url>

From 75865640aa942b5ec07b46673b4f15477aa60d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 27 May 2021 03:02:36 +0200
Subject: [PATCH 2/4] =?UTF-8?q?Progr=C3=A8s=20ajout=20Launcher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajout de JavaFX.fxml aux dépendances, aménagement de l'architecture du
launcher pour (launcher étend maintenant Application, Main lance
correctement le Launcher)
---
 pom.xml                    |  8 +++++++-
 src/Main.java              | 14 ++------------
 src/launcher/Launcher.java | 17 +++++++++++++----
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f927f5..0d19601 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
   <properties>
 	<lwjgl.version>3.2.3</lwjgl.version>
 	<lwjgl.natives>natives-windows</lwjgl.natives>
+	<javafx.version>16</javafx.version>
 </properties>
 
 <dependencyManagement>
@@ -93,7 +94,12 @@
 	<dependency>
 		<groupId>org.openjfx</groupId>
 		<artifactId>javafx-controls</artifactId>
-		<version>11</version>
+		<version>${javafx.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.openjfx</groupId>
+		<artifactId>javafx-fxml</artifactId>
+		<version>${javafx.version}</version>
 	</dependency>
 </dependencies>
   
diff --git a/src/Main.java b/src/Main.java
index d4c19c8..7c9120e 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -9,25 +9,15 @@
 
 import launcher.Launcher;
 import engine.Engine;
+import javafx.application.Application;
 
 public class Main {
 	
-	// Interface de configuration et lancement
-	static Launcher launcher = new Launcher();
-	
 	// Moteur de jeu
 	static Engine game = new Engine();
 
 	public static void main(String[] args) {
-		
-		
-		// Lancement de l'interface de configuration du Jeu
-		try {
-			launcher.launch();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
+		Application.launch(Launcher.class, args);
 	}
 
 }
diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java
index 9e34398..bf346f9 100644
--- a/src/launcher/Launcher.java
+++ b/src/launcher/Launcher.java
@@ -9,11 +9,20 @@
 
 package launcher;
 
-public class Launcher {
+import javafx.application.Application;
+import javafx.scene.Group;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.shape.Circle;
+import javafx.stage.Stage;
+import javafx.fxml.*;
 
-	public void launch() throws Exception {
-		
-		System.out.println("Hello world!");
+public class Launcher extends Application {
+	
+	Parent root = FXMLLoader.load("ui/main.fxml");
+	Scene main = new Scene()
+
+	public void start(Stage primaryStage) throws Exception {
 		
 	}
 	

From 9ced943c0a2333fea4c922094accc58e71702973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 27 May 2021 03:04:08 +0200
Subject: [PATCH 3/4] Ajout du fxml du launcher (initial)

---
 ui/launcher.fxml | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 ui/launcher.fxml

diff --git a/ui/launcher.fxml b/ui/launcher.fxml
new file mode 100644
index 0000000..f4b5d83
--- /dev/null
+++ b/ui/launcher.fxml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright (c) 2015, 2019, Gluon and/or its affiliates.
+  All rights reserved. Use is subject to license terms.
+
+  This file is available and licensed under the following license:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the distribution.
+  - Neither the name of Oracle Corporation nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<?import javafx.geometry.Rectangle2D?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: #151619;" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <VBox prefHeight="400.0" prefWidth="157.0">
+         <children>
+            <ImageView accessibleText="Logo" fitHeight="240.0" fitWidth="158.0" pickOnBounds="true" preserveRatio="true">
+               <image>
+                  <Image url="@../../../../../Pictures/Avatars/modern.png" />
+               </image>
+            </ImageView>
+            <VBox alignment="BOTTOM_CENTER" prefHeight="263.0" prefWidth="158.0">
+               <children>
+                  <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
+                     <children>
+                        <Button mnemonicParsing="false" text="Run" />
+                     </children>
+                  </VBox>
+                  <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="176.0" text="Settings" />
+                  <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="161.0" style="-fx-background-color: #e80000;" text="X Quit" textFill="WHITE" />
+               </children>
+            </VBox>
+         </children>
+      </VBox>
+      <VBox prefHeight="400.0" prefWidth="455.0">
+         <children>
+            <HBox alignment="CENTER" prefHeight="266.0" prefWidth="475.0">
+               <children>
+                  <VBox alignment="BOTTOM_CENTER" prefHeight="249.0" prefWidth="233.0">
+                     <children>
+                        <ImageView fitHeight="172.0" fitWidth="211.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@assets/ryu.png" />
+                           </image>
+                           <viewport>
+                              <Rectangle2D />
+                           </viewport>
+                        </ImageView>
+                     </children>
+                  </VBox>
+                  <VBox alignment="BOTTOM_CENTER" prefHeight="249.0" prefWidth="233.0">
+                     <children>
+                        <ImageView fitHeight="200.0" fitWidth="233.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@assets/gratis-png-luchador-callejero-iii-tercer-ataque-ken-masters-ryu-luchador-callejero-ii-el-guerrero-del-mundo.png" />
+                           </image>
+                        </ImageView>
+                     </children>
+                  </VBox>
+               </children>
+            </HBox>
+            <HBox prefHeight="168.0" prefWidth="432.0" />
+         </children></VBox>
+   </children>
+</HBox>

From bf2960f58e37858e2291499250a55a9bf024951b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 27 May 2021 03:14:20 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Lancement=20de=20la=20fen=C3=AAtre=20du=20l?=
 =?UTF-8?q?aunceur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problématique avec le fxml. Mauvaise version il semblerait ? Fichier à
refaire.
---
 pom.xml                    |  2 +-
 src/launcher/Launcher.java | 15 ++++++++++-----
 ui/launcher.fxml           |  3 ---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0d19601..ae435b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <properties>
 	<lwjgl.version>3.2.3</lwjgl.version>
 	<lwjgl.natives>natives-windows</lwjgl.natives>
-	<javafx.version>16</javafx.version>
+	<javafx.version>11</javafx.version>
 </properties>
 
 <dependencyManagement>
diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java
index bf346f9..5710657 100644
--- a/src/launcher/Launcher.java
+++ b/src/launcher/Launcher.java
@@ -9,21 +9,26 @@
 
 package launcher;
 
+import java.io.FileInputStream;
+
 import javafx.application.Application;
-import javafx.scene.Group;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.shape.Circle;
 import javafx.stage.Stage;
 import javafx.fxml.*;
 
 public class Launcher extends Application {
-	
-	Parent root = FXMLLoader.load("ui/main.fxml");
-	Scene main = new Scene()
 
 	public void start(Stage primaryStage) throws Exception {
+		FileInputStream r_launcher = new FileInputStream("ui/launcher.fxml");
+		FXMLLoader floader = new FXMLLoader();
+		Parent root = floader.load(r_launcher);
+		Scene main = root.getScene();
 		
+		primaryStage.setTitle("Boulevard Combattant");
+		
+		primaryStage.setScene(main);
+		primaryStage.show();
 	}
 	
 }
diff --git a/ui/launcher.fxml b/ui/launcher.fxml
index f4b5d83..a843edc 100644
--- a/ui/launcher.fxml
+++ b/ui/launcher.fxml
@@ -45,7 +45,6 @@
          <children>
             <ImageView accessibleText="Logo" fitHeight="240.0" fitWidth="158.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@../../../../../Pictures/Avatars/modern.png" />
                </image>
             </ImageView>
             <VBox alignment="BOTTOM_CENTER" prefHeight="263.0" prefWidth="158.0">
@@ -69,7 +68,6 @@
                      <children>
                         <ImageView fitHeight="172.0" fitWidth="211.0" pickOnBounds="true" preserveRatio="true">
                            <image>
-                              <Image url="@assets/ryu.png" />
                            </image>
                            <viewport>
                               <Rectangle2D />
@@ -81,7 +79,6 @@
                      <children>
                         <ImageView fitHeight="200.0" fitWidth="233.0" pickOnBounds="true" preserveRatio="true">
                            <image>
-                              <Image url="@assets/gratis-png-luchador-callejero-iii-tercer-ataque-ken-masters-ryu-luchador-callejero-ii-el-guerrero-del-mundo.png" />
                            </image>
                         </ImageView>
                      </children>