Temp patch for text size bounds. Needs to be fixed properly.

Reviewed-on: #47

CMakeLists.txt

@@ -17,7 +17,7 @@ include(cmake/CPM.cmake)
 
 CPMAddPackage(
         NAME mcolor
-        URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-6.2.zip
+        URL https://git.redacted.cc/maxine/mcolor/archive/Release-1.zip
 )
 
 CPMAddPackage(
@@ -27,7 +27,7 @@ CPMAddPackage(
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-32.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-34.zip
 )
 
 CPMAddPackage(
@@ -37,7 +37,7 @@ CPMAddPackage(
 
 CPMAddPackage(
         NAME jlog
-        URL https://git.redacted.cc/josh/jlog/Prerelease-17.zip
+        URL https://git.redacted.cc/josh/jlog/Prerelease-19.zip
 )
 
 if (WIN32)

assets/shader_programs/test_vertex.glsl

@@ -72,6 +72,8 @@ vec4 DefaultInstanced() {
     return gl_ModelViewProjectionMatrix * vec4(world_pos, 0.0, 1.0);
 }
 
+#include "shared.glsl"
+
 void main() {
     GL_TEXTURE0_COORD = gl_MultiTexCoord0.xy;
     GL_TEXTURE1_COORD = gl_MultiTexCoord1.xy;

include/JGL/JGL.h

@@ -385,8 +385,9 @@ namespace JGL::J2D {
     /// @param scale The value (in both axes) to scale the text by. Defaults to {1,1}.
     /// @param size The point-size at which to render the font out. Re-using the same point-size allows efficient glyph caching.
     /// @param font The font to use for rendering. @see Font.
-    void DrawString(const Color4& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font = Fonts::Jupiteroid);
+    void DrawString(const Color4& color, const std::string& text, float x, float y, u32 size, float scale = 1.f, const Font& font = Fonts::Jupiteroid);
 
+    void DrawString(const Color4& color, const std::string& text, const Vector2& pos, u32 size, float scale = 1.f, const Font& font = Fonts::Jupiteroid);
 
     /// Draws an Arc (section of a circle) to the screen.
     /// @param color A 3-or-4 channel color value. @see class Color3, class Color4

src/renderer/OpenGL/J2D.cpp

@@ -1519,3 +1519,8 @@ void J2D::DrawSprite(const TextureAtlas* texture_atlas, const AtlasRegion& atlas
 void J2D::DrawSprite(const TextureAtlas& texture_atlas, const AtlasRegion& atlas_region, const Vector2& position, float rad_rotation, const Vector2& origin, const Vector2& scale, const Color4& color) {
     J2D::DrawSprite(&texture_atlas, atlas_region, position, rad_rotation, origin, scale, color);
 }
+
+void J2D::DrawString(const Color4 &color, const std::string &text, const Vector2 &pos, u32 size, float scale,
+                     const Font &font) {
+    DrawString(color, text, pos.x, pos.y, size, scale, font);
+}

src/renderer/OpenGL/TextRendering.cpp

@@ -98,7 +98,7 @@ namespace JGL {
         return cachedFont;
     }
 
-    void J2D::DrawString(const Color4& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font) {
+    void J2D::DrawString(const Color4& color, const std::string& text, float x, float y, u32 size, float scale, const Font& font) {
         // Offset by height to render at "correct" location.
         y += size;
 

src/types/Font.cpp

@@ -112,7 +112,11 @@ namespace JGL {
         Vector2 extents = Vector2::Zero;
 
         for(auto& f : fontCache.getFonts()) {
-            if (f->getFontIndex() == this->index) {
+            // This edit technically "works" by solving the immediate problem of text-bounds returning incorrectly,
+            // But I am **sure** this is not how it should be implemented, I will leave that to Will to fix.
+
+            if (f->getFontIndex() == this->index && f->getFontSize() == ptSize) {
+
                 for (const char &c: text) {
                     auto glyph = f->getGlyph(c);
                     extents.x += glyph->advanceX;

src/types/Shader.cpp

@@ -14,7 +14,7 @@ namespace JGL {
             bool stack_top = (already_included.size() == 0);
 
             if (stack_top) {
-                already_included.emplace_back(filepath);
+                already_included.emplace_back(filepath.string());
             }
 
             std::string ret_data = "";
@@ -42,7 +42,7 @@ namespace JGL {
                     #elif __linux__
                         std::replace(rel_include_path.begin(), rel_include_path.end(), '\\', '/');
                     #endif
-                        std::string full_include_path = extract_path(filepath) + rel_include_path;
+                        std::string full_include_path = extract_path(filepath.string()) + rel_include_path;
 
                         // Avoid including self
                         if (filepath == full_include_path) {
@@ -117,8 +117,8 @@ namespace JGL {
 
     Shader::Shader(const std::filesystem::path& vertex_source_path, const std::filesystem::path& fragment_source_path, const std::vector<std::pair<std::string, GLint>>& attribute_bindings) :
     Shader(ReadFile(vertex_source_path), ReadFile(fragment_source_path), attribute_bindings) {
-        vertexPath = vertex_source_path;
-        fragmentPath = fragment_source_path;
+        vertexPath = vertex_source_path.string();
+        fragmentPath = fragment_source_path.string();
     }
 
     void Shader::checkCompileErrors(GLuint shader, const std::string& type) {