text

src/JGL/TextRendering.cpp

@@ -162,7 +162,11 @@ namespace JGL {
         glColor4f(currentColor[0], currentColor[1], currentColor[2], currentColor[3]); //Set draw color back to whatever it was before.
     }
 
-    void J3D::DrawString(const Color3& color, const std::string& text, const Vector3& pos, float scale, u32 size, unsigned int font_index) {
+    void J3D::DrawString(const Color3& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, unsigned int font_index)
+    {
+        scale = scale * 0.002f;
+        scale = -scale;
+
         float x = pos.x;
         float y = pos.y;
         float z = pos.z;
@@ -183,7 +187,17 @@ namespace JGL {
 
         FT_Set_Pixel_Sizes(font.face, 0, size);
 
-        for (int i = 0; i < text.length(); i++) {
+        glPushMatrix();
+        glTranslatef(x, y, z);
+        glRotatef(angle.x, 1.0f, 0.0f, 0.0f);
+        glRotatef(angle.y, 0.0f, 1.0f, 0.0f);
+        glRotatef(angle.z, 0.0f, 0.0f, 1.0f);
+        x = 0;
+        y = 0;
+        z = 0;
+
+        for (int i = 0; i < text.length(); i++)
+        {
             if (FT_Load_Char(font.face, text.c_str()[i], FT_LOAD_RENDER))
                 continue;
 
@@ -203,7 +217,7 @@ namespace JGL {
             glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, g->bitmap.width, g->bitmap.rows, 0, GL_ALPHA, GL_UNSIGNED_BYTE, g->bitmap.buffer);
 
             float x2 = x + g->bitmap_left * scale;
-            float y2 = y + g->bitmap_top * scale; // Adjust y-coordinate to invert the text
+            float y2 = y - g->bitmap_top * scale; // Adjust y-coordinate
             float z2 = z;
             float w = g->bitmap.width * scale;
             float h = g->bitmap.rows * scale;
@@ -214,16 +228,16 @@ namespace JGL {
             glVertex3f(x2, y2, z2);
 
             glTexCoord2f(0, 1);
-            glVertex3f(x2, y2 - h, z2);
+            glVertex3f(x2, y2 + h, z2);
 
             glTexCoord2f(1, 1);
-            glVertex3f(x2 + w, y2 - h, z2);
+            glVertex3f(x2 + w, y2 + h, z2);
 
             glTexCoord2f(0, 0);
             glVertex3f(x2, y2, z2);
 
             glTexCoord2f(1, 1);
-            glVertex3f(x2 + w, y2 - h, z2);
+            glVertex3f(x2 + w, y2 + h, z2);
 
             glTexCoord2f(1, 0);
             glVertex3f(x2 + w, y2, z2);
@@ -240,6 +254,8 @@ namespace JGL {
         glDisable(GL_TEXTURE_2D);
         glDisable(GL_BLEND);
         glBindTexture(GL_TEXTURE_2D, 0); // Unbind texture
-        glColor4f(currentColor[0], currentColor[1], currentColor[2], currentColor[3]); // Set draw color back to whatever it was before.
+        glColor4f(currentColor[0], currentColor[1], currentColor[2], currentColor[3]); //Set draw color back to whatever it was before.
+        
+        glPopMatrix();
     }
 }