diff --git a/src/engine/Engine.java b/src/engine/Engine.java index cb4c640..24c202b 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("aaaaa",20.0f, 10, engine); + Text TexTest = new Text("ABCDEFGHIJKLMNOPQRSTUVWXYZ",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 63b9660..fb8711f 100644 --- a/src/engine/object/Text.java +++ b/src/engine/object/Text.java @@ -36,11 +36,11 @@ public class Text { 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"); - switch (a){ - case ('a'): { - objectGl.setTextureWrap(0.0f,40.0f,10.0f,10.0f, ObjectGl.DEFAULT); - break; - } + if (a < 132 && a > 96){ + 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); } return objectGl; }