merge the system of text with the new unified system

Author: MightyCode

resources/shaders/3_30/font/coloredTextF.glsl

@@ -10,4 +10,6 @@ uniform sampler2D ourTexture;
 void main()
 {
     FragColor = texture(ourTexture, texCoords) * color;
+
+    //FragColor = vec4(0, 0, 0, 1);
 }

resources/shaders/3_30/font/coloredTextV.glsl

@@ -1,11 +1,15 @@
 #version 330
 out vec2 texCoords;
 
-layout(location = 0) in vec3 aPos;
+layout(location = 0) in vec2 aPos;
 layout(location = 1) in vec2 inTexCoords;
 
+uniform mat4 projection;
+uniform mat4 view;
+uniform mat4 model;
+
 void main()
 {
-    gl_Position = vec4(aPos, 1.0f);
+    gl_Position = projection * view * model * vec4(aPos, 0.0f, 1.0f);
     texCoords = inTexCoords;
 }

resources/shaders/3_30/shaders.json

@@ -95,8 +95,13 @@
 				"font/coloredTextV.glsl",
 				"font/coloredTextF.glsl"
 			],
-			"mode" : ["none"],
-			"links": ["color"]
+			"mode" : ["cam2DView"],
+			"links": [
+				"color",
+				"projection",
+				"view",
+				"model"
+			]
 		}
 	}
 }

src/MightyLibrary/mightylib/graphics/GUI/BackgroundlessButton.java

@@ -17,14 +17,14 @@ public BackgroundlessButton(Context context, Text text){
         this.context = context;
 
         if(text == null)
-            this.Text = new Text(context.getWindow().getInfo());
+            this.Text = new Text();
         else
             this.Text = text;
 
         if (text != null) {
             this.OverlapsText = text.createCopy();
         } else {
-            this.OverlapsText = new Text(context.getWindow().getInfo());
+            this.OverlapsText = new Text();
         }
     }
 

src/MightyLibrary/mightylib/graphics/text/Text.java

@@ -7,31 +7,29 @@
 import MightyLibrary.mightylib.util.math.Color4f;
 import MightyLibrary.mightylib.util.math.EDirection;
 import org.joml.Vector2f;
