From 6b6cb0beda02a2f1734fb33cf1547f255514ca0c Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dupuis@etudiant.univ-rennes1.fr>
Date: Wed, 23 Jun 2021 17:57:44 +0200
Subject: [PATCH] delete in UIElement added

---
 src/engine/Engine.java            | 4 ++++
 src/engine/gui/UIDummy.java       | 3 +++
 src/engine/gui/UIElement.java     | 4 ++++
 src/engine/gui/UIElementText.java | 6 ++++++
 src/engine/gui/UIInputList.java   | 8 ++++++--
 src/gameplay/match/match.java     | 2 +-
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/engine/Engine.java b/src/engine/Engine.java
index f6bc7d6..a6e49c7 100644
--- a/src/engine/Engine.java
+++ b/src/engine/Engine.java
@@ -206,6 +206,10 @@ public class Engine {
         this.uiElements.add(uiElement);
     }
 
+    public void remove_uiElement(UIDummy uiElement) {
+        this.uiElements.remove(uiElement);
+    }
+
     public void setUIElementZoomFactor(float scaleFactor){
         for (UIDummy uiElement : this.uiElements){
             uiElement.updateScalingFactor(scaleFactor);
diff --git a/src/engine/gui/UIDummy.java b/src/engine/gui/UIDummy.java
index 8830a75..f6f20bc 100644
--- a/src/engine/gui/UIDummy.java
+++ b/src/engine/gui/UIDummy.java
@@ -18,6 +18,9 @@ public abstract class UIDummy {
     public void init(){
     }
 
+    public void delete(){
+    }
+
     protected void getObjInPosition(){
     }
 
diff --git a/src/engine/gui/UIElement.java b/src/engine/gui/UIElement.java
index b7643eb..b5dafcb 100644
--- a/src/engine/gui/UIElement.java
+++ b/src/engine/gui/UIElement.java
@@ -37,6 +37,10 @@ public class UIElement extends UIDummy{
         this.engine.add_objectGl(obj);
     }
 
+    public void delete(){
+        this.engine.remove_objectGl(obj);
+    }
+
     protected void getObjInPosition(){
         obj.resetTransform();
         obj.scale(new Vector3f(this.scalingFactor, this.scalingFactor, 1.0f));
diff --git a/src/engine/gui/UIElementText.java b/src/engine/gui/UIElementText.java
index cc89d03..a8a75b9 100644
--- a/src/engine/gui/UIElementText.java
+++ b/src/engine/gui/UIElementText.java
@@ -53,6 +53,12 @@ public class UIElementText extends UIDummy{
         }
     }
 
+    public void delete(){
+        for (ObjectGl obj : this.txt.getCharList()){ //Cast en ObjectGl
+            this.engine.remove_objectGl(obj);
+        }
+    }
+
     /**
      * Modifier le texte
      * @param txt le nouveau texte
diff --git a/src/engine/gui/UIInputList.java b/src/engine/gui/UIInputList.java
index ec6b1bc..a44dd93 100644
--- a/src/engine/gui/UIInputList.java
+++ b/src/engine/gui/UIInputList.java
@@ -5,10 +5,8 @@ import engine.loader.ControllerPromptTextureLoader;
 import engine.math.Vector3f;
 import engine.object.ObjectGl;
 import gameplay.input.InputBuffer;
-import gameplay.input.Inputs;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class UIInputList extends UIDummy{
@@ -39,6 +37,12 @@ public class UIInputList extends UIDummy{
         this.listIcon = new ArrayList<>();
     }
 
+    public void delete(){
+        for (ObjectGl obj : this.listIcon){ //Cast en ObjectGl
+            this.engine.remove_objectGl(obj);
+        }
+    }
+
     protected void getObjInPosition(){
         int index = 0;
         for (ObjectGl obj : listIcon){
diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java
index da0d8f8..ff0275a 100644
--- a/src/gameplay/match/match.java
+++ b/src/gameplay/match/match.java
@@ -83,7 +83,7 @@ public class match {
 	private static UIInputList inputListP1;
 
 	// Debug
-	public static boolean showP1Hitbox = false; // TODO modifier pour le rendre activable
+	public static boolean showP1Hitbox = false;
 	public static boolean showP2Hitbox = false;
 	private static List<Hitbox> listHitboxObj = new ArrayList<>();
 	private static float slowFactor = 1f;