Refactored DrawSprite

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

@@ -14,6 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # Enable Package Managers
 include(cmake/CPM.cmake)
 
+
+CPMAddPackage(
+        NAME mcolor
+        URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-3.zip
+)
+
 CPMAddPackage(
         NAME J3ML
         URL https://git.redacted.cc/josh/j3ml/archive/Release-2.2.zip
@@ -38,6 +44,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.2.zip
+)
+
 if (WIN32)
     #CPMAddPackage(
             #NAME harfbuzz
@@ -68,9 +80,13 @@ 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}
+        ${mcolor_SOURCE_DIR}/include
         ${J3ML_SOURCE_DIR}/include
         ${Event_SOURCE_DIR}/include
         ${ReWindow_SOURCE_DIR}/include
@@ -84,13 +100,13 @@ add_executable(JGL_Demo main.cpp)
 if (UNIX AND NOT APPLE)
     target_include_directories(JGL PRIVATE ${FREETYPE_INCLUDE_DIRS})
     target_link_libraries(JGL PRIVATE ${FREETYPE_LIBRARIES})
-    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} J3ML ReWindowLibrary glad jlog Event)
+    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} mcolor J3ML ReWindowLibrary glad jlog Event ReTexture)
 endif()
 
 if (WIN32)
     target_include_directories(JGL PRIVATE ${freetype_SOURCE_DIR}/include)
     target_link_libraries(JGL PRIVATE freetype)
-    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} J3ML ReWindowLibrary glad jlog Event)
+    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} mcolor J3ML ReWindowLibrary glad jlog Event ReTexture)
 endif()
 
 target_link_libraries(JGL_Demo PUBLIC JGL)

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
+* DrawPoint
+* 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

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <J3ML/J3ML.h>
-
-namespace JGL
-{
-    using namespace J3ML;
-    struct Color3 {
-        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;}
-    };
-
-
-}

include/JGL/Color4.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <JGL/Color3.h>
-
-namespace JGL
-{
-    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;
-    };
-}

include/JGL/Colors.h

