Make measure string go brrrrrrr

Fix glBlend always being enabled because I'm an idiot

.gitea/workflows/buildtest.yml

@@ -17,8 +17,6 @@ jobs:
       - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
       - run: echo "The workflow is now ready to run your tests on the runner."
       - run: echo "Install toolchain and run ReCI build test"
-      - run: apt-get update && apt-get install -y git && git clone $RECI_GIT $RECI
-      - run: bash $RECI/scripts/setup_build_tools.sh
-      - run: bash reci/scripts/install_build_dependencies.sh
-      - run: bash $RECI/scripts/run_buildtest.sh ${{ gitea.repository }}
+      - run: apt-get update && apt-get install -y lua5.3 git && git clone $RECI_GIT $RECI
+      - run: lua $RECI/reci.lua -f $RECI/scripts/buildtools.reci -f reci/scripts/builddeps.reci -f $RECI/scripts/buildtest.reci
       - run: echo "This job's status is ${{ job.status }}."

CMakeLists.txt

@@ -38,6 +38,12 @@ CPMAddPackage(
         NAME Event
         URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
 )
+
+CPMAddPackage(
+        NAME ReTexture
+        URL https://git.redacted.cc/Redacted/ReTexture/archive/Release-1.zip
+)
+
 if (WIN32)
     #CPMAddPackage(
             #NAME harfbuzz
@@ -68,6 +74,9 @@ endif()
 
 set_target_properties(JGL PROPERTIES LINKER_LANGUAGE CXX)
 
+#Don't expose this one because it's only to be used in the demo program.
+include_directories(${ReTexture_SOURCE_DIR}/include)
+
 target_include_directories(JGL PUBLIC
         ${PROJECT_SOURCE_DIR}/include
         ${OPENGL_INCLUDE_DIRS}
@@ -93,4 +102,4 @@ if (WIN32)
     target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} J3ML ReWindowLibrary glad jlog Event)
 endif()
 
-target_link_libraries(JGL_Demo PUBLIC JGL)
+target_link_libraries(JGL_Demo PUBLIC JGL ReTexture)

README.md

