From 6ac2db30ea9e28915deb78436edf729d6fc7b43c Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dupuis@etudiant.univ-rennes1.fr>
Date: Fri, 11 Jun 2021 16:03:51 +0200
Subject: [PATCH] =?UTF-8?q?Affiche=20le=20controleur=20utilis=C3=A9=20par?=
 =?UTF-8?q?=20chaque=20joueur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/engine/input/GamepadInput.java | 4 ++++
 src/gameplay/match/match.java      | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/engine/input/GamepadInput.java b/src/engine/input/GamepadInput.java
index 27e1a90..cf0fb88 100644
--- a/src/engine/input/GamepadInput.java
+++ b/src/engine/input/GamepadInput.java
@@ -106,5 +106,9 @@ public class GamepadInput {
 
         return new Vector3f(x,y);
     }
+
+    public String getGamepadName(){
+        return  glfwGetJoystickName(this.gamepadNum);
+    }
 	
 }
diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java
index 0733c3e..418f14f 100644
--- a/src/gameplay/match/match.java
+++ b/src/gameplay/match/match.java
@@ -100,7 +100,6 @@ public class match {
 
 		boolean Joystick1Present = glfwJoystickPresent(GLFW_JOYSTICK_1);
 		boolean Joystick2Present = glfwJoystickPresent(GLFW_JOYSTICK_2);
-		System.out.println(Joystick1Present);
 
 		String path = "textures/Sprite.png";
 		String pathToBG = "textures/background_beach.png";
@@ -125,13 +124,15 @@ public class match {
 		objP2.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.STICK_TOP);
 		objP2.flipTextureWrapH();
 
-		if (Joystick1Present) {
+		if(Joystick1Present) {
 			gamepad1 = new GamepadInput(GLFW_JOYSTICK_1);
 			gamepad1.inputRefresh();
+			System.out.println("P1 Controller: " + gamepad1.getGamepadName());
 		}
 		if(Joystick2Present) {
 			gamepad2 = new GamepadInput(GLFW_JOYSTICK_2);
 			gamepad2.inputRefresh();
+			System.out.println("P2 Controller: " + gamepad2.getGamepadName());
 		}
 
 		while(frameCount < 5940 && engine.getRunning()) {