Fix memleak

main.cpp

@@ -82,7 +82,7 @@ public:
         JGL::J2D::FillTriangle2D(JGL::Colors::Yellow, tri);
 
 
-        JGL::J3D::DrawString3D(JGL::Colors::White, "JGL Sample Text", {1, -120, 0.5f}, 2.f);
+        JGL::J3D::DrawString3D(JGL::Colors::Red, "JGL Sample Text", {1, -120, 0.5f}, 2.f);
         JGL::J2D::DrawString2D(JGL::Colors::Green, "William J. Tomasine II ", 0.f, -120.f, 1.f);
 
         JGL::J2D::DrawLine2D(JGL::Colors::Greens::DarkGreen, {10, 10}, {200, 300});

src/JGL/JGL.cpp

@@ -11,7 +11,6 @@
 
 
 GLuint program;
-GLuint texture;
 
 namespace JGL
 {
@@ -152,17 +151,17 @@ namespace JGL
 
             FT_Set_Pixel_Sizes(face, 0, size);
 
-            const char* c;
-            for (c = text.c_str(); *c; c++)
+            GLuint textures[text.size()];
+            for (int i = 0; i < text.length(); i++)
             {
-                if (FT_Load_Char(face, *c, FT_LOAD_RENDER))
+                if (FT_Load_Char(face, text.c_str()[i], FT_LOAD_RENDER))
                     continue;
 
                 FT_GlyphSlot g = face->glyph;
 
                 glActiveTexture(GL_TEXTURE0);
-                glGenTextures(1, &texture);
-                glBindTexture(GL_TEXTURE_2D, texture);
+                glGenTextures(1, &textures[i]);
+                glBindTexture(GL_TEXTURE_2D, textures[i]);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -200,8 +199,9 @@ namespace JGL
 
                 x += (g->advance.x >> 6) * scale;
                 y += (g->advance.y >> 6) * scale;
-
             }
+            for (auto& t : textures)
+                glDeleteTextures(1, &t);
             glBindTexture(GL_TEXTURE_2D, 0); // Unbind texture
         }
     }
@@ -211,7 +211,6 @@ namespace JGL
     {
         void DrawLine3D(const Color3& color, const Vector3& A, const Vector3& B, float thickness)
         {
-
             glBegin(GL_LINES);
             glLineWidth(thickness);
             glColor3f(color.r/255.f, color.g/255.f, color.b/255.f);
@@ -225,22 +224,25 @@ namespace JGL
             float x = pos.x;
             float y = pos.y;
             float z = pos.z;
+            GLfloat currentColor[4];
+            GLuint textures[text.size()];
+            glGetFloatv(GL_CURRENT_COLOR, currentColor);
             glUseProgram(0); // Fixed-function pipeline.
-            glColor3f(1.0f, 1.0f, 1.0f);
+            glColor4f(color.r, color.g, color.b, 1.0f);
 
             FT_Set_Pixel_Sizes(face, 0, size);
 
-            const char* c;
-            for (c = text.c_str(); *c; c++)
+            //for (c = text.c_str(); *c; c++)
+            for (int i = 0; i < text.length(); i++)
             {
-                if (FT_Load_Char(face, *c, FT_LOAD_RENDER))
+                if (FT_Load_Char(face, text.c_str()[i], FT_LOAD_RENDER))
                     continue;
 
                 FT_GlyphSlot g = face->glyph;
 
                 glActiveTexture(GL_TEXTURE0);
-                glGenTextures(1, &texture);
-                glBindTexture(GL_TEXTURE_2D, texture);
+                glGenTextures(1, &textures[i]);
+                glBindTexture(GL_TEXTURE_2D, textures[i]);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -281,7 +283,12 @@ namespace JGL
                 y += (g->advance.y >> 6) * scale;
 
             }
+
+            for (auto& t : textures)
+                glDeleteTextures(1, &t);
+
             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.
         }
 
     }