From 9cb1bcc12d3c9bda00de412a77a659dde950487b Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 3 Jun 2021 20:19:58 +0200 Subject: [PATCH] Added remove method in Text.java --- src/engine/Engine.java | 2 +- src/engine/object/Text.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/engine/Engine.java b/src/engine/Engine.java index 24c202b..b41ca64 100644 --- a/src/engine/Engine.java +++ b/src/engine/Engine.java @@ -230,7 +230,7 @@ public class Engine { background.translate(new Vector3f(-3011.0f, 1400.0f, 1.0f)); engine.add_objectGl(background); - Text TexTest = new Text("ABCDEFGHIJKLMNOPQRSTUVWXYZ",20.0f, 10, engine); + Text texTest = new Text("ABCDEFGHIJKLMNOPQRSTUVWYZ",20.0f, 10, engine); long timer = System.currentTimeMillis(); long lastFrame; diff --git a/src/engine/object/Text.java b/src/engine/object/Text.java index fb8711f..3f4af03 100644 --- a/src/engine/object/Text.java +++ b/src/engine/object/Text.java @@ -33,6 +33,12 @@ public class Text { } } + public void remove(){ + for (ObjectGl obj : this.charList){ + this.engine.remove_objectGl(obj); + } + } + private ObjectGl charToObjectGl(char a){ ObjectGl objectGl = new ObjectGl(this.zPos, 1.0f, 1.0f, this.size, "textures/dejavu10x10_gs_tc.png", null); objectGl.setShader("shaders/StylishShaders/BasicVert.glsl","shaders/StylishShaders/TextFrag.glsl"); @@ -40,7 +46,7 @@ public class Text { objectGl.setTextureWrap(0.0f + (a - 97) * 10.0f,40.0f,10.0f,10.0f, ObjectGl.DEFAULT); } else if (a < 91 && a > 64){ - objectGl.setTextureWrap(0.0f + (a - 97) * 10.0f,30.0f,10.0f,10.0f, ObjectGl.DEFAULT); + objectGl.setTextureWrap(0.0f + (a - 65) * 10.0f,30.0f,10.0f,10.0f, ObjectGl.DEFAULT); } return objectGl; }