@@ -1,178 +0,0 @@
-#pragma once
-
-
-#include <JGL/Color3.h>
-
-namespace JGL
-{
-    namespace Colors {
-        namespace Primary {
-            static const Color3 Red{255, 0, 0};
-            static const Color3 Green{0, 255, 0};
-            static const Color3 Blue{0, 0, 255};
-            static const Color3 White{255, 255, 255};
-            static const Color3 Black{0, 0, 0};
-            static const Color3 Gray{128, 128, 128};
-            static const Color3 DarkGray{192, 192, 192};
-            static const Color3 LightGray{64, 64, 64};
-            static const Color3 Yellow{255, 255, 0};
-        }
-        using namespace Primary;
-        namespace Reds {
-            static const Color3 Fuchsia {255, 0, 255};
-            static const Color3 LightSalmon{255, 160, 122};
-            static const Color3 Salmon{250, 128, 114};
-            static const Color3 DarkSalmon{233, 150, 122};
-            static const Color3 LightCoral{240, 128, 128};
-            static const Color3 IndianRed{205, 92, 92};
-            static const Color3 Crimson{220, 20, 60};
-            static const Color3 Firebrick{178, 34, 34};
-            static const Color3 DarkRed{139, 0, 0};
-        }
-        namespace Oranges {
-            static const Color3 Coral{255, 127, 80};
-            static const Color3 Tomato{255, 99, 71};
-            static const Color3 OrangeRed{255, 69, 0};
-            static const Color3 Gold{255, 215, 0};
-            static const Color3 Orange{255, 165, 0};
-            static const Color3 DarkOrange{255, 140, 0};
-        }
-        namespace Yellows {
-            static const Color3 LightYellow{255, 255, 224};
-            static const Color3 LemonChiffon{255, 250, 205};
-            static const Color3 LightGoldenrodYellow{250, 250, 210};
-            static const Color3 PapayaWhip{255, 239, 213};
-            static const Color3 Moccasin{255, 228, 181};
-            static const Color3 PeachPuff{255, 218, 185};
-            static const Color3 PaleGoldenrod{238, 232, 170};
-            static const Color3 Khaki{240, 230, 140};
-            static const Color3 DarkKhaki{189, 183, 107};
-        }
-        namespace Greens {
-            static const Color3 LawnGreen{124, 252, 0};
-            static const Color3 Chartreuse{127, 255, 0};
-            static const Color3 LimeGreen{50, 205, 50};
-            static const Color3 ForestGreen{34, 139, 34};
-            static const Color3 DarkGreen{0, 100, 0};
-            static const Color3 GreenYellow{173, 255, 47};
-            static const Color3 YellowGreen{154, 205, 50};
-            static const Color3 SpringGreen{0, 255, 127};
-            static const Color3 MediumSpringGreen{0, 250, 154};
-            static const Color3 LightGreen{144, 238, 144};
-            static const Color3 PaleGreen{152, 251, 152};
-            static const Color3 DarkSeaGreen{143, 188, 143};
-            static const Color3 MediumSeaGreen{60, 179, 113};
-            static const Color3 SeaGreen{46, 139, 87};
-            static const Color3 DarkOliveGreen{85, 107, 47};
-            static const Color3 OliveDrab{107, 142, 35};
-            static const Color3 Lime{0, 255, 0};
-            static const Color3 Olive{128, 128, 0};
-        }
-        namespace Cyans {
-            static const Color3 LightCyan{224, 255, 255};
-            static const Color3 Cyan{0, 255, 255};
-            static const Color3 Aqua{0, 255, 255};
-            static const Color3 Aquamarine{127, 255, 212};
-            static const Color3 MediumAquamarine{102, 205, 170};
-            static const Color3 PaleTurquoise{175, 238, 238};
-            static const Color3 Turquoise{64, 224, 208};
-            static const Color3 MediumTurquoise{72, 209, 204};
-            static const Color3 DarkTurquoise{0, 206, 209};
-            static const Color3 LightSeaGreen{32, 178, 170};
-            static const Color3 CadetBlue{95, 158, 160};
-            static const Color3 DarkCyan{0, 139, 139};
-            static const Color3 Teal{0, 128, 128};
-        }
-        namespace Blues {
-            static const Color3 PowderBlue{176, 224, 230};
-            static const Color3 LightBlue{173, 216, 230};
-            static const Color3 LightSkyBlue{135, 206, 250};
-            static const Color3 SkyBlue{135, 206, 235};
-            static const Color3 DeepSkyBlue{0, 191, 255};
-            static const Color3 LightSteelBlue{176, 196, 222};
-            static const Color3 DodgerBlue{30, 144, 255};
-            static const Color3 CornflowerBlue{100, 149, 237};
-            static const Color3 SteelBlue{70, 130, 180};
-            static const Color3 RoyalBlue{65, 105, 225};
-            static const Color3 MediumBlue{0, 0, 205};
-            static const Color3 DarkBlue{0, 0, 139};
-            static const Color3 Navy{0, 0, 128};
-            static const Color3 MidnightBlue{25, 25, 112};
-            static const Color3 MediumSlateBlue{123, 104, 238};
-            static const Color3 SlateBlue{106, 90, 205};
-            static const Color3 DarkSlateBlue{72, 61, 139};
-        }
-
-
-        namespace Purples {
-            static const Color3 Lavender{230, 230, 250};
-            static const Color3 Thistle{216, 191, 216};
-            static const Color3 Plum{221, 160, 221};
-            static const Color3 Violet{238, 160, 221};
-            static const Color3 Orchid{218, 112, 214};
-            static const Color3 Fuchsia{255, 0, 255};
-            static const Color3 Magenta{255, 0, 255};
-            static const Color3 MediumOrchid{186, 85, 211};
-            static const Color3 MediumPurple{147, 112, 219};
-            static const Color3 BlueViolet{138, 43, 226};
-            static const Color3 DarkViolet{148, 0, 211};
-            static const Color3 DarkOrchid{153, 50, 204};
-            static const Color3 DarkMagenta{139, 0, 128};
-            static const Color3 Purple{128, 0, 128};
-            static const Color3 Indigo{75, 0, 130};
-        }
-        namespace Pinks {
-            static const Color3 Pink{255, 129, 203};
-            static const Color3 LightPink{255, 182, 193};
-            static const Color3 HotPink{255, 105, 180};
-            static const Color3 DeepPink{255, 20, 147};
-            static const Color3 PaleVioletRed{219, 112, 147};
-            static const Color3 MediumVioletRed{199, 21, 133};
-        }
-        namespace Whites {
-            static const Color3 Snow{255, 250, 250};
-            static const Color3 Honeydew{240, 255, 240};
-            static const Color3 MintCream{245, 255, 250};
-            static const Color3 Azure{240, 255, 255};
-            static const Color3 AliceBlue{240, 248, 255};
-            static const Color3 GhostWhite{248, 248, 255};
-            static const Color3 WhiteSmoke{245, 245, 245};
-            static const Color3 SeaShell{255, 245, 238};
-            static const Color3 Beige{245, 245, 220};
-            static const Color3 OldLace{253, 245, 230};
-            static const Color3 FloralWhite{255, 250, 240};
-            static const Color3 Ivory{255, 255, 240};
-            static const Color3 AntiqueWhite{250, 240, 215};
-            static const Color3 Linen{250, 240, 230};
-            static const Color3 LavenderBlush{255, 240, 245};
-            static const Color3 MistyRose{255, 228, 255};
-        }
-        namespace Grays {
-            static const Color3 Gainsboro{220, 220, 220};
-            static const Color3 LightGray{211, 211, 211};
-            static const Color3 Silver{192, 192, 192};
-            static const Color3 DimGray{105, 105, 105};
-            static const Color3 LightSlateGray{119, 136, 153};
-            static const Color3 SlateGray{112, 128, 144};
-            static const Color3 DarkSlateGray{47, 79, 79};
-        }
-        namespace Browns {
-            static const Color3 CornSilk{255, 248, 220};
-            static const Color3 BlanchedAlmond{255, 235, 205};
-            static const Color3 Bisque{255, 228, 196};
-            static const Color3 NavajoWhite{255, 222, 173};
-            static const Color3 Wheat{254, 222, 179};
-            static const Color3 BurlyWood{222, 184, 135};
-            static const Color3 Tan{210, 180, 140};
-            static const Color3 RosyBrown{188, 143, 143};
-            static const Color3 SandyBrown{244, 164, 96};
-            static const Color3 GoldenRod{218, 165, 32};
-            static const Color3 Peru{205, 133, 63};
-            static const Color3 Chocolate{210, 105, 30};
-            static const Color3 SaddleBrown{139, 69, 19};
-            static const Color3 Sienna{160, 82, 45};
-            static const Color3 Brown{164, 42, 42};
-            static const Color3 Maroon{128, 0, 0};
-        }
-    }
-}

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

