Fix emscripten memory issue

Author: portersky

CMakeLists.txt

@@ -96,8 +96,9 @@ elseif (WIN32)
 elseif(EMSCRIPTEN)
     message("Platform: Emscripten")
     add_compile_definitions(
-        "GL_GLEXT_PROTOTYPES"
-        "GL3_PROTOTYPES"
+        "GL_GLEXT_PROTOTYPES=1"
+        "GL3_PROTOTYPES=1"
+        "EGL_EGLEXT_PROTOTYPES=1"
     )
     add_compile_options("-pthread" "-fexceptions")
     add_link_options(

hellotext.cpp

@@ -1,28 +1,45 @@
 #include <span>
 
+#include "txt/utils.hpp"
 #include "txt/window.hpp"
 #include "txt/renderer.hpp"
 #include "txt/text/fonts.hpp"
 
 using namespace txt::types;
 
-static auto entry([[maybe_unused]]std::span<char const*> const& args) -> void {
-    fmt::print("hello\n");
-    auto win = txt::make_window({"Hello, Text!"});
-    auto ren = txt::make_renderer(win);
+auto entry([[maybe_unused]]std::span<char const*> const& args) -> void {
+    static auto win = txt::make_window({"Hello, Text!"});
+    static auto ren = txt::make_renderer(win);
+    // ren->load_font({
+    //     "./res/fonts/Cozette/CozetteVector.ttf",
+    //     128,
+    //     txt::text_render_mode::raster,
+    // });
     ren->load_font({
-        "./res/fonts/Cozette/CozetteVector.ttf",
-        13,
+        "./res/fonts/RobotoMono/RobotoMonoNerdFontMono-Medium.ttf",
+        16,
         txt::text_render_mode::raster,
+        {0, 0xFFFF}
     });
 
-    auto mouse_x = 0.0f;
-    auto mouse_y = 0.0f;
+    static auto mouse_x = 0.0f;
+    static auto mouse_y = 0.0f;
+    static auto rot = 0.0f;
 
+    win->add_event_listener([&](txt::touch_start_event const& e) {
+        if (e.points().empty()) return;
+        mouse_x = f32(e.points()[0].x());
+        mouse_y = f32(win->height() - e.points()[0].y());
+        fmt::print("{}\n", e.str());
+    });
+    win->add_event_listener([&](txt::touch_move_event const& e) {
+        if (e.points().empty()) return;
+        mouse_x = f32(e.points()[0].x());
+        mouse_y = f32(win->height() - e.points()[0].y());
+        fmt::print("{} {}: {}={}\n", e.str(), mouse_y, win->height(), win->buffer_width());
+    });
     win->add_event_listener([&](txt::mouse_move_event const& e) {
         fmt::print("{}\n", e.str());
-        mouse_x = f32(e.x());
-        mouse_y = f32(win->buffer_height() - e.y());
     });
     win->add_event_listener([&](txt::key_down_event const& e) {
         fmt::print("{}\n", e.str());
@@ -33,13 +50,23 @@ static auto entry([[maybe_unused]]std::span<char const*> const& args) -> void {
     });
 
     txt::loop(win, [&] {
+        rot += txt::pi_f32 / 180.0f * 3.0f;
+
         ren->begin();
         ren->viewport(0, 0, win->buffer_width(), win->buffer_height());
         ren->clear_color(0x000000);
         ren->clear();
 
         ren->text("Hello, World!", {0.0f, 0.0f});
 
+        ren->rect(glm::vec2{mouse_x, mouse_y}, glm::vec2{1.0f, 100.0f},
+                  rot, glm::vec4{1.0f, 1.0f, 1.0f, 1.0f}, {});
+        ren->rect(glm::vec2{mouse_x, mouse_y}, glm::vec2{1.0f, 100.0f},
+                  rot+txt::pi_f32/2.0f, glm::vec4{1.0f, 1.0f, 1.0f, 1.0f}, {});
+
+        ren->rect(glm::vec2{mouse_x, mouse_y}, glm::vec2{32.0f, 32.0f},
+                  rot, glm::vec4{1.0f, 0.0f, 0.0f, 1.0f}, {});
+
         ren->end();
 
         win->swap();

txt/event.hpp

@@ -647,7 +647,7 @@ class touch_point {
 
     [[nodiscard]]auto str() const -> std::string {
         using namespace std::string_literals;
-        std::string str{"touch_point {"};
+        std::string str{"touch_point { "};
         str += "id: " + std::to_string(m_id) + ", ";
         str += "x: "  + fmt::format("{:.3f}", m_x) + ", ";
         str += "y: "  + fmt::format("{:.3f}", m_y) + " }";
@@ -683,7 +683,7 @@ class touch_event : public event {
         str += "size: " + std::to_string(m_size) + ", ";
         for (std::size_t i = 0; i < m_size; ++i) {
             str += "[" + std::to_string(i) + "]: " + m_points[i].str();
-            if (i < m_points.size() - 1) str += ", ";
+            if (i < m_size - 1) str += ", ";
             else str += " }";
         }
         return str;

txt/graphics/buffer.hpp

@@ -4,9 +4,6 @@
 #include <vector>
 
 #ifdef __EMSCRIPTEN__
-#define GL_GLEXT_PROTOTYPES 1
-#define GL3_PROTOTYPES 1
-#define EGL_EGLEXT_PROTOTYPES 1
 #include "GL/gl.h"
 #else
 #include "glad/glad.h"

txt/graphics/renderer.cpp

@@ -89,7 +89,7 @@ auto renderer::begin() -> void {
     for (auto& [st, data] : m_shader_texture_rects)
         st.size = 0;
 
-    m_text_engine->begin();
+    m_depth = 0.0f;
 }
 
 auto renderer::end() -> void {
@@ -105,7 +105,9 @@ auto renderer::end() -> void {
         m_rect_default_shader->upload_mat4("u_projection", m_projection);
         m_rect_descriptor->bind();
         m_rect_index_buffer->bind();
-        glDrawElementsInstanced(GL_TRIANGLES, GLsizei(m_rect_index_buffer->size()), gl_type(m_rect_index_buffer->type()), nullptr, GLsizei(m_color_rect_size));
+        glDrawElementsInstanced(GL_TRIANGLES, GLsizei(m_rect_index_buffer->size()),
+                                gl_type(m_rect_index_buffer->type()), nullptr,
+                                GLsizei(m_color_rect_size));
     }
     for (auto const& [st, vec] : m_shader_texture_rects) {
         auto const bytes = st.size * sizeof(rect_instance);
@@ -121,9 +123,10 @@ auto renderer::end() -> void {
         st.texture->bind(0);
         m_rect_descriptor->bind();
         m_rect_index_buffer->bind();
-        glDrawElementsInstanced(GL_TRIANGLES, GLsizei(m_rect_index_buffer->size()), gl_type(m_rect_index_buffer->type()), nullptr, GLsizei(m_color_rect_size));
+        glDrawElementsInstanced(GL_TRIANGLES, GLsizei(m_rect_index_buffer->size()),
+                                gl_type(m_rect_index_buffer->type()), nullptr,
+                                GLsizei(m_color_rect_size));
     }
-    m_text_engine->end();
 }
 
 auto renderer::viewport(std::int32_t x, std::int32_t y, std::uint32_t width, std::uint32_t height) -> void {
@@ -165,10 +168,10 @@ auto renderer::rect(glm::vec2 const& position, glm::vec2 const& size,
 auto renderer::rect(glm::vec2 const& position, glm::vec2 const& size,
                     float const& rotation, shader_ref_t shader,
                     texture_ref_t texture, glm::vec2 const& uv,
-                    glm::vec2 const& uv_size, float const& z_offset) -> void {
-    rect_instance rect{
+                    glm::vec2 const& uv_size, float const& zdepth) -> void {
+    rect_instance tmp{
         .color     = {1.0f, 1.0f, 1.0f, 1.0f},
-        .position  = {position, m_depth + z_offset},
+        .position  = {position, zdepth},
         .scale     = {size, 1.0f},
         .rotation  = {0.0f, 0.0f, rotation},
         .uv_offset = uv,
@@ -180,7 +183,7 @@ auto renderer::rect(glm::vec2 const& position, glm::vec2 const& size,
         m_shader_texture_rects[key] = {};
         it = m_shader_texture_rects.find(key);
     }
-    it->second.push_back(rect);
+    it->second.push_back(tmp);
     ++it->first.size;
 }
 

txt/graphics/shader.cpp

@@ -6,9 +6,6 @@
 #include "glm/gtc/type_ptr.hpp"
 
 #ifdef __EMSCRIPTEN__
-#define GL_GLEXT_PROTOTYPES 1
-#define GL3_PROTOTYPES 1
-#define EGL_EGLEXT_PROTOTYPES 1
 #include "GL/gl.h"
 #else
 #include "glad/glad.h"

txt/graphics/texture.cpp

@@ -1,9 +1,6 @@
 #include "texture.hpp"
 
 #ifdef __EMSCRIPTEN__
-#define GL_GLEXT_PROTOTYPES 1
-#define GL3_PROTOTYPES 1
-#define EGL_EGLEXT_PROTOTYPES 1
 #include "GL/gl.h"
 #else
 #include "glad/glad.h"

txt/renderer.hpp

@@ -20,9 +20,6 @@
 #include "glm/mat4x4.hpp"
 
 #ifdef __EMSCRIPTEN__
-#define GL_GLEXT_PROTOTYPES 1
-#define GL3_PROTOTYPES 1
-#define EGL_EGLEXT_PROTOTYPES 1
 #include "GL/gl.h"
 #else
 #include "glad/glad.h"
@@ -98,7 +95,7 @@ class renderer {
     auto rect(glm::vec2 const& position, glm::vec2 const& size,
               float const& rotation, shader_ref_t shader,
               texture_ref_t texture, glm::vec2 const& uv,
-              glm::vec2 const& uv_size, float const& z_offset = 0.0f) -> void;
+              glm::vec2 const& uv_size, float const& zdepth) -> void;
 
     auto text(std::string const& str, glm::vec2 const& position,
               glm::vec4 const& color = {1.0f, 1.0f, 1.0f, 1.0f},

txt/text/engine.cpp

@@ -1,8 +1,12 @@
 #include "engine.hpp"
 
+#include <cmath>
+
 #include "renderer.hpp"
 #include "utf8.h"
 
+#include "graphics/image.hpp"
+
 namespace txt {
 [[maybe_unused]]static constexpr float quad_vertices[]{
 //     x,     y,     z,       u,    v,
@@ -20,7 +24,24 @@ text_engine::text_engine(window_ref_t window) : m_window(window) { }
 
 auto text_engine::load(font_load_params const& params) -> void {
     m_manager.load(params);
-    set_default(std::begin(m_manager)->second);
+    if (m_current == nullptr)
+        set_default(std::begin(m_manager)->second);
+
+    constexpr auto round_up2 = [](auto const& value) {
+        return std::pow(2, std::ceil(std::log2(value) / std::log2(2)));
+    };
+    auto cols = static_cast<usize>(std::ceil(std::sqrt(m_current->size())));
+    cols = static_cast<usize>(round_up2(cols));
+    auto const size = static_cast<usize>(round_up2(m_current->max_font_size() * cols));
+    m_buffer = make_image_u8(nullptr, size, size, m_current->color_channels());
+    m_uv.y = size;
+
+    for (auto const& [code, glyph] : m_current->data()) {
+        insert_bitmap(glyph);
+    }
+
+    m_buffer->fliph();
+    write_png("test.png", *m_buffer);
 }
 
 auto text_engine::draw(std::string const& str, glm::vec2 const& position, glm::vec4 const& color, glm::vec2 const& scale) -> void {
@@ -50,11 +71,22 @@ auto text_engine::set_default(font& font) -> void {
     m_current = &font;
 }
 
-
-auto text_engine::begin() -> void {
+auto text_engine::generate() -> void {
 }
 
-auto text_engine::end() -> void {
-}
+auto text_engine::insert_bitmap(txt::glyph const& glyph) -> void {
+    auto const& bm = glyph.bitmap;
+    for (std::size_t i = 0; i < bm.height(); ++i) {
+        for (std::size_t j = 0; j < bm.width(); ++j) {
+            auto const pixel = bm.pixel(j, i);
+            m_buffer->set(std::size_t(m_uv.x) + j, std::size_t(m_uv.y) - i, pixel);
+        }
+    }
 
+    m_uv.x += std::int32_t(m_current->max_font_size());
+    if (m_uv.x >= std::int32_t(m_buffer->width() - m_current->max_font_size())) {
+        m_uv.x = 0;
+        m_uv.y -= std::int32_t(m_current->max_font_size());
+    }
+}
 } // namespace txt

txt/text/engine.hpp

@@ -23,14 +23,15 @@ class text_engine {
     auto set_default(font& font) -> void;
 
 private:
-    friend class renderer;
-    auto begin() -> void;
-    auto end() -> void;
+    auto generate() -> void;
+    auto insert_bitmap(txt::glyph const& glyph) -> void;
 
 private:
-    window_ref_t m_window;
-    font_manager m_manager{};
-    font const*  m_current{};
+    window_ref_t   m_window;
+    font_manager   m_manager{};
+    font const*    m_current{nullptr};
+    image_u8_ref_t m_buffer{nullptr};
+    glm::ivec2     m_uv{0.0f, 0.0f};
 };
 
 using text_engine_ref_t = ref<text_engine>;