@@ -4,23 +4,39 @@ Yet Another C++ Rendering Toolkit
 
 ![Static Badge](https://img.shields.io/badge/Lit-Based-%20)
 
-## Goals
-* Provide single-function-calls to render various graphics primitives in 2D and 3D.
-* Integrated directly with our other toolkits (ReWindow, J3ML)
-* Quick Rendering of Debug Text, Geometric Widgets, Textures, and so forth.
-
-## Non-Goals
-* Full Rendering Engine
-* OpenGL/Vulkan Wrapper
-* Asset Loading & Management
 
 ## Features
 
 * Modern C++ (20)
-* Little-to-no overhead
-* No hand-holding
-* No-frills, straight up just renders shapes and text.
+* Provides single-function-calls to render various graphics primitives in 2D and 3D.
+* Integrates directly with our other toolkits (ReWindow, J3ML)
+* Quick Rendering of Debug Text, Geometric Widgets, Textures, and so forth.
+* Little-to-no overhead.
 * Integrates right into an existing OpenGL rendering system.
+* High-performance text rendering.
+
+## API Overview
+
+### J2D
+* DrawPixel
+* DrawLine / DrawGradientLine
+* DrawSprite
+* OutlineRect / FillRect / FillGradientRect / FillRoundedRect
+* OutlineCircle / FillCircle
+* OutlineTriangle / FillTriangle
+* DrawString
+### J3D
+* DrawLine
+* DrawString
+* DrawMatrixGizmo (WIP)
+* DrawAxisAngleGizmo (WIP)
+* DrawQuaternionGizmo (WIP)
+
+### Types
+* Font
+* Sprite
+* Color4/Color3
+* Gradient
 
 ## Usage
 

include/JGL/Color3.h

@@ -5,19 +5,35 @@
 namespace JGL
 {
     using namespace J3ML;
-    struct Color3 {
+    /// Represents a 3-channel color value, with Red, Green and Blue components.
+    class Color3 {
+    public:
         u8 r;
         u8 g;
         u8 b;
-        Color3 Lerp(const Color3& rhs, float alpha) const;
-        Color3(u8 R, u8 G, u8 B) : r(R), g(G), b(B) {}
 
-        u8 RedChannel  () const { return r; }
-        u8 GreenChannel() const { return g; }
-        u8 BlueChannel () const { return b; }
-        float RedChannelNormalized ()  const { return static_cast<float>(r) / 255.f;}
-        float BlueChannelNormalized()  const { return static_cast<float>(b) / 255.f;}
-        float GreenChannelNormalized() const { return static_cast<float>(g) / 255.f;}
+    public:
+        /// Explicitly constructs a Color3 from the given Red, Green, and Blue values.
+        Color3(u8 R, u8 G, u8 B);
+        /// Returns a Color3 parsed from the given hexadecimal string.
+        static Color3 FromHex(const std::string& hexCode);
+    public:
+        /// Returns a Color3 that is somewhere in-between this and the given Color3, determined by the alpha [0-1].
+        Color3 Lerp(const Color3& rhs, float alpha) const;
+
+        /// Returns the red channel [0-255].
+        u8 RedChannel  () const;
+        /// Returns the green channel [0-255].
+        u8 GreenChannel() const;
+        /// Returns the blue channel [0-255].
+        u8 BlueChannel () const;
+        /// Returns the red channel normalized from [0-255] to [0-1].
+        float RedChannelNormalized ()  const;
+        /// Returns the green channel normalized from [0-255] to [0-1].
+        float GreenChannelNormalized() const;
+        /// Returns the blue channel normalized from [0-255] to [0-1].
+        float BlueChannelNormalized()  const;
+
     };
 
 

include/JGL/Color4.h

@@ -4,14 +4,29 @@
 
 namespace JGL
 {
+
+    /// Represents a 4-channel color value, with Red, Green, Blue, and Alpha components.
     class Color4 {
     public:
-        explicit Color4(const Color3& color3, unsigned int alpha) {r = color3.r; g = color3.g; b = color3.b; a = alpha;}
-        Color4(int red, int green, int blue, int alpha = 127) : r(red), g(green), b(blue), a(alpha) {}
-        static Color4 FromColor3(const Color3& color3, unsigned int alpha = 127) {return Color4(color3, alpha);}
-        int r;
-        int g;
-        int b;
-        int a;
+        u8 r;
+        u8 g;
+        u8 b;
+        u8 a;
+    public:
+        explicit Color4(const Color3& color3, u8 alpha = 255);
+        Color4(u8 red, u8 green, u8 blue, u8 alpha = 255);
+        static Color4 FromColor3(const Color3& color3, u8 alpha = 255);
+        static Color4 FromHex(const std::string& hexCode, u8 alpha = 255);
+
+    public:
+        u8 RedChannel() const;
+        u8 GreenChannel() const;
+        u8 BlueChannel() const;
+        u8 AlphaChannel() const;
+
+        float RedChannelNormalized() const;
+        float GreenChannelNormalized() const;
+        float BlueChannelNormalized() const;
+        float AlphaChannelNormalized() const;
     };
 }

include/JGL/Font.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <vector>
+#include <filesystem>
+#include <J3ML/LinearAlgebra.h>
+#include <filesystem>
+#include <iostream>
+
+
+/// Defines external C references to FreeType Data Structures
+extern "C" typedef struct FT_FaceRec_* FT_Face;
+extern "C" typedef struct FT_LibraryRec_* FT_Library;
+
+namespace JGL
+{
+
+    /// Initializes FreeType engine. Remember to call this during program initialization.
+    bool InitTextEngine();
+
+    /// A Font class implementation.
+    /// Wraps the font's FreeType asset handle and provides helper functions.
+    class Font {
+    public:
+        /// Default constructor does not initialize any members
+        Font() = default;
+        Font(const std::filesystem::path& path);
+        /// Destructor handles freeing of the underlying asset handle.
+        ~Font();
+        static Font LoadTTF(const std::filesystem::path& filepath);
+        static std::vector<Font> GetLoadedFonts();
+        /// Returns the bounding-box the given string would occupy at the given point-size, assuming normal (1) scaling.
+        /// @param text The string to measure.
+        /// @param ptSize The font size at which to measure.
+        /// @return The size-in-pixels that would contain the entire text.
+        Vector2 MeasureString(const std::string& text, unsigned int ptSize);
+    public:
+        int index = 0;
+        FT_Face face;
+    };
+}

include/JGL/FontCache.h

@@ -1,53 +1,67 @@
 #pragma once
 
+#include <array>
+#include <map>
 #include <vector>
 #include <glad/glad.h>
 
+
+/// TODO: FontCache mechanism works amazing, but makes no fucking sense
+/// Let's document and reorganize it to be a little nicer on the mental :)
+
 namespace JGL {
     class CachedGlyph;
     class CachedFont;
     class FontCache;
 }
 
+/// Represents a single font-character "glyph", that has been cached in-memory for fast retrieval.
 class JGL::CachedGlyph {
 private:
-    GLuint texture = 0;
     char character;
+    std::array<GLfloat, 12> texcoords;
 public:
     int x2offset = 0, y2offset = 0, w = 0, h = 0;
     float advanceX = 0, advanceY = 0;
 
     //CachedGlyph(GLuint texture_id, char c);
-    CachedGlyph(GLuint texture_id, char c, float x2o, float y2o, float w, float h, float advX, float advY);
+    CachedGlyph(char c, std::array<GLfloat, 12> texcoords, float x2o, float y2o, float w, float h, float advX, float advY);
     char getCharacter();
-    const GLuint* getTexture();
+    const std::array<GLfloat, 12> getTexCoords() const;
 };
 
+/// Represents a Font object as it exists in the font-cache.
 class JGL::CachedFont {
 private:
-    std::vector<CachedGlyph*> glyphs{};
+    std::map<char, CachedGlyph*> glyphs;
+    GLuint texture = 0;
+    GLsizei texture_width = 0, texture_height = 0;
     unsigned int font_size = 0;
     unsigned int font_index = 0;
 public:
     void appendGlyph(CachedGlyph* glyph);
-    void eraseGlyph(CachedGlyph* glyph);
-    void eraseGlyph(char c);
-    void eraseGlyph(GLuint texture_id);
     unsigned int getFontSize();
     unsigned int getFontIndex();
     CachedGlyph* getGlyph(char c);
-    std::vector<CachedGlyph*>* getGlyphs();
-    CachedFont(unsigned int font_size, unsigned int font_index);
+    std::map<char, CachedGlyph*> getGlyphs();
+    const GLuint* getTexture();
+    GLsizei getTextureWidth() const;
+    GLsizei getTextureHeight() const;
+    CachedFont(GLuint texture_id, GLsizei texture_width, GLsizei texture_height, unsigned int font_size, unsigned int font_index);
 };
 
 class JGL::FontCache {
 private:
     std::vector<CachedFont*> cachedFonts = {};
 public:
-    std::vector<CachedFont*>* getFonts();
+    std::vector<CachedFont*> getFonts();
     CachedFont* getFont(unsigned int font_size, unsigned int font_index);
     void appendFont(CachedFont* font);
-    void newFont(unsigned int font_size, unsigned int font_index);
+    void newFont(GLuint texture_id, GLsizei texture_width, GLsizei texture_height, unsigned int font_size, unsigned int font_index);
     void eraseFont(CachedFont* font);
     void purgeCache();
-};
+};
+
+namespace JGL {
+    inline FontCache fontCache;
+}

include/JGL/Gradient.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <J3ML/J3ML.h>
-
-namespace JGL {
-    enum class Gradient : u8 {
-        Vertical = 0,
-        Horizontal = 1,
-        DiagonalTopLeft = 2,
-        DiagonalBottomLeft = 3
-    };
-}

include/JGL/JGL.h

@@ -1,13 +1,23 @@
-//
-// Created by dawsh on 1/17/24.
-//
+/// Josh's Graphics Library
+/// A C++20 Library for rendering 2D and 3D primitives in an OpenGL context.
+/// Developed and Maintained by Josh O'Leary @ Redacted Software.
+/// Special Thanks to William Tomasine II and Maxine Hayes.
+/// (c) 2024 Redacted Software
+/// This work is dedicated to the public domain.
+
+/// @file JGL.h
+/// @desc All JGL usable functions are defined here. This is the public API.
+/// @edit 2024-07-16
+
+
 #pragma once
 
 #include <string>
 #include <iostream>
 #include <JGL/Color4.h>
-#include <JGL/Gradient.h>
+#include <JGL/enums.h>
 #include <JGL/FontCache.h>
+#include <JGL/Font.h>
 #include <J3ML/LinearAlgebra.h>
 #include <J3ML/LinearAlgebra/Vector2.h>
 #include <J3ML/LinearAlgebra/Vector3.h>
@@ -18,19 +28,10 @@
 // OpenGL Wrapper for rendering 2D graphics primitives in both a 2D and 3D context
 namespace JGL {
 
-    using J3ML::LinearAlgebra::Vector2;
-    using J3ML::LinearAlgebra::Vector3;
-    using J3ML::LinearAlgebra::Matrix3x3;
-    using J3ML::LinearAlgebra::Matrix4x4;
-    using J3ML::LinearAlgebra::AxisAngle;
-    using J3ML::LinearAlgebra::Quaternion;
-
-    using J3ML::Geometry::Sphere;
-    using J3ML::Geometry::OBB;
-    using J3ML::Geometry::Capsule;
-    using J3ML::Geometry::TriangleMesh;
-    using J3ML::Geometry::Plane;
+    using namespace J3ML::LinearAlgebra;
+    using namespace J3ML::Geometry;
 
+    /// TODO:
     struct HSV {
         float hue;
         float saturation;
@@ -51,11 +52,12 @@ namespace JGL {
         Vector3 C;
     };
 
-    bool Update(const Vector2& window_size);
-    bool InitTextEngine();
-    int LoadFont(const std::string& font_path);
+    void Update(const Vector2& window_size);
+    //bool InitTextEngine();
+    Font LoadFont(const std::string& font_path); // TODO: Fully deprecate
+    void PurgeFontCache();
 
-    void UnloadFont(int font_index);
+    void SetActiveFont(const Font& font); // TODO: Implement
     // TODO: implement correct coloring
 
     /// Drawing functions for primitive 2D Shapes.
@@ -85,7 +87,7 @@ namespace JGL {
         /// @param B The end point of the line segment.
         /// @param thickness The width at which to render the line.
         void DrawLine(const Color3& color, const Vector2& A, const Vector2& B, float thickness = 1);
-        void DrawLine(const Color3 &color, float x, float y, float w, float h, float thickness = 1);
+        void DrawLine(const Color3& color, float x, float y, float w, float h, float thickness = 1);
         void DrawLine(const Color4& color, const Vector2& A, const Vector2& B, float thickness = 1);
         void DrawLine(const Color4& color, float x1, float y1, float x2, float y2, float thickness = 1);
 
@@ -99,16 +101,30 @@ namespace JGL {
         void OutlineRect(const Color4& color, const Vector2& pos, const Vector2& size, float thickness = 1);
         void OutlineRect(const Color3& color, const Vector2& pos, const Vector2& size, float thickness = 1);
 
+        ///Draws a sprite to the screen.
+        void DrawSprite(GLuint texture, const Vector2& pos, const Vector2& size, u8 opacity = 255, Inversion::Inversion inversion = Inversion::None);
+        void DrawSprite(GLuint texture, float x, float y, float w, float h, u8 opacity = 255, Inversion::Inversion inversion = Inversion::None);
+
+        ///Draws a non axis-aligned fill rect to the screen.
+        ///The order of the vertices must be such that if you were to connect them you'd never go diagonally across the quad.
+        void FillQuad(const Color4& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4);
+        void FillQuad(const Color3& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4);
+
+        ///Draws a non axis-aligned outline rect to the screen.
+        ///The order of the vertices must be such that if you were to connect them you'd never go diagonally across the quad.
+        void OutlineQuad(const Color4& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4, float thickness = 1);
+        void OutlineQuad(const Color3& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4, float thickness = 1);
+
         /// Draws a filled rectangle on the screen.
         void FillRect(const Color4& color, const Vector2& pos, const Vector2& size);
         void FillRect(const Color3& color, const Vector2& pos, const Vector2& size);
 
         /// Draws a filled rectangle where the color transitions across it.
-        void FillGradientRect(const Color4& color1, const Color4& color2, const Gradient& gradient, const Vector2& pos, const Vector2& size);
-        void FillGradientRect(const Color3& color1, const Color3& color2, const Gradient& gradient, const Vector2& pos, const Vector2& size);
+        void FillGradientRect(const Color4& color1, const Color4& color2, const Gradient::Gradient& gradient, const Vector2& pos, const Vector2& size);
+        void FillGradientRect(const Color3& color1, const Color3& color2, const Gradient::Gradient& gradient, const Vector2& pos, const Vector2& size);
 
         /// Draws a filled rectangle with rounded corners on the screen.
-        void FillRoundedRect(const Color4 &color, const Vector2 &pos, const Vector2 &size, float radius = 5, unsigned int subdivisions = 8);
+        void FillRoundedRect(const Color4& color, const Vector2 &pos, const Vector2 &size, float radius = 5, unsigned int subdivisions = 8);
         void FillRoundedRect(const Color3& color, const Vector2& pos, const Vector2& size, float radius = 5, unsigned int subdivisions = 8);
 
         /// Draws an outline of a circle on the screen.
@@ -125,17 +141,22 @@ namespace JGL {
         // TODO: Implement an overload that simply takes 3 Vector3's
 
         /// Draws a filled triangle on the screen.
-        void FillTriangle(const Color4& color, const Triangle2D &tri);
+        void FillTriangle(const Color4& color, const Triangle2D& tri);
         void FillTriangle(const Color3& color, const Triangle2D& tri);
+
+        /// Draws a triangle where each corner is defined by a given color, Smoothly transitioning between them.
+        void FillGradientTriangle(const Color4& a_color, const Color4& b_color, const Color4& c_color, const Triangle2D& tri);
+        void FillGradientTriangle(const Color3& a_color, const Color3& b_color, const Color3& c_color, const Triangle2D& tri);
         // TODO: Implement an overload that simply takes 3 Vector3's
 
+
         /// Draws a text string on the screen with a given point-size and font.
-        void DrawString(const Color3& color, std::string text, float x, float y, float scale, u32 size, unsigned int font_index);
+        void DrawString(const Color4& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font);
+        void DrawString(const Color3& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font);
 
         // TODO: Implement the following:
         void FillTexturedTriangle();
         void FillTexturedPolygon();
-        void DrawSprite();
         void DrawPartialSprite();
         void DrawCubicBezierCurve();
         void OutlinePolygon    (const Color4& color, std::vector<Vector2> points);
@@ -157,7 +178,7 @@ namespace JGL {
         void WireframeCapsule(const Color3& color, const Capsule& cap, float thickness = 1);
         void FillTriangleMesh(const Color3& color, const TriangleMesh& mesh);
         void WireframeTriangleMesh(const Color3& color, const TriangleMesh& mesh, float thickness = 1);
-        void DrawString(const Color3& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, unsigned int font_index);
+        void DrawString(const Color3& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, const Font& font);
 
         void DrawMatrixGizmo     (const Matrix3x3&, const Vector3&);
         void DrawMatrixGizmo     (const Matrix4x4&);

include/JGL/enums.h

@@ -0,0 +1,26 @@
+#pragma once
+
+namespace JGL::Inversion {
+    enum Inversion {
+        None = 0,
+        Vertical = 1,
+        Horizontal = 2,
+    };
+
+    inline Inversion operator|(Inversion a, Inversion b) {
+        return static_cast<Inversion>(static_cast<int>(a) | static_cast<int>(b));
+    }
+}
+
+namespace JGL::Gradient {
+    enum Gradient {
+        Vertical = 0,
+        Horizontal = 1,
+        DiagonalTopLeft = 2,
+        DiagonalBottomLeft = 3
+    };
+
+    inline Gradient operator|(Gradient a, Gradient b) {
+        return static_cast<Gradient>(static_cast<int>(a) | static_cast<int>(b));
+    }
+}

main.cpp

@@ -1,12 +1,18 @@
-#include <glad/glad.h>
+
 #include <JGL/JGL.h>
 #include <rewindow/types/window.h>
 #include <JGL/Colors.h>
 #include <J3ML/LinearAlgebra/Vector2.h>
+#include <JGL/Font.h>
+#include <jlog/jlog.hpp>
+#include <ReTexture/Texture.h>
 
 using J3ML::LinearAlgebra::Vector2;
 using namespace JGL;
+using namespace ReTexture;
 
+Texture* image;
+GLuint imageID;
 //The Re3D style base projection.
 std::vector<GLfloat> perspective(float fov, float aspect, float nearPlane, float farPlane) {
     std::vector<float> result(16);
@@ -24,13 +30,13 @@ public:
     Vector3 position = {0,0,0};
     Vector3 angle = {0,0,0};
 
-    std::array<GLfloat, 16> lookAt(const Vector3& eye, const Vector3& center, const Vector3& up) {
+    std::vector<GLfloat> lookAt(const Vector3& eye, const Vector3& center, const Vector3& up) {
         Vector3 f = Vector3::Normalized((center - eye));
         Vector3 upN = Vector3::Normalized(up);
         Vector3 s = Vector3::Normalized(f.Cross(upN));
         Vector3 u = Vector3::Normalized(s.Cross(f));
 
-        std::array<GLfloat, 16> result = {
+        std::vector<GLfloat> result = {
                 s.x,         u.x,         -f.x,        0.0f,
                 s.y,         u.y,         -f.y,        0.0f,
                 s.z,         u.z,         -f.z,        0.0f,
@@ -57,8 +63,8 @@ struct point {
     GLfloat t;
 };
 
-int FreeSans;
-int Jupiteroid;
+JGL::Font FreeSans;
+JGL::Font Jupiteroid;
 
 class JGLDemoWindow : public ReWindow::RWindow
 {
@@ -69,11 +75,11 @@ public:
         auto aspect = (float) window_size[0] / (float) window_size[1];
 
         gladLoadGL();
+        JGL::InitTextEngine();
         JGL::Update(getSize());
-        FreeSans = JGL::LoadFont("assets/fonts/FreeSans.ttf");
-        Jupiteroid = JGL::LoadFont("assets/fonts/Jupiteroid.ttf");
+        FreeSans = JGL::Font("assets/fonts/FreeSans.ttf");
+        Jupiteroid = JGL::Font("assets/fonts/Jupiteroid.ttf");
 
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
         glMultMatrixf(perspective(75, aspect, 0.001, 100).data());
@@ -84,6 +90,21 @@ public:
         glEnable(GL_DEPTH_TEST);
         glDepthFunc(GL_LESS);
         glDepthMask(GL_TRUE);
+
+        image = new Texture("assets/sprites/Re3D.png");
+        glGenTextures(1, &imageID);
+        glBindTexture(GL_TEXTURE_2D, imageID);
+        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);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+        if (image->getTextureFormat() == TextureFormat::RGBA)
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->getWidth(), image->getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixelData.data());
+        if (image->getTextureFormat() == TextureFormat::RGB)
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, image->getWidth(), image->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE, image->pixelData.data());
+
+        glBindTexture(GL_TEXTURE_2D, 0);
     }
 
     Vector3 textAngle = {0,0,0};
@@ -96,6 +117,7 @@ public:
         camera->render();
 
         ///All 3D elements of the scene and JGL elements *must* be rendered before the 2d stuff.
+
         J3D::Begin();
             J3D::DrawLine(JGL::Colors::Red, {-0.33,-0.125,1}, {-1,-0.125,1});
             J3D::DrawLine(JGL::Colors::Red, {-0.33,-0.125,1}, {-0.33,0.25,1});
@@ -103,7 +125,9 @@ public:
         J3D::End();
 
         J2D::Begin();
+            J2D::FillQuad(Color4(Colors::Red), {500, 52}, {500, 152}, {600, 152}, {600, 52});
             J2D::FillRect(Colors::Blue, {0,52}, {100,100});
+            J2D::DrawSprite(imageID, {0, 52}, {(float) image->getWidth(), (float) image->getHeight()}, 128);
             J2D::FillRect(Color4::FromColor3(Colors::Pinks::HotPink), {68, 120}, {32, 32});
             J2D::FillGradientRect(Colors::Red, Colors::Blue, Gradient::DiagonalBottomLeft, {100,52}, {100,100});
             J2D::FillRoundedRect(JGL::Colors::Red, {200, 52}, {100, 100}, 8, 8);
@@ -112,20 +136,24 @@ public:
             J2D::FillCircle(JGL::Colors::White, {52, 204}, 50, 24);
             J2D::OutlineCircle(JGL::Colors::White, {153, 204}, 50, 24);
 
-            J2D::FillTriangle(Colors::Red, {{0, 275}, {0, 375}, {100, 375}});
+            //J2D::FillTriangle(Colors::Red, {{0, 275}, {0, 375}, {100, 375}});
+            J2D::FillGradientTriangle(Color4(Colors::Red), Color4(Colors::Green), Color4(Colors::Blue), {{0, 275}, {0, 375}, {100, 375}});
             J2D::OutlineTriangle(Colors::Blue, {{100, 275}, {0, 275}, {100, 375}});
             J2D::DrawGradientLine(JGL::Colors::Red, JGL::Colors::Blue, {105, 375}, {200, 275}, 2);
+            auto result = Jupiteroid.MeasureString("Jupiteroid Font", 16);
 
-            J2D::DrawString(JGL::Colors::Green, "Jupteroid Font", 0.f, 16, 1.f, 16, Jupiteroid);
-            J2D::DrawString(JGL::Colors::White, "Position: " + std::to_string(camera->position.x) + " " + std::to_string(camera->position.y) + " " + std::to_string(camera->position.z), 0, 33, 1,16, Jupiteroid);
-            J2D::DrawString(JGL::Colors::White, "ViewAngle: " + std::to_string(camera->angle.x) + " " + std::to_string(camera->angle.y) + " " + std::to_string(camera->angle.z), 0, 50, 1,16, Jupiteroid);
+            J2D::FillRect(JGL::Colors::Gray, {0, 0}, result);
+            J2D::DrawString(JGL::Colors::Green, "Jupteroid Font", 0.f, 0, 1.f, 16, Jupiteroid);
+            J2D::DrawString(JGL::Colors::White, "Position: " + std::to_string(camera->position.x) + " " + std::to_string(camera->position.y) + " " + std::to_string(camera->position.z), 0, 16, 1,16, Jupiteroid);
+            J2D::DrawString(JGL::Colors::White, "ViewAngle: " + std::to_string(camera->angle.x) + " " + std::to_string(camera->angle.y) + " " + std::to_string(camera->angle.z), 0, 33, 1,16, Jupiteroid);
         J2D::End();
     }
 
     void OnRefresh(float elapsed) override {
         display();
-        if (glGetError() != GL_NO_ERROR)
-            exit(1);
+        int glError = glGetError();
+        if (glError != GL_NO_ERROR)
+            std::cout << glError << std::endl;
         glSwapBuffers();
     }
 

reci/scripts/builddeps.reci

@@ -0,0 +1 @@
+Main:new("Install build dependencies", "apt-get install -yq libgl1-mesa-dev libfreetype-dev")

src/FontCache.cpp

@@ -6,12 +6,11 @@ char CachedGlyph::getCharacter() {
     return character;
 }
 
-const GLuint* CachedGlyph::getTexture() {
-    return &texture;
+const std::array<GLfloat, 12> CachedGlyph::getTexCoords() const {
+    return texcoords;
 }
 
-CachedGlyph::CachedGlyph(GLuint texture_id, char c, float x2offset, float y2offset, float w, float h, float advanceX, float advanceY) {
-    texture = texture_id;
+CachedGlyph::CachedGlyph(char c, std::array<GLfloat, 12> texcoords, float x2offset, float y2offset, float w, float h, float advanceX, float advanceY) {
     character = c;
     this->x2offset = x2offset;
     this->y2offset = y2offset;
@@ -19,10 +18,14 @@ CachedGlyph::CachedGlyph(GLuint texture_id, char c, float x2offset, float y2offs
     this->h = h;
     this->advanceX = advanceX;
     this->advanceY = advanceY;
+    this->texcoords = texcoords;
 }
 
+//TODO
+//Because most things shown would be english characters. We can cut down on the iteration time significantly
+//by putting each english character at the beginning of the list in order of how often they usually occur in text.
 void JGL::CachedFont::appendGlyph(JGL::CachedGlyph* glyph) {
-    glyphs.push_back(glyph);
+    glyphs.emplace(glyph->getCharacter(), glyph);
 }
 
 unsigned int JGL::CachedFont::getFontSize() {
@@ -33,64 +36,50 @@ unsigned int JGL::CachedFont::getFontIndex() {
     return font_index;
 }
 
+//TODO make this code go faster.
 CachedGlyph* JGL::CachedFont::getGlyph(char c) {
-    for (const auto& g : glyphs)
-        if (c == g->getCharacter())
-            return g;
+    auto it = glyphs.find(c);
+    if (it != glyphs.end())
+        return it->second;
     return nullptr;
 }
 
-CachedFont::CachedFont(unsigned int font_size, unsigned int font_index) {
+CachedFont::CachedFont(GLuint texture_id, GLsizei texture_width, GLsizei texture_height, unsigned int font_size, unsigned int font_index) {
+    this->texture = texture_id;
+    this->texture_width = texture_width;
+    this->texture_height = texture_height;
     this->font_size = font_size;
     this->font_index = font_index;
 }
 
-void CachedFont::eraseGlyph(CachedGlyph* glyph) {
-    if (glyph == nullptr)
-        return;
-
-    for (int i = 0; i < glyphs.size(); i++)
-        if (glyphs[i] == glyph)
-            glDeleteTextures(1, glyphs[i]->getTexture()),
-            delete glyphs[i],
-            glyphs.erase(glyphs.begin() + i);
+std::map<char, CachedGlyph*> CachedFont::getGlyphs() {
+    return glyphs;
 }
 
-void CachedFont::eraseGlyph(char c) {
-    for (int i = 0; i < glyphs.size(); i++)
-        if (glyphs[i]->getCharacter() == c)
-            glDeleteTextures(1, glyphs[i]->getTexture()),
-            delete glyphs[i],
-            glyphs.erase(glyphs.begin() + i);
+const GLuint* CachedFont::getTexture() {
+    return &texture;
 }
 
-void CachedFont::eraseGlyph(GLuint texture_id) {
-    for (int i = 0; i < glyphs.size(); i++)
-        if (glyphs[i]->getTexture() == &texture_id)
-            glDeleteTextures(1, glyphs[i]->getTexture()),
-            delete glyphs[i],
-            glyphs.erase(glyphs.begin() + i);
+GLsizei CachedFont::getTextureWidth() const {
+    return texture_width;
 }
 
-std::vector<CachedGlyph*>* CachedFont::getGlyphs() {
-    return &glyphs;
+GLsizei CachedFont::getTextureHeight() const {
+    return texture_height;
 }
 
 void FontCache::appendFont(CachedFont* font) {
     cachedFonts.push_back(font);
 }
 
-void FontCache::newFont(unsigned int font_size, unsigned int font_index) {
-    auto* font = new CachedFont(font_size, font_index);
+void FontCache::newFont(GLuint texture_id, GLsizei texture_width, GLsizei texture_height, unsigned int font_size, unsigned int font_index) {
+    auto* font = new CachedFont(texture_id, texture_width, texture_height, font_size, font_index);
     cachedFonts.push_back(font);
 }
 
 void FontCache::eraseFont(CachedFont* font) {
     for (int i = 0; i < cachedFonts.size(); i++) {
         if (cachedFonts[i] == font) {
-            for (auto& g: *cachedFonts[i]->getGlyphs())
-                cachedFonts[i]->eraseGlyph(g);
-
             delete cachedFonts[i];
             cachedFonts.erase(cachedFonts.begin() + i);
         }
@@ -101,11 +90,10 @@ void FontCache::purgeCache() {
     //Remove every font from the cache.
     for (const auto& font : cachedFonts)
         eraseFont(font);
-    cachedFonts = {};
 }
 
-std::vector<CachedFont*>* FontCache::getFonts() {
-    return &cachedFonts;
+std::vector<CachedFont*> FontCache::getFonts() {
+    return cachedFonts;
 }
 
 CachedFont* FontCache::getFont(unsigned int font_size, unsigned int font_index) {

src/JGL.cpp

@@ -7,7 +7,8 @@
 #include <JGL/Color3.h>
 #include <jlog/jlog.hpp>
 
-GLfloat oldColor[4] = {0, 0, 0, 255};
+GLfloat oldColor[4] = {0, 0, 0, 1};
+GLfloat baseColor[4] = {1, 1, 1, 1};
 bool inJ2D = false;
 bool inJ3D = false;
 bool wasTexture2DEnabled = false;
@@ -17,16 +18,17 @@ bool wasVertexArraysEnabled = false;
 bool wasCullFaceEnabled = false;
 bool wasBlendEnabled = false;
 bool wasColorArrayEnabled = false;
+GLint activeTextureUnit = 0;
 
 namespace JGL {
     using namespace J3ML;
     Vector2 wS;
 
-    bool Update(const Vector2& window_size) {
+    void Update(const Vector2& window_size) {
         wS = window_size;
-        return JGL::InitTextEngine();
     }
 
+
     void J2D::Begin() {
         glMatrixMode(GL_PROJECTION);
         glPushMatrix();
@@ -36,6 +38,15 @@ namespace JGL {
         glPushMatrix();
         glLoadIdentity();
 
+        //Get what the draw color was before we did anything.
+        glGetFloatv(GL_CURRENT_COLOR, oldColor);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
+
+        glGetIntegerv(GL_ACTIVE_TEXTURE,& activeTextureUnit);
+        activeTextureUnit = activeTextureUnit - GL_TEXTURE0;
+        if (activeTextureUnit != 0)
+            glActiveTexture(GL_TEXTURE0);
+
         wasDepthTestEnabled = false;
         if (glIsEnabled(GL_DEPTH_TEST))
             wasDepthTestEnabled = true,
@@ -44,7 +55,7 @@ namespace JGL {
         wasVertexArraysEnabled = true;
         if (!glIsEnabled(GL_VERTEX_ARRAY))
             wasVertexArraysEnabled = false,
-            glEnable(GL_VERTEX_ARRAY);
+            glEnableClientState(GL_VERTEX_ARRAY);
 
         wasCullFaceEnabled = true;
         if (!glIsEnabled(GL_CULL_FACE))
@@ -66,12 +77,12 @@ namespace JGL {
         wasTextureCoordArrayEnabled = true;
         if (!glIsEnabled(GL_TEXTURE_COORD_ARRAY))
             wasTextureCoordArrayEnabled = false,
-            glEnable(GL_TEXTURE_COORD_ARRAY);
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
         wasColorArrayEnabled = false;
         if (glIsEnabled(GL_COLOR_ARRAY))
             wasColorArrayEnabled = true,
-            glDisable(GL_COLOR_ARRAY);
+            glDisableClientState(GL_COLOR_ARRAY);
 
         if (!inJ3D)
             inJ2D = true;
@@ -80,7 +91,6 @@ namespace JGL {
 
     void J2D::End() {
         //Change back to the previous projection (The 3D one in Re3D's case.)
-        glDisable(GL_TEXTURE_2D);
         glPopMatrix();
         glMatrixMode(GL_PROJECTION);
         glPopMatrix();
@@ -89,7 +99,7 @@ namespace JGL {
             glEnable(GL_DEPTH_TEST);
 
         if (!wasVertexArraysEnabled)
-            glDisable(GL_VERTEX_ARRAY);
+            glDisableClientState(GL_VERTEX_ARRAY);
 
         if (!wasCullFaceEnabled)
             glDisable(GL_CULL_FACE);
@@ -101,10 +111,13 @@ namespace JGL {
             glDisable(GL_TEXTURE_2D);
 
         if (!wasTextureCoordArrayEnabled)
-            glDisable(GL_TEXTURE_COORD_ARRAY);
+            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
         if (wasColorArrayEnabled)
-            glEnable(GL_COLOR_ARRAY);
+            glEnableClientState(GL_COLOR_ARRAY);
+
+        //Select whatever texture unit was selected before.
+        glActiveTexture(GL_TEXTURE0 + activeTextureUnit);
 
         //Put the draw color back how it was before.
         glColor4f(oldColor[0], oldColor[1], oldColor[2], oldColor[3]);
@@ -112,6 +125,65 @@ namespace JGL {
         inJ2D = false;
     }
 
+    //TODO rotation, I'm unsure if @josh wants degrees or radians.
+    void J2D::DrawSprite(GLuint texture, const Vector2& pos, const Vector2& size, u8 opacity, Inversion::Inversion inversion) {
+        if (!inJ2D)
+            ERROR("Attempt to Render J2D element before J2D begin.")
+
+        std::array<Vector2, 4> textureCoordinates = {Vector2(0, 0), Vector2(0, 1), Vector2(1, 1), Vector2(1, 0)};;
+        const Vector2 vertices[] = {{pos.x, pos.y}, {pos.x, pos.y + size.y}, {pos.x + size.x, pos.y + size.y}, {pos.x + size.x, pos.y}};
+
+        if (inversion&  Inversion::Vertical)
+            textureCoordinates = {Vector2(0, 1), Vector2(0, 0), Vector2(1, 0), Vector2(1, 1)};
+        if (inversion&  Inversion::Horizontal)
+            textureCoordinates = {Vector2(1, 0), Vector2(1, 1), Vector2(0, 1), Vector2(0, 0)};
+        if ((inversion& Inversion::Horizontal) && (inversion& Inversion::Vertical))
+            textureCoordinates = {Vector2(1, 1), Vector2(1, 0), Vector2(0, 0), Vector2(0, 1)};
+
+        glColor4f(baseColor[0],baseColor[1],baseColor[2],opacity / 255.f);
+        glBindTexture(GL_TEXTURE_2D, texture);
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
+        glTexCoordPointer(2, GL_FLOAT, sizeof(Vector2), textureCoordinates.data());
+        glDrawArrays(GL_QUADS, 0, 4);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
+    }
+
+    void J2D::FillQuad(const Color4& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4) {
+        if (!inJ2D)
+            ERROR("Attempt to Render J2D element before J2D begin.")
+
+        Vector2 vertices[] = {v1, v2, v3, v4};
+        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
+        glDrawArrays(GL_QUADS, 0, 4);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
+    }
+
+    void J2D::FillQuad(const Color3& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4) {
+        J2D::FillQuad(Color4(color), v1, v2, v3, v4);
+    }
+
+    void J2D::OutlineQuad(const Color4& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4, float thickness) {
+        if (!inJ2D)
+            ERROR("Attempt to Render J2D element before J2D begin.")
+
+        Vector2 vertices[] = {v1, v2, v3, v4};
+        glLineWidth(thickness);
+        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
+        glDrawArrays(GL_LINE_LOOP, 0, 4);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
+    }
+
+    void J2D::OutlineQuad(const Color3& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4, float thickness) {
+        J2D::OutlineQuad(Color4(color), v1, v2, v3, v4);
+    }
+
+    void J2D::DrawSprite(GLuint texture, float x, float y, float w, float h, u8 opacity, Inversion::Inversion inversion) {
+        J2D::DrawSprite(texture, {x, y}, {w, h}, opacity, inversion);
+    }
+
     void J2D::FillRect(const Color4& color, const Vector2& pos, const Vector2& size) {
         if (!inJ2D)
             ERROR("Attempt to Render J2D element before J2D begin.")
@@ -120,13 +192,14 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
         glDrawArrays(GL_QUADS, 0, 4);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::FillRect(const Color3& color, const Vector2& pos, const Vector2& size) {
         J2D::FillRect({color.r, color.g, color.b, 255}, pos, size);
     }
 
-    void J2D::FillGradientRect(const Color4& color1, const Color4& color2, const Gradient& gradient, const Vector2& pos, const Vector2& size) {
+    void J2D::FillGradientRect(const Color4& color1, const Color4& color2, const Gradient::Gradient& gradient, const Vector2& pos, const Vector2& size) {
         if (!inJ2D)
             ERROR("Attempt to Render J2D element before J2D begin.")
 
@@ -151,18 +224,19 @@ namespace JGL {
                               (color1.b + color2.b) / 2.f / 255.f, (color1.a + color2.a) / 2.f / 255.f,color2.r / 255.f, color2.g / 255.f, color2.b / 255.f, color2.a / 255.f,
                               (color1.r + color2.r) / 2.f / 255.f, (color1.g + color2.g) / 2.f / 255.f, (color1.b + color2.b) / 2.f / 255.f,(color1.a + color2.a) / 2.f / 255.f};
 
-        glEnable(GL_COLOR_ARRAY);
+        glEnableClientState(GL_COLOR_ARRAY);
             glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
             glColorPointer(4, GL_FLOAT, 0, colors.data());
             glDrawArrays(GL_QUADS, 0, 4);
-        glDisable(GL_COLOR_ARRAY);
+        glDisableClientState(GL_COLOR_ARRAY);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
-    void J2D::FillGradientRect(const Color3& color1, const Color3& color2, const Gradient& gradient, const Vector2& pos, const Vector2& size) {
+    void J2D::FillGradientRect(const Color3& color1, const Color3& color2, const Gradient::Gradient& gradient, const Vector2& pos, const Vector2& size) {
         J2D::FillGradientRect({color1.r, color1.g, color1.b, 255}, {color2.r, color2.g, color2.b, 255}, gradient, pos, size);
     }
 
-    void J2D::FillRoundedRect(const Color4 &color, const Vector2 &pos, const Vector2 &size, float radius, unsigned int subdivisions) {
+    void J2D::FillRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius, unsigned int subdivisions) {
         if (!inJ2D)
             ERROR("Attempt to Render J2D element before J2D begin.")
 
@@ -189,6 +263,7 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
         glDrawArrays(GL_LINE_LOOP, 0, 4);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::OutlineRect(const Color3& color, const Vector2& pos, const Vector2& size, float thickness) {
@@ -205,6 +280,7 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
         glDrawArrays(GL_LINES, 0, 2);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::DrawLine(const Color3& color, const Vector2& A, const Vector2& B, float thickness) {
@@ -227,12 +303,13 @@ namespace JGL {
         GLfloat colors[8] = {color1.r / 255.f, color1.g / 255.f, color1.b / 255.f, color1.a / 255.f,
                              color2.r / 255.f, color2.g / 255.f, color2.b / 255.f, color2.a / 255.f};
 
-        glEnable(GL_COLOR_ARRAY);
+        glEnableClientState(GL_COLOR_ARRAY);
             glLineWidth(thickness);
             glColorPointer(4,GL_FLOAT,sizeof(GL_FLOAT) * 4, colors);
             glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
             glDrawArrays(GL_LINES, 0, 2);
-        glDisable(GL_COLOR_ARRAY);
+        glDisableClientState(GL_COLOR_ARRAY);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::DrawGradientLine(const Color3& color1, const Color3& color2, const Vector2& A, const Vector2& B, float thickness) {
@@ -255,6 +332,7 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
         glDrawArrays(GL_LINES, 0, 1);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::DrawPixel(const Color3& color, const Vector2& coordinates) {
@@ -287,6 +365,7 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
         glDrawArrays(GL_LINE_LOOP, 0, vertices.size());
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::OutlineCircle(const Color3& color, const Vector2& center, float radius, unsigned int subdivisions, float thickness) {
@@ -309,6 +388,7 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
         glDrawArrays(GL_TRIANGLE_FAN, 0, vertices.size());
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::FillCircle(const Color3& color, const Vector2& center, float radius, unsigned int subdivisions) {
@@ -325,13 +405,14 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
         glDrawArrays(GL_LINE_LOOP, 0, 3);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J2D::OutlineTriangle(const Color3& color, const Triangle2D& tri, float thickness) {
         J2D::OutlineTriangle({color.r, color.g, color.b, 255}, tri, thickness);
     }
 
-    void J2D::FillTriangle(const Color4& color, const Triangle2D &tri) {
+    void J2D::FillTriangle(const Color4& color, const Triangle2D& tri) {
         if (!inJ2D)
             ERROR("Attempt to Render J2D element before J2D begin.")
 
@@ -340,9 +421,32 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
         glDrawArrays(GL_TRIANGLES, 0, 3);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
-    void J2D::FillTriangle(const Color3& color, const Triangle2D &tri) {
+    void J2D::FillGradientTriangle(const Color4& a_color, const Color4& b_color, const Color4& c_color, const Triangle2D& tri) {
+        if (!inJ2D)
+            ERROR("Attempt to Render J2D element before J2D begin.")
+
+        Vector2 vertices[] = {{tri.A.x, tri.A.y}, {tri.B.x, tri.B.y}, {tri.C.x, tri.C.y}};
+        GLfloat colors[] = {a_color.r / 255.f, a_color.g / 255.f, a_color.b / 255.f, a_color.a / 255.f,b_color.r / 255.f,
+                            b_color.g / 255.f, b_color.b / 255.f, b_color.a / 255.f,c_color.r / 255.f, c_color.g / 255.f, c_color.b / 255.f,
+                            c_color.a / 255.f };
+
+        glEnableClientState(GL_COLOR_ARRAY);
+        glColorPointer(4, GL_FLOAT, sizeof(Color4), colors);
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
+        glDrawArrays(GL_TRIANGLES, 0, 3);
+        glDisableClientState(GL_COLOR_ARRAY);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
+    }
+
+    void J2D::FillGradientTriangle(const Color3& a_color, const Color3& b_color, const Color3& c_color, const Triangle2D& tri) {
+        J2D::FillGradientTriangle(Color4(a_color), Color4(b_color), Color4(c_color), tri);
+    }
+
+
+    void J2D::FillTriangle(const Color3& color, const Triangle2D& tri) {
         J2D::FillTriangle({color.r, color.g, color.b, 255}, tri);
     }
 
@@ -350,6 +454,7 @@ namespace JGL {
 
         //Get what the draw color was before we did anything.
         glGetFloatv(GL_CURRENT_COLOR, oldColor);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
 
         wasDepthTestEnabled = false;
         if (glIsEnabled(GL_DEPTH_TEST))
@@ -359,14 +464,14 @@ namespace JGL {
         wasVertexArraysEnabled = false;
         if (!glIsEnabled(GL_VERTEX_ARRAY))
             wasVertexArraysEnabled = false,
-            glEnable(GL_VERTEX_ARRAY);
+            glEnableClientState(GL_VERTEX_ARRAY);
 
         wasTexture2DEnabled = true;
         if (!glIsEnabled(GL_TEXTURE_2D))
             wasTexture2DEnabled = false,
             glEnable(GL_TEXTURE_2D);
 
-        //TODO We won't always want this but for now we do.
+        // TODO: implement bool drawBackface as DrawString parameter.
         wasCullFaceEnabled = false;
         if (glIsEnabled(GL_CULL_FACE))
             wasCullFaceEnabled = true,
@@ -382,22 +487,20 @@ namespace JGL {
 
         if (!inJ2D)
             inJ3D = true;
-        else { ERROR("Attempt to Begin J3D inside of J2D context.") }
+        else { ERROR("Attempt to Begin J3D inside of J2D context.")}
     }
 
     void J3D::End() {
-        glDisable(GL_TEXTURE_2D);
-
         if (wasDepthTestEnabled)
             glEnable(GL_DEPTH_TEST);
 
         if (!wasVertexArraysEnabled)
-            glDisable(GL_VERTEX_ARRAY);
+            glDisableClientState(GL_VERTEX_ARRAY);
 
         if (wasTexture2DEnabled)
             glDisable(GL_TEXTURE_2D);
 
-        if (wasBlendEnabled)
+        if (!wasBlendEnabled)
             glDisable(GL_BLEND);
 
         if (wasCullFaceEnabled)
@@ -419,6 +522,7 @@ namespace JGL {
         glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
         glVertexPointer(3, GL_FLOAT, sizeof(Vector3), vertices);
         glDrawArrays(GL_LINES, 0, 2);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
     void J3D::DrawLine(const Color3& color, const Vector3& A, const Vector3& B, float thickness) {

src/JGL/Color3.cpp

@@ -0,0 +1,19 @@
+#include <JGL/Color3.h>
+
+namespace JGL
+{
+
+    u8 Color3::RedChannel() const { return r; }
+
+    u8 Color3::GreenChannel() const { return g; }
+
+    u8 Color3::BlueChannel() const { return b; }
+
+    float Color3::RedChannelNormalized() const { return static_cast<float>(r) / 255.f;}
+
+    float Color3::BlueChannelNormalized() const { return static_cast<float>(b) / 255.f;}
+
+    float Color3::GreenChannelNormalized() const { return static_cast<float>(g) / 255.f;}
+
+    Color3::Color3(u8 R, u8 G, u8 B) : r(R), g(G), b(B) {}
+}

src/JGL/Color4.cpp

@@ -0,0 +1,27 @@
+#include <JGL/Color4.h>
+
+namespace JGL
+{
+
+    Color4::Color4(u8 red, u8 green, u8 blue, u8 alpha) : r(red), g(green), b(blue), a(alpha) {}
+
+    Color4::Color4(const Color3 &color3, u8 alpha) {r = color3.r; g = color3.g; b = color3.b; a = alpha;}
+
+    Color4 Color4::FromColor3(const Color3 &color3, u8 alpha) {return Color4(color3, alpha);}
+
+    u8 Color4::RedChannel() const { return r;}
+
+    u8 Color4::GreenChannel() const { return g;}
+
+    u8 Color4::BlueChannel() const {return b;}
+
+    u8 Color4::AlphaChannel() const {return a;}
+
+    float Color4::RedChannelNormalized() const {return static_cast<float>(r/255.f); }
+
+    float Color4::GreenChannelNormalized() const {return static_cast<float>(g/255.f); }
+
+    float Color4::BlueChannelNormalized() const {return static_cast<float>(b/255.f); }
+
+    float Color4::AlphaChannelNormalized() const {return static_cast<float>(a/255.f); }
+}

src/JGL/Font.cpp

@@ -0,0 +1,165 @@
+
+#include <vector>
+#include <string>
+#include <iostream>
+#include <glad/glad.h>
+
+#if __linux__
+#include <freetype2/ft2build.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
+#include <JGL/FontCache.h>
+
+#endif
+#if _WIN32
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#endif
+
+#include <JGL/Font.h>
+
+namespace JGL::Detail
+{
+    FT_Library ft;
+
+    std::vector<Font> fonts;
+
+    bool InitTextEngine() {
+
+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1); // NOTE: This MUST be called for text rendering to work properly!!!
+        // Keep note of this, might cause problems later?
+
+        if (ft != nullptr)
+            throw std::runtime_error("Error::FREETYPE: FT_Library was initialized but is already initialized.");
+        
+        if (FT_Init_FreeType(&ft))
+            return true;
+        return false;
+    }
+
+    void UnloadFont(int font_index) {
+
+        auto iter = fonts.begin();
+        while (iter != fonts.end())
+        {
+            if (iter->index == font_index){
+                FT_Done_Face(iter->face);
+                iter = fonts.erase(iter);
+            } else ++iter;
+        }
+    }
+}
+
+namespace JGL
+{
+
+    bool InitTextEngine()
+    {
+        return Detail::InitTextEngine();
+    }
+
+    Font::Font(const std::filesystem::path& path)
+    {
+        if (Detail::ft == nullptr)
+            throw new std::runtime_error("Error::FREETYPE: FT_Library was not initialized before attempting to load a font!");
+
+        Font font;
+        if (FT_New_Face(Detail::ft, path.c_str(), 0, &face)) {
+            std::cout << "Error::FREETYPE: Failed to load font!" << std::endl;
+            throw new std::runtime_error("Error::FREETYPE: Failed to load font!");
+            //return -1;
+        }
+        unsigned int newIndex = 0;
+        for (const auto& f : Detail::fonts)
+            if (f.index >= newIndex)
+                newIndex = f.index + 1;
+
+        index = newIndex;
+        Detail::fonts.push_back(font);
+        std::cout << "Loaded font from " << path << " with index " << newIndex << std::endl;
+        //return newIndex;
+    }
+
+    Font::~Font()
+    {
+        //Detail::UnloadFont(this->index);
+    }
+
+
+    std::vector<Font> Font::GetLoadedFonts() {
+        return Detail::fonts;
+    }
+
+
+    Font Font::LoadTTF(const std::filesystem::path& path)
+    {
+        return Font(path);
+    }
+
+    Vector2 Font::MeasureString(const std::string &text, unsigned int ptSize) {
+
+        // TODO: Check if a font of that size is in the cache and if so use the info from that because this is sloooooooooooooow.
+        // That'll make it go vroom vroom.
+        // TODO: Work in-progress implementation unfortunately.
+        // This is likely returning slightly incorrect results for likely several reasons.
+        // Half-ass solution for now ~ dawsh.
+
+        Vector2 extents = Vector2(0,0);
+        bool font_of_size_in_cache = false;
+
+        for(const auto& f : fontCache.getFonts()) {
+            if (f->getFontSize() == ptSize) {
+                font_of_size_in_cache = true;
+                break;
+            }
+        }
+
+        if (font_of_size_in_cache) {
+            CachedFont* font;
+
+            for (auto* f: fontCache.getFonts())
+                if (f->getFontSize() == ptSize)
+                    font = f;
+
+            for (const char& c : text)
+                extents.x += font->getGlyph(c)->advanceX;
+
+            extents.y = ptSize;
+            return extents;
+        }
+
+        FT_Set_Pixel_Sizes(this->face, ptSize, ptSize);
+
+        for (const char& c : text) {
+
+            FT_GlyphSlot slot = face->glyph;
+            auto glyph_index = FT_Get_Char_Index(this->face, c);
+
+            auto error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+            if (error)
+                continue;
+
+
+            Vector2 advance = {static_cast<float>(slot->advance.x >> 6),
+                               static_cast<float>(slot->advance.y >> 6)};
+
+
+            extents += advance;
+
+            // Gives smaller results than we'd want.
+            if (extents.y < slot->metrics.height / 64) {
+                extents.y = slot->metrics.height / 64;
+            }
+
+            // Just fucking hardcode it, we know the glyph height is roughly always the ptSize anyway.
+            if (extents.y < ptSize)
+            {
+                extents.y = ptSize;
+            }
+        }
+
+        return extents;
+    }
+
+
+}

src/JGL/TextRendering.cpp

@@ -1,139 +1,164 @@
 #include <JGL/JGL.h>
 
+
 #if __linux__
-    #include <freetype2/ft2build.h>
-    #include FT_FREETYPE_H
+#include <freetype2/ft2build.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
+#include "jlog/jlog.hpp"
+
 #endif
 #if _WIN32
-    #include <ft2build.h>
-    #include FT_FREETYPE_H
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #endif
 
+#include <JGL/Font.h>
+#include <JGL/FontCache.h>
+
 namespace JGL {
-    FT_Library ft;
 
-    struct Font {
-        int index = 0;
-        FT_Face face;
-    };
-    std::vector<Font> faces;
-
-    int LoadFont(const std::string &font_path) {
-        if (ft == nullptr)
-            return -1;
-
-        Font font;
-        if (FT_New_Face(ft, font_path.c_str(), 0, &font.face)) {
-            std::cout << "Error::FREETYPE: Failed to load font!" << std::endl;
-            return -1;
-        }
-        unsigned int newIndex = 0;
-        for (const auto& f : faces)
-            if (f.index >= newIndex)
-                newIndex = f.index + 1;
-
-        font.index = newIndex;
-        faces.push_back(font);
-        std::cout << "Loaded font from " << font_path << " with index " << newIndex << std::endl;
-        return newIndex;
+    void PurgeFontCache() {
+        fontCache.purgeCache();
     }
 
-    bool InitTextEngine() {
-        if (FT_Init_FreeType(&ft))
-            return true;
-        return false;
-    }
-
-    void UnloadFont(int font_index) {
-        for (int i = 0; i < faces.size(); i++)
-            if (faces[i].index == font_index)
-                FT_Done_Face(faces[i].face),
-                faces.erase(faces.begin() + i);
-    }
-    FontCache fontCache;
-
-    void J2D::DrawString(const Color3& color, std::string text, float x, float y, float scale, u32 size, unsigned int font_index) {
+    void J2D::DrawString(const Color4& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font) {
         glUseProgram(0); // Fixed-function pipeline.
 
-        Font font{};
-        CachedFont* cachedFont = fontCache.getFont(size, font_index);
+        // Offset by height to render at "correct" location.
+        y += size;
 
-        //If the font doesn't exist in the cache yet.
-        if (!cachedFont) {
-            fontCache.newFont(size, font_index);
-            cachedFont = fontCache.getFont(size, font_index);
-        }
+        CachedFont* cachedFont = fontCache.getFont(size, font.index);
 
         //Set up the regular font.
-        for (const auto& f : faces)
-            if (f.index == font_index)
-                font = f;
+        //for (const auto &f : Font::GetLoadedFonts())
+        //    if (f.index == font.index)
+        //        font = f;
+
+
+
         if (font.face == nullptr)
             return;
 
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, 1.0f);
-
         FT_Set_Pixel_Sizes(font.face, 0, size);
 
-        std::vector<GLuint> textures(text.length());
+        //If the font doesn't exist in the cache yet.
+        if (!cachedFont) {
+            DEBUG("Caching font data...");
+            GLuint texture_id;
+            glGenTextures(1, &texture_id);
+            glBindTexture(GL_TEXTURE_2D, texture_id);
+            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);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 
-        //For each character
-        for (int i = 0; i < text.length(); i++) {
-            float x2, y2, w, h;
-            //If the font is in the cache already.
-            if (cachedFont->getGlyph(text.c_str()[i])) {
-                CachedGlyph* glyph = cachedFont->getGlyph(text.c_str()[i]);
+            GLsizei width = 0;
+            GLsizei max_height = 0;
 
-                glBindTexture(GL_TEXTURE_2D, *glyph->getTexture());
-                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);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+            FT_ULong charcode;
+            FT_UInt gindex;
 
-                x2 = x + glyph->x2offset * scale;
-                y2 = y - glyph->y2offset * scale; // Adjust y-coordinate
-                w = glyph->w * scale;
-                h = glyph->h * scale;
-                x += glyph->advanceX * scale;
-                y += glyph->advanceY * scale;
+            //We have to loop over the available glyphs twice as we need the
+            //final width and height of the texture before we can construct it
+            //and subsequently upload the glyph data.
 
-            } else {
-                if (FT_Load_Char(font.face, text.c_str()[i], FT_LOAD_RENDER))
-                    continue;
+            charcode = FT_Get_First_Char(font.face, &gindex);
+            //Strings are char-based so we only handle charcodes within the extended ASCII range.
+            while (gindex != 0 && charcode < 255) {
+                if (FT_Load_Char(font.face, charcode, FT_LOAD_RENDER))
+                    std::cout << "Error::FREETYPE: Failed to load charcode: " << charcode << std::endl;
 
                 FT_GlyphSlot g = font.face->glyph;
-                glGenTextures(1, &textures.at(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);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, g->bitmap.width, g->bitmap.rows, 0, GL_ALPHA, GL_UNSIGNED_BYTE, g->bitmap.buffer);
-
-                x2 = x + g->bitmap_left * scale;
-                y2 = -y - g->bitmap_top * scale; // Adjust y-coordinate
-                w = g->bitmap.width * scale;
-                h = g->bitmap.rows * scale;
-                x += (g->advance.x >> 6) * scale;
-                y += (g->advance.y >> 6) * scale;
-                cachedFont->appendGlyph(new CachedGlyph(textures.at(i), text.c_str()[i], g->bitmap_left, g->bitmap_top, g->bitmap.width, g->bitmap.rows, (g->advance.x >> 6), (g->advance.y >> 6)));
+                width += g->bitmap.width;
+                max_height = std::max(max_height, (GLsizei)g->bitmap.rows);
+                charcode = FT_Get_Next_Char(font.face, charcode, &gindex);
             }
 
-            GLfloat vertices[12] = {x2, y2, x2, y2 + h, x2 + w, y2 + h,x2, y2, x2 + w, y2 + h, x2 + w, y2};
+            fontCache.newFont(texture_id, width, max_height, size, font.index);
+            cachedFont = fontCache.getFont(size, font.index);
 
-            GLfloat textureCoordinates[12] = {0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0};
-            glTexCoordPointer(2, GL_FLOAT, sizeof(GL_FLOAT) * 2, &textureCoordinates);
-            glVertexPointer(2, GL_FLOAT, sizeof(GL_FLOAT) * 2, &vertices);
-            glDrawArrays(GL_TRIANGLES, 0, 6);
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, max_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, nullptr);
+
+            GLsizei xoffset = 0;
+
+            charcode = FT_Get_First_Char(font.face, &gindex);
+            while (gindex != 0 && charcode < 255) {
+                if (FT_Load_Char(font.face, charcode, FT_LOAD_RENDER))
+                    std::cout << "Error::FREETYPE: Failed to load charcode: " << charcode << std::endl;
+
+                FT_GlyphSlot g = font.face->glyph;
+                glTexSubImage2D(GL_TEXTURE_2D, 0, xoffset, 0, g->bitmap.width, g->bitmap.rows, GL_ALPHA, GL_UNSIGNED_BYTE, g->bitmap.buffer);
+
+                GLfloat u0 = (GLfloat)xoffset / cachedFont->getTextureWidth();
+                GLfloat u1 = u0 + (GLfloat)g->bitmap.width / cachedFont->getTextureWidth();
+
+                GLfloat v0 = 0.0f;
+                GLfloat v1 = (GLfloat)g->bitmap.rows / cachedFont->getTextureHeight();
+
+                std::array<GLfloat, 12> texcoords = {
+                    u0, v0,
+                    u0, v1,
+                    u1, v1,
+                    u0, v0,
+                    u1, v1,
+                    u1, v0
+                };
+
+                cachedFont->appendGlyph(new CachedGlyph((char)charcode, texcoords, g->bitmap_left, g->bitmap_top, g->bitmap.width, g->bitmap.rows, (g->advance.x >> 6), (g->advance.y >> 6)));
+
+                xoffset += g->bitmap.width;
+                charcode = FT_Get_Next_Char(font.face, charcode, &gindex);
+            }
         }
-        glBindTexture(GL_TEXTURE_2D, 0); // Unbind texture
+
+        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+
+        //Texture parameters are restored when the texture is bound
+        glBindTexture(GL_TEXTURE_2D, *cachedFont->getTexture());
+
+        std::vector<std::array<GLfloat, 12>> vertices(text.size());
+        std::vector<std::array<GLfloat, 12>> texcoords(text.size());
+
+        for (int i = 0; i < text.length(); i++) {
+            float x2, y2, w, h;
+            CachedGlyph *glyph = cachedFont->getGlyph(text.c_str()[i]);
+            if (glyph == nullptr) continue;
+
+            x2 = x + glyph->x2offset * scale;
+            y2 = y - glyph->y2offset * scale; // Adjust y-coordinate
+            w = glyph->w * scale;
+            h = glyph->h * scale;
+            x += glyph->advanceX * scale;
+            y += glyph->advanceY * scale;
+
+            std::array<GLfloat, 12> glyph_vertices = {
+                x2,     y2,
+                x2,     y2 + h,
+                x2 + w, y2 + h,
+                x2,     y2,
+                x2 + w, y2 + h,
+                x2 + w, y2
+            };
+            auto glyph_texcoords = glyph->getTexCoords();
+            vertices[i] = glyph_vertices;
+            texcoords[i] = glyph_texcoords;
+        }
+
+        glVertexPointer(2, GL_FLOAT, sizeof(GLfloat) * 2, vertices.data());
+        glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat) * 2, texcoords.data());
+        glDrawArrays(GL_TRIANGLES, 0, vertices.size() * 6);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glColor4f(1, 1, 1, 1);
     }
 
-    void J3D::DrawString(const Color3& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, unsigned int font_index) {
+    void J2D::DrawString(const Color3& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font) {
+        J2D::DrawString(Color4::FromColor3(color, 255), text, x, y, scale, size, font);
+    }
+
+    void J3D::DrawString(const Color3& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, const Font& font) {
         //TODO figure out what the scale should actually be mathematically.
         scale = scale * 0.002f;
         scale = -scale;
@@ -141,14 +166,14 @@ namespace JGL {
         float x = pos.x;
         float y = pos.y;
         float z = pos.z;
-        std::vector<GLuint> textures(text.length());;
+        std::vector<GLuint> textures(text.length());
         glUseProgram(0); // Fixed-function pipeline.
         glColor4f(color.r, color.g, color.b, 1.0f);
 
-        Font font;
-        for (auto& f : faces)
-            if (f.index == font_index)
-                font = f;
+        //Font font;
+        //for (auto& f : Font::GetLoadedFonts())
+            //if (f.index == font.index)
+               //font = f;
         if (font.face == NULL) {
             std::cout << "null font" << std::endl;
             return;
@@ -217,7 +242,7 @@ namespace JGL {
             glDeleteTextures(1, &texture);
 
         glBindTexture(GL_TEXTURE_2D, 0); // Unbind texture
-
+        glColor4f(1, 1, 1, 1);
         glPopMatrix();
     }
 }