@@ -5,12 +5,17 @@
 #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:
     char character;
@@ -25,6 +30,7 @@ public:
     const std::array<GLfloat, 12> getTexCoords() const;
 };
 
+/// Represents a Font object as it exists in the font-cache.
 class JGL::CachedFont {
 private:
     std::map<char, CachedGlyph*> glyphs;
@@ -39,8 +45,8 @@ public:
     CachedGlyph* getGlyph(char c);
     std::map<char, CachedGlyph*> getGlyphs();
     const GLuint* getTexture();
-    const GLsizei getTextureWidth() const;
-    const GLsizei getTextureHeight() const;
+    GLsizei getTextureWidth() const;
+    GLsizei getTextureHeight() const;
     CachedFont(GLuint texture_id, GLsizei texture_width, GLsizei texture_height, unsigned int font_size, unsigned int font_index);
 };
 
@@ -55,3 +61,7 @@ public:
     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,26 @@
-//
-// 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 <Color3.hpp>
+#include <Color4.hpp>
+#include <Colors.hpp>
+#include <JGL/Texture.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>
@@ -15,28 +28,21 @@
 #include <J3ML/Geometry/Capsule.h>
 #include <J3ML/Geometry/TriangleMesh.h>
 
-// OpenGL Wrapper for rendering 2D graphics primitives in both a 2D and 3D context
+
+/// 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: Implement HSV and other color representation conversions
     struct HSV {
         float hue;
         float saturation;
         float value;
     };
 
