From e6e567725b09f8df777091a4f0e96d1526e2b15d Mon Sep 17 00:00:00 2001 From: Redacted Date: Thu, 23 May 2024 12:05:00 -0400 Subject: [PATCH] Color --- main.cpp | 2 +- src/JGL/JGL.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 1f4ae5c..2f65916 100644 --- a/main.cpp +++ b/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}); diff --git a/src/JGL/JGL.cpp b/src/JGL/JGL.cpp index 04c6083..56c2fd1 100644 --- a/src/JGL/JGL.cpp +++ b/src/JGL/JGL.cpp @@ -225,8 +225,10 @@ namespace JGL float x = pos.x; float y = pos.y; float z = pos.z; + GLfloat currentColor[4]; + 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); @@ -282,6 +284,7 @@ namespace JGL } 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. } }