+import org.joml.Vector3f;
 import org.joml.Vector4f;
 
 public class Text extends Renderer {
     private static final int NUMBER_INDICES = 4;
     private static final int SIZE_INDICES = 6;
     private static final int SIZE_COORDINATES = 8;
 
-    private final WindowInfo windowInfo;
     private float fontSize;
     private final int positionIndex;
     private final int textureIndex;
 
     private FontFace font;
     private String text;
 
-    private final Vector2f referencePosition;
     private final Vector2f rightLeftPosition;
     private final Vector2f rectangleSize;
 
     private EDirection reference;
     private ETextAlignment alignment;
 
-    public Text(WindowInfo windowInfo) {
+    public Text() {
         super("coloredText", true, true);
-        this.windowInfo = windowInfo;
 
         fontSize = 10.0f;
 
@@ -44,7 +42,6 @@ public Text(WindowInfo windowInfo) {
         this.reference = EDirection.None;
         this.alignment = ETextAlignment.Left;
 
-        this.referencePosition = new Vector2f(0, 0);
         this.rectangleSize = new Vector2f(0, 0);
         this.rightLeftPosition = new Vector2f(0, 0);
 
@@ -63,9 +60,8 @@ public void display(){
         if (shouldNotDrawText())
             return;
 
-        font.getTexture().bind();
         shadManager.getShader(shape.getShaderId()).glUniform("color", color.getR(), color.getG(), color.getB(), color.getA());
-        super.draw();
+        super.display();
     }
 
 
@@ -110,18 +106,11 @@ public Text setPosition(Vector2f position){
         if (position == null)
             return this;
 
-        this.referencePosition.x = position.x;
-        this.referencePosition.y = position.y;
-        this.computeRightUpPosition();
+        super.setPosition(new Vector3f(position.x, position.y, 0.0f));
 
         return this;
     }
 
-
-    public Vector2f referencePosition() {
-        return this.referencePosition;
-    }
-
     public Vector2f rightLeftPosition() { return this.rightLeftPosition; }
 
     public Vector2f size() { return this.rectangleSize; }
@@ -163,8 +152,8 @@ private void computeRightUpPosition(){
         if (shouldNotDrawText())
             return;
 
-        rightLeftPosition.x = referencePosition.x;
-        rightLeftPosition.y = referencePosition.y;
+        rightLeftPosition.x = position.x;
+        rightLeftPosition.y = position.y;
 
         rectangleSize.x = 0;
         rectangleSize.y = 0;
@@ -256,18 +245,17 @@ private void computeRightUpPosition(){
 
                 fontChar = font.getFontFile().getCharacter(c);
 
-                sizeTemp.x = fontChar.getWidth() * fontSize / windowInfo.getVirtualSizeRef().x * 2.0f - 1.0f;
-                sizeTemp.y = fontChar.getHeight() * fontSize / windowInfo.getVirtualSizeRef().y * 2.0f - 1.0f;
+                sizeTemp.x = fontChar.getWidth() * fontSize;
+                sizeTemp.y = fontChar.getHeight() * fontSize;
 
-                posTemp.x = (currentCharOffset.x + fontChar.getxOffset() + referencePosition.x - textReference.x + lineAlignmentOffset)
-                        * 2.0f / windowInfo.getVirtualSizeRef().x;
-                posTemp.y = (currentCharOffset.y + fontChar.getyOffset() + referencePosition.y - textReference.y)
-                            * 2.0f / windowInfo.getVirtualSizeRef().y;
+                posTemp.x = (currentCharOffset.x + fontChar.getxOffset() * fontSize - textReference.x + lineAlignmentOffset);
+                posTemp.y = (currentCharOffset.y + fontChar.getyOffset() * fontSize - textReference.y);
 
-                temp.x = -1.0f + posTemp.x;
+                temp.x = posTemp.x;
                 temp.y = sizeTemp.x + posTemp.x;
-                temp.z = 1.0f - posTemp.y;
-                temp.w = -sizeTemp.y - posTemp.y;
+                temp.z = posTemp.y;
+                temp.w = sizeTemp.y + posTemp.y;
+
 
                 position[charCount * SIZE_COORDINATES] = temp.x;
                 position[charCount * SIZE_COORDINATES + 1] = temp.z;
@@ -314,11 +302,11 @@ private void computeRightUpPosition(){
     }
 
     public Text createCopy(){
-        Text text = new Text(windowInfo);
+        Text text = new Text();
         text.setFont(this.font.getName())
                 .setColor(color.copy())
                 .setFontSize(fontSize)
-                .setPosition(new Vector2f(this.referencePosition.x, this.referencePosition.y))
+                .setPosition(new Vector2f(this.position.x, this.position.y))
                 .setReference(this.reference)
                 .setText(this.text);
 
@@ -330,7 +318,7 @@ public Text copyTo(Text copy){
                 .setFont(this.font.getName())
                 .setColor(color.copy())
                 .setFontSize(fontSize)
-                .setPosition(new Vector2f(this.referencePosition.x, this.referencePosition.y))
+                .setPosition(new Vector2f(this.position.x, this.position.y))
                 .setReference(this.reference)
                 .setText(this.text);
 

src/MightyLibrary/project/scenes/MenuScene.java

@@ -33,6 +33,7 @@ public void init(String[] args) {
                 .setFontSize(40)
                 .setText("Test2DScene");
 
+
         button2DScene.Text.copyTo(button2DScene.OverlapsText);
         button2DScene.OverlapsText.setColor(new Color4f(0.3f))
                 .setText("->Test2DScene<-");
@@ -95,8 +96,6 @@ public void update() {
                 }
             }
         }
-
-        main3DCamera.updateView();
     }
 
 

src/MightyLibrary/project/scenes/Test2DScene.java

@@ -53,7 +53,7 @@ public void init(String[] args) {
                 .setTweeningOption(ETweeningOption.LoopReversed).setAdditionnalArguments(3f,  null);
 
 
-        text = new Text(mainContext.getWindow().getInfo());
+        text = new Text();
 
         Vector2i size = mainContext.getWindow().getInfo().getSizeRef();