+    /// TODO: Migrate to using J3ML's definition once finished (hint hint)
     struct Triangle2D
     {
         Vector2 A;
@@ -44,20 +50,14 @@ namespace JGL {
         Vector2 C;
     };
 
-    struct Triangle3D
-    {
-        Vector3 A;
-        Vector3 B;
-        Vector3 C;
-    };
-
-    bool Update(const Vector2& window_size);
-    bool InitTextEngine();
-    int LoadFont(const std::string& font_path);
+    void Update(const Vector2& window_size);
     void PurgeFontCache();
 
-    void UnloadFont(int font_index);
-    // TODO: implement correct coloring
+    // TODO: Implement
+    void SetActiveFont(const Font& font);
+
+    // TODO: Overrides specifically for Color3 are not **strictly** necessary, Color3 and Color4 should implicitly convert back and forth.
+
 
     /// Drawing functions for primitive 2D Shapes.
     /// Each function is overloaded with Color3 and Color4 for optional transparency.
@@ -73,12 +73,12 @@ namespace JGL {
         void End();
 
         /// Plots a single pixel on the screen.
-        /// @param color  A 3-or-4 channel color value. @see classes Color3, Color4
+        /// @param color  A 3-or-4 channel color value. @see class Color3, class Color4
         /// @param coordinates The pixel-point on-screen at which to plot the pixel.
-        void DrawPixel(const Color3& color, const Vector2& coordinates);
-        void DrawPixel(const Color3& color, float x, float y);
-        void DrawPixel(const Color4& color, const Vector2& coordinates);
-        void DrawPixel(const Color4& color, float x, float y);
+        void DrawPoint(const Color3& color, const Vector2& coordinates, float radius = 1.f);
+        void DrawPoint(const Color3& color, float x, float y, float radius = 1.f);
+        void DrawPoint(const Color4& color, const Vector2& coordinates, float radius = 1.f);
+        void DrawPoint(const Color4& color, float x, float y, float radius = 1.f);
 
         /// Plots a line (segment) on the screen.
         /// @param color A 3-or-4 channel color value. @see classes Color3, Color4.
@@ -86,7 +86,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);
 
@@ -100,6 +100,38 @@ 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 by passing a GLuint that represents a handle to a loaded texture.
+        /// @param texture
+        /// @param position
+        /// @param origin The center point around which the image should have all transformations applied to it.
+        /// @param scale The scale transformation for the image. X and Y axis are independently-scalable.
+        /// @param color A 32-bit RGBA value represented as four unsigned 8-bit integers.
+        /// @param inversion
+        /// @see class Texture
+        void DrawSprite(const Texture& texture,
+                        const Vector2& position,
+                        const Vector2& origin = Vector2(0,0),
+                        const Vector2& scale = Vector2(1,1),
+                        const Color4& color = Colors::White,
+                        Inversion inversion = Inversion::None);
+        void DrawSprite(const Texture& texture,
+                        float positionX, float positionY,
+                        float originX = 0, float originY = 0,
+                        float scaleX = 1, float scaleY = 1,
+                        const Color4& color = Colors::White,
+                        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);
@@ -109,7 +141,7 @@ namespace JGL {
         void FillGradientRect(const Color3& color1, const Color3& color2, const 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.
@@ -121,23 +153,37 @@ namespace JGL {
         void FillCircle(const Color3& color, const Vector2& center, float radius, unsigned int subdivisions = 8);
 
         /// Draws an outline of a triangle on the screen.
+        /// @param color
+        /// @param tri
+        /// @param thickness
         void OutlineTriangle(const Color4& color, const Triangle2D& tri, float thickness = 1);
         void OutlineTriangle(const Color3& color, const Triangle2D& tri, float thickness = 1);
-        // TODO: Implement an overload that simply takes 3 Vector3's
+        void OutlineTriangle(const Color4& color,
+                             const Vector2& triA, const Vector2& triB, const Vector2& triC,
+                             float thickness = 1);
+        void OutlineTriangle(const Color3& color,
+                             const Vector2& triA, const Vector2& triB, const Vector2& triC,
+                             float thickness = 1);
+        // TODO: Take more Focalin
 
         /// 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 Color4& color, const Vector2& triA, const Vector2& triB, const Vector2& triC);
         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 Color4& color, const std::string& text, float x, float y, float scale, u32 size, unsigned int font_index);
-        void DrawString(const Color3& color, const 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);
@@ -145,6 +191,7 @@ namespace JGL {
         void OutlineRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
     }
 
+    /// Drawing functions for primitive 3D Shapes.
     namespace J3D {
         void Begin();
         void End();
@@ -159,7 +206,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 Color4& 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/Texture.h

@@ -0,0 +1,50 @@
+#pragma once
+#include <ReTexture/Texture.h>
+#include <J3ML/LinearAlgebra.h>
+#include <Color3.hpp>
+#include <Color4.hpp>
+#include <glad/glad.h>
+
+namespace JGL {
+    using namespace ReTexture;
+    enum class TextureFilteringMode : u8 {
+        NEAREST = 0, //Fastest for 2D, Sometimes causes graphical issues.
+        BILINEAR = 1, //Fast and pretty, The best for 2D.
+
+        MIPMAP_NEAREST = 2, //Nearest with mipmaps. The fastest for 3D, Sometimes causes graphical issues. Uses more vram.
+        MIPMAP_BILINEAR = 3, //Bilinear with mipmaps, Fast and pretty. Uses more vram.
+        MIPMAP_TRILINEAR = 4 //The prettiest. Still decent speed. Uses more vram.
+    };
+
+    enum class TextureWrappingMode : u8 {
+        REPEAT = 0,
+        MIRRORED_REPEAT = 1,
+        CLAMP_TO_EDGE = 2,
+        CLAMP_TO_BORDER = 3 //Effectively the same as clamp_to_edge
+    };
+
+    /// Represents texture data loaded on the GPU. Contains a handle that can be passed to OpenGL draw calls.
+    class Texture {
+    private:
+        GLuint texture_handle = 0;
+        Vector2 texture_size = {0, 0};
+        ReTexture::TextureFlag texture_flags;
+        ReTexture::TextureFormat texture_format;
+        TextureFilteringMode texture_filtering_mode;
+        TextureWrappingMode texture_wrapping_mode;
+        void load(SoftwareTexture* software_texture, const Vector2& size, const TextureFormat& format, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode);
+    public:
+        explicit Texture(const std::string& file, TextureFilteringMode filtering_mode = TextureFilteringMode::BILINEAR, TextureWrappingMode wrapping_mode = TextureWrappingMode::CLAMP_TO_EDGE);
+        Texture(const std::string& file, const TextureFlag& flags, TextureFilteringMode filtering_mode = TextureFilteringMode::BILINEAR, TextureWrappingMode wrapping_mode = TextureWrappingMode::CLAMP_TO_EDGE);
+    public:
+        GLuint GetGLTextureHandle() const;
+        Vector2 GetDimensions() const;
+        TextureFilteringMode GetFilteringMode() const;
+        TextureFlag GetFlags() const;
+        TextureFormat GetFormat() const;
+        std::vector<Color4> GetPixelData() const;
+
+        void Erase();
+    };
+
+}

include/JGL/enums.h

@@ -0,0 +1,33 @@
+#pragma once
+
+namespace JGL {
+    enum class Inversion : u8 {
+        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));
+    }
+    inline bool operator&(Inversion a, Inversion b) {
+        return (u8)a & (u8)b;
+    }
+}
+
+namespace JGL {
+    enum class Gradient : u8 {
+        Vertical = 0,
+        Horizontal = 1,
+        DiagonalTopLeft = 2,
+        DiagonalBottomLeft = 4
+    };
+
+    inline Gradient operator|(Gradient a, Gradient b) {
+        return static_cast<Gradient>(static_cast<int>(a) | static_cast<int>(b));
+    }
+
+    inline bool operator&(Gradient a, Gradient b) {
+        return (u8)a & (u8)b;
+    }
+}

main.cpp

@@ -1,12 +1,16 @@
-#include <glad/glad.h>
+
 #include <JGL/JGL.h>
 #include <rewindow/types/window.h>
-#include <JGL/Colors.h>
+#include <Colors.hpp>
 #include <J3ML/LinearAlgebra/Vector2.h>
+#include <JGL/Font.h>
+#include <jlog/jlog.hpp>
+#include <ReTexture/Texture.h>
 
 using J3ML::LinearAlgebra::Vector2;
 using namespace JGL;
 
+Texture* image;
 //The Re3D style base projection.
 std::vector<GLfloat> perspective(float fov, float aspect, float nearPlane, float farPlane) {
     std::vector<float> result(16);
@@ -57,8 +61,8 @@ struct point {
     GLfloat t;
 };
 
-int FreeSans;
-int Jupiteroid;
+JGL::Font FreeSans;
+JGL::Font Jupiteroid;
 
 class JGLDemoWindow : public ReWindow::RWindow
 {
@@ -69,11 +73,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 +88,7 @@ public:
         glEnable(GL_DEPTH_TEST);
         glDepthFunc(GL_LESS);
         glDepthMask(GL_TRUE);
+        image = new Texture("assets/sprites/Re3D.png", TextureFilteringMode::BILINEAR);
     }
 
     Vector3 textAngle = {0,0,0};
@@ -98,29 +103,33 @@ public:
         ///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});
-            J3D::DrawString(JGL::Colors::Red, "JGL Sample Text", {-0.33, -0.1, 1.0f},textAngle,  1.f, 32, FreeSans);
+            J3D::DrawLine(Colors::Red, {-0.33,-0.125,1}, {-1,-0.125,1});
+            J3D::DrawLine(Colors::Red, {-0.33,-0.125,1}, {-0.33,0.25,1});
+            J3D::DrawString(Colors::Red, "JGL Sample Text", {-0.33, -0.1, 1.0f},textAngle,  1.f, 32, FreeSans);
         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::FillRect(Color4::FromColor3(Colors::Pinks::HotPink), {68, 120}, {32, 32});
+            J2D::DrawSprite(*image, {200, 252}, {0.5, 0.5}, {2, 1});
+            J2D::FillRect(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);
-            J2D::FillRoundedRect(JGL::Colors::Purples::BlueViolet, {300, 52}, {100, 100}, 8, 4);
+            J2D::FillRoundedRect(Colors::Red, {200, 52}, {100, 100}, 8, 8);
+            J2D::FillRoundedRect(Colors::Purples::BlueViolet, {300, 52}, {100, 100}, 8, 4);
 
-            J2D::FillCircle(JGL::Colors::White, {52, 204}, 50, 24);
-            J2D::OutlineCircle(JGL::Colors::White, {153, 204}, 50, 24);
+            J2D::FillCircle(Colors::White, {52, 204}, 50, 24);
+            J2D::OutlineCircle(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);
+            J2D::DrawGradientLine(Colors::Red, 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(Colors::Gray, {0, 0}, result);
+            J2D::DrawString(Colors::Green, "Jupteroid Font", 0.f, 0, 1.f, 16, Jupiteroid);
+            J2D::DrawString(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(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();
     }
 

reci/scripts/builddeps.reci

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

src/FontCache.cpp

@@ -1,5 +1,4 @@
 #include <JGL/FontCache.h>
-#include <iostream>
 
 using namespace JGL;
 
@@ -37,6 +36,7 @@ unsigned int JGL::CachedFont::getFontIndex() {
     return font_index;
 }
 
+//TODO make this code go faster.
 CachedGlyph* JGL::CachedFont::getGlyph(char c) {
     auto it = glyphs.find(c);
     if (it != glyphs.end())
@@ -60,11 +60,11 @@ const GLuint* CachedFont::getTexture() {
     return &texture;
 }
 
-const GLsizei CachedFont::getTextureWidth() const {
+GLsizei CachedFont::getTextureWidth() const {
     return texture_width;
 }
 
-const GLsizei CachedFont::getTextureHeight() const {
+GLsizei CachedFont::getTextureHeight() const {
     return texture_height;
 }
 

src/JGL.cpp

@@ -4,10 +4,11 @@
 
 #include <JGL/JGL.h>
 #include <glad/glad.h>
-#include <JGL/Color3.h>
+#include <Color3.hpp>
 #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;
@@ -23,11 +24,11 @@ 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();
@@ -37,7 +38,11 @@ namespace JGL {
         glPushMatrix();
         glLoadIdentity();
 
-        glGetIntegerv(GL_ACTIVE_TEXTURE, &activeTextureUnit);
+        //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);
@@ -86,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();
@@ -112,10 +116,8 @@ namespace JGL {
         if (wasColorArrayEnabled)
             glEnableClientState(GL_COLOR_ARRAY);
 
-        /*
-        //Select whatever texture unit was selected before.
+        //Select whatever texture_handle 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]);
@@ -123,14 +125,109 @@ namespace JGL {
         inJ2D = false;
     }
 
+    void J2D::DrawSprite(const Texture& texture, const Vector2& pos, const Vector2& origin, const Vector2& scale, const Color4& color, Inversion inversion) {
+        if (!inJ2D)
+            ERROR("Attempt to Render J2D element before J2D begin.")
+
+
+        const Vector2 size = texture.GetDimensions();
+
+        std::array<Vector2, 4> textureCoordinates = {Vector2(0, 0), Vector2(0, 1), Vector2(1, 1), Vector2(1, 0)};
+
+        // TODO: Kind of a mess, refactor to be more sensible later.
+        // Factors in scaling and origin correctly.
+        // i.e. to render at 2x size, from the center, at coords XY, use {2, 2} scale, and {0.5, 0.5} offset.
+        const Vector2 offset = origin * size;
+
+        Vector2 pos2 = pos - offset*scale;
+        Vector2 scaled_size = scale * size;
+        Vector2 size2 = scaled_size;
+
+        const Vector2 vertices[] = {
+                pos2,                                 // Top-left vertex
+                {pos2.x, pos2.y + size2.y},            // Bottom-left
+                {pos2.x + size2.x, pos2.y + size2.y},   // Bottom-right
+                {pos2.x + size2.x, pos2.y}             // Top-right
+        };
+
+        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)};
+
+        glColor4ubv(color.ptr());
+        glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
+        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::DrawSprite(const Texture& texture, float positionX, float positionY, float originX, float originY, float scaleX, float scaleY, const Color4& color, Inversion inversion)
+    {
+        DrawSprite(texture,
+                   {positionX, positionX},
+                   {originX, originY},
+                   {scaleX, scaleY},
+                   color,
+                   inversion);
+    }
+
+    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.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
+        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.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
+        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::FillRect(const Color4& color, const Vector2& pos, const Vector2& size) {
         if (!inJ2D)
             ERROR("Attempt to Render J2D element before J2D begin.")
 
         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}};
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glColor4f(color.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
         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) {
@@ -167,13 +264,14 @@ namespace JGL {
             glColorPointer(4, GL_FLOAT, 0, colors.data());
             glDrawArrays(GL_QUADS, 0, 4);
         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) {
         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.")
 
@@ -186,7 +284,7 @@ namespace JGL {
         J2D::FillCircle(color, {pos.x + size.x - radius, pos.y + size.y - radius}, radius, subdivisions);
     }
 
-    void J2D::FillRoundedRect(const JGL::Color3& color, const J3ML::LinearAlgebra::Vector2& pos, const J3ML::LinearAlgebra::Vector2& size, float radius, unsigned int subdivisions) {
+    void J2D::FillRoundedRect(const Color3& color, const J3ML::LinearAlgebra::Vector2& pos, const J3ML::LinearAlgebra::Vector2& size, float radius, unsigned int subdivisions) {
         J2D::FillRoundedRect({color.r, color.g, color.b, 255}, pos, size, radius, subdivisions);
     }
 
@@ -197,9 +295,13 @@ namespace JGL {
         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}};
 
         glLineWidth(thickness);
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glColor4f(color.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
         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) {
@@ -213,9 +315,13 @@ namespace JGL {
         Vector2 vertices[] = {A, B};
 
         glLineWidth(thickness);
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glColor4f(color.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
         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) {
@@ -244,6 +350,7 @@ namespace JGL {
             glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
             glDrawArrays(GL_LINES, 0, 2);
         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) {
@@ -257,27 +364,32 @@ namespace JGL {
         J2D::DrawGradientLine({color1.r, color1.g, color1.b, 255}, {color2.r, color2.g, color2.b, 255}, {x, y}, {w, h}, thickness);
     }
 
-    void J2D::DrawPixel(const Color4& color, const Vector2& coordinates) {
+    void J2D::DrawPoint(const Color4& color, const Vector2& coordinates, float radius) {
         if (!inJ2D)
             ERROR("Attempt to Render J2D element before J2D begin.");
 
         Vector2 vertices[] = {coordinates};
 
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glPointSize(radius);
+        glColor4f(color.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
-        glDrawArrays(GL_LINES, 0, 1);
+        glDrawArrays(GL_POINTS, 0, 1);
+        glColor4f(baseColor[0], baseColor[1], baseColor[2], baseColor[3]);
     }
 
-    void J2D::DrawPixel(const Color3& color, const Vector2& coordinates) {
-        J2D::DrawPixel({color.r, color.g, color.b, 255}, coordinates);
+    void J2D::DrawPoint(const Color3& color, const Vector2& coordinates, float radius) {
+        J2D::DrawPoint({color.r, color.g, color.b, 255}, coordinates);
     }
 
-    void J2D::DrawPixel(const Color4& color, float x, float y) {
-        DrawPixel(color, {x, y});
+    void J2D::DrawPoint(const Color4& color, float x, float y, float radius) {
+        DrawPoint(color, {x, y});
     }
 
-    void J2D::DrawPixel(const Color3& color, float x, float y) {
-        DrawPixel({color.r, color.g, color.b, 255}, {x, y});
+    void J2D::DrawPoint(const Color3& color, float x, float y, float radius) {
+        DrawPoint({color.r, color.g, color.b, 255}, {x, y});
     }
 
     void J2D::OutlineCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions, float thickness) {
@@ -295,9 +407,13 @@ namespace JGL {
         }
 
         glLineWidth(thickness);
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glColor4f(color.RedChannelNormalized(),
+                  color.GreenChannelNormalized(),
+                  color.BlueChannelNormalized(),
+                  color.AlphaChannelNormalized());
         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) {
@@ -317,9 +433,10 @@ namespace JGL {
                 y = radius * cos(angle) + center.y,
                 vertices.push_back({x, y});
 
-        glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
+        glColor4ubv(color.ptr());
         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) {
@@ -336,13 +453,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.")
 
@@ -351,9 +469,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);
     }
 
@@ -361,6 +502,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))
@@ -377,7 +519,7 @@ namespace JGL {
             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,
@@ -393,12 +535,10 @@ 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);
 
@@ -408,7 +548,7 @@ namespace JGL {
         if (wasTexture2DEnabled)
             glDisable(GL_TEXTURE_2D);
 
-        if (wasBlendEnabled)
+        if (!wasBlendEnabled)
             glDisable(GL_BLEND);
 
         if (wasCullFaceEnabled)
@@ -430,6 +570,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/Font.cpp

@@ -0,0 +1,155 @@
+
+#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) {
+        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,72 +1,42 @@
 #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;
-    }
-
-    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 PurgeFontCache() {
         fontCache.purgeCache();
     }
 
-    //TODO multi-texturing for 8x speedup. I tried. We'll come back to it later.
-    void J2D::DrawString(const Color4& color, const 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;
+
+        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;
 
@@ -74,6 +44,7 @@ namespace JGL {
 
         //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);
@@ -91,7 +62,7 @@ namespace JGL {
             FT_UInt gindex;
 
             //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
+            //final width and height of the texture_handle before we can construct it
             //and subsequently upload the glyph data.
 
             charcode = FT_Get_First_Char(font.face, &gindex);
@@ -106,8 +77,8 @@ namespace JGL {
                 charcode = FT_Get_Next_Char(font.face, charcode, &gindex);
             }
 
-            fontCache.newFont(texture_id, width, max_height, size, font_index);
-            cachedFont = fontCache.getFont(size, font_index);
+            fontCache.newFont(texture_id, width, max_height, size, font.index);
+            cachedFont = fontCache.getFont(size, font.index);
 
             glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, max_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, nullptr);
 
@@ -145,11 +116,11 @@ namespace JGL {
 
         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
+        //Texture parameters are restored when the texture_handle is bound
         glBindTexture(GL_TEXTURE_2D, *cachedFont->getTexture());
 
-        std::vector<GLfloat> vertices;
-        std::vector<GLfloat> texcoords;
+        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;
@@ -172,22 +143,24 @@ namespace JGL {
                 x2 + w, y2
             };
             auto glyph_texcoords = glyph->getTexCoords();
-
-            vertices.insert(vertices.end(), glyph_vertices.begin(), glyph_vertices.end());
-            texcoords.insert(texcoords.end(), glyph_texcoords.begin(), glyph_texcoords.end());
+            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() / 2);
+        glDrawArrays(GL_TRIANGLES, 0, vertices.size() * 6);
         glBindTexture(GL_TEXTURE_2D, 0);
+        glColor4f(1, 1, 1, 1);
     }
 
-    void J2D::DrawString(const Color3& color, const std::string& text, float x, float y, float scale, u32 size, unsigned int font_index) {
-        J2D::DrawString(Color4::FromColor3(color, 255), text, x, y, scale, size, 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, unsigned int font_index) {
+
+
+    void J3D::DrawString(const Color4& 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;
@@ -195,14 +168,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);
+        glColor4ubv(color.ptr());
 
-        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;
@@ -270,8 +243,8 @@ namespace JGL {
         for (unsigned int& texture : textures)
             glDeleteTextures(1, &texture);
 
-        glBindTexture(GL_TEXTURE_2D, 0); // Unbind texture
-
+        glBindTexture(GL_TEXTURE_2D, 0); // Unbind texture_handle
+        glColor4f(1, 1, 1, 1);
         glPopMatrix();
     }
 }

src/JGL/Texture.cpp

@@ -0,0 +1,161 @@
+#include <JGL/Texture.h>
+#include <iostream>
+
+using namespace ReTexture;
+
+namespace JGL
+{
+    Texture::Texture(const std::string &file, const ReTexture::TextureFlag &flags, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode)
+    {
+        auto *t = new ReTexture::SoftwareTexture(file, flags);
+
+
+        load(t, {(float) t->getWidth(), (float) t->getHeight()}, t->getTextureFormat(), filtering_mode,
+             wrapping_mode);
+        texture_flags = flags;
+
+        delete t;
+    }
+
+    Texture::Texture(const std::string &file, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode) {
+        auto *t = new SoftwareTexture(file);
+
+        load(t, {(float) t->getWidth(), (float) t->getHeight()}, t->getTextureFormat(), filtering_mode,
+             wrapping_mode);
+        texture_flags = TextureFlag::NONE;
+
+        delete t;
+    }
+
+    void Texture::load(SoftwareTexture *software_texture, const Vector2 &size, const TextureFormat &format,
+                           TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode) {
+            glGenTextures(1, &texture_handle);
+            glBindTexture(GL_TEXTURE_2D, texture_handle);
+
+            if (format == TextureFormat::RGBA)
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (int) size.x, (int) size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+                             software_texture->pixelData.data());
+
+            else if (format == TextureFormat::RGB)
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, (int) size.x, (int) size.y, 0, GL_RGB, GL_UNSIGNED_BYTE,
+                             software_texture->pixelData.data());
+
+            if (wrapping_mode == TextureWrappingMode::CLAMP_TO_EDGE)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE),
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+            else if (wrapping_mode == TextureWrappingMode::REPEAT)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT),
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+            else if (wrapping_mode == TextureWrappingMode::MIRRORED_REPEAT)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT),
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
+
+            else if (wrapping_mode == TextureWrappingMode::CLAMP_TO_BORDER)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER),
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+            if (filtering_mode == TextureFilteringMode::NEAREST)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST),
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+            else if (filtering_mode == TextureFilteringMode::BILINEAR)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR),
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+            else if (filtering_mode == TextureFilteringMode::MIPMAP_NEAREST ||
+                     filtering_mode == TextureFilteringMode::MIPMAP_BILINEAR ||
+                     filtering_mode == TextureFilteringMode::MIPMAP_TRILINEAR) {
+                //3 mipmap levels.
+                auto *m1 = new SoftwareTexture(software_texture->downscale(2));
+                auto *m2 = new SoftwareTexture(software_texture->downscale(4));
+                auto *m3 = new SoftwareTexture(software_texture->downscale(8));
+
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 3);
+
+                if (format == TextureFormat::RGBA) {
+                    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, m1->getWidth(), m1->getHeight(), 0, GL_RGBA,
+                                 GL_UNSIGNED_BYTE, m1->pixelData.data());
+                    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA, m2->getWidth(), m2->getHeight(), 0, GL_RGBA,
+                                 GL_UNSIGNED_BYTE, m2->pixelData.data());
+                    glTexImage2D(GL_TEXTURE_2D, 3, GL_RGBA, m3->getWidth(), m3->getHeight(), 0, GL_RGBA,
+                                 GL_UNSIGNED_BYTE, m3->pixelData.data());
+                } else if (format == TextureFormat::RGB) {
+                    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGB, m1->getWidth(), m1->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE,
+                                 m1->pixelData.data());
+                    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGB, m2->getWidth(), m2->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE,
+                                 m2->pixelData.data());
+                    glTexImage2D(GL_TEXTURE_2D, 3, GL_RGB, m3->getWidth(), m3->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE,
+                                 m3->pixelData.data());
+                }
+
+                if (filtering_mode == TextureFilteringMode::MIPMAP_NEAREST)
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST),
+                            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+                else if (filtering_mode == TextureFilteringMode::MIPMAP_BILINEAR)
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST),
+                            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+                else if (filtering_mode == TextureFilteringMode::MIPMAP_TRILINEAR)
+                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR),
+                            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+                delete m1;
+                delete m2;
+                delete m3;
+            }
+            glBindTexture(GL_TEXTURE_2D, 0);
+
+            texture_size = size;
+            texture_format = format;
+            texture_filtering_mode = filtering_mode;
+    }
+
+    std::vector<Color4> JGL::Texture::GetPixelData() const {
+            std::vector<Color4> result((size_t) (texture_size.x * texture_size.y));
+            glBindTexture(GL_TEXTURE_2D, texture_handle);
+
+            if (texture_format == TextureFormat::RGBA) {
+                glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, result.data());
+                return result;
+            }
+
+            //if RGB
+            std::vector<Color3> color3((size_t) (texture_size.x * texture_size.y));
+
+            glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, color3.data());
+
+            for (const auto &c: color3)
+                result.emplace_back(c);
+
+            return result;
+        }
+
+        void Texture::Erase() {
+            if (texture_handle != 0)
+                glDeleteTextures(1, &texture_handle);
+        }
+
+        GLuint Texture::GetGLTextureHandle() const {
+            return texture_handle;
+        }
+
+        Vector2 Texture::GetDimensions() const {
+            return texture_size;
+        }
+
+        TextureFlag Texture::GetFlags() const {
+            return texture_flags;
+        }
+
+        TextureFormat Texture::GetFormat() const {
+            return texture_format;
+        }
+
+    TextureFilteringMode Texture::GetFilteringMode() const {
+        return texture_filtering_mode;
+    }
+
+}