fix: fix multiple issues with emscripten

support NOT prerendred text, so that no texture is created in a pthread
correctly exit in the cases, where it is needed
correctly stub out local storage, and the music manager

Author: Totto16

platforms/build-web.sh

@@ -62,8 +62,8 @@ export PACKAGE_FLAGS="'--use-port=sdl2', '--use-port=harfbuzz', '--use-port=free
 
 export COMMON_FLAGS="'-fexceptions', '-pthread', '-sUSE_PTHREADS=1', '-sEXCEPTION_CATCHING_ALLOWED=[..]', $PACKAGE_FLAGS"
 
-# TODO see if ALLOW_MEMORY_GROWTH is needed, but if we load ttf's and music it likely is and we don't have to debug OOm crahses, that aren't handled by some thrid party library, which is painful
-export LINK_FLAGS="$COMMON_FLAGS, '-sEXPORT_ALL=1', '-sUSE_WEBGPU=1', '-sWASM=1', '-sALLOW_MEMORY_GROWTH=1', '-sASSERTIONS=1','-sERROR_ON_UNDEFINED_SYMBOLS=1', '-sFETCH=1'"
+# TODO see if ALLOW_MEMORY_GROWTH is needed, but if we load ttf's and music it likely is and we don't have to debug OOm crashes, that aren't handled by some third party library, which is painful
+export LINK_FLAGS="$COMMON_FLAGS, '-sEXPORT_ALL=1', '-sUSE_WEBGPU=1', '-sWASM=1', '-sALLOW_MEMORY_GROWTH=1', '-sASSERTIONS=1','-sERROR_ON_UNDEFINED_SYMBOLS=1', '-sFETCH=1', '-sEXIT_RUNTIME=1'"
 export COMPILE_FLAGS="$COMMON_FLAGS ,'-DAUDIO_PREFER_MP3'"
 
 export CROSS_FILE="./platforms/crossbuild-web.ini"
@@ -110,7 +110,7 @@ cpp_link_args = [$LINK_FLAGS]
 needs_exe_wrapper = true
 sys_root = '$EMSCRIPTEN_SYS_ROOT'
 
-APP_ROMFS='$ROMFS'
+APP_ROMFS='$ROMFS/assets/'
 
 EOF
 

src/executables/game/application.cpp

@@ -129,7 +129,7 @@ void Application::load_emscripten() {
 
     const auto duration = std::chrono::milliseconds(SDL_GetTicks64() - m_loading_info->start_time());
 
-    // we can reach this via SDL_QUIT, SDL_APP_TERMINATING or (not console::inMainLoop())
+    // we can reach this via SDL_QUIT or SDL_APP_TERMINATING
     if (not m_loading_info->m_finished_loading or not m_is_running) {
 
         spdlog::debug("Aborted loading after {}", duration);
@@ -464,6 +464,7 @@ void Application::initialize() {
         this->load_resources();
 
 #if !defined(NDEBUG)
+        //TODO(Totto): emscripten: this is using sdl rendering (to a texture) in another thread then the main thread, use proxying to the main thread here too, and disable OOPETRIS_DONT_USE_PRERENDERED_TEXT
         m_fps_text = std::make_unique<ui::Label>(
                 this, "FPS: ?", font_manager().get(FontId::Default), Color::white(),
                 std::pair<double, double>{ 0.95, 0.95 },
@@ -563,6 +564,7 @@ void Application::load_resources() {
         { FontId::NotoColorEmoji,            "NotoColorEmoji.ttf" },
         {        FontId::Symbola,                   "Symbola.ttf" }
     };
+
     for (const auto& [font_id, path] : fonts) {
         const auto font_path = utils::get_assets_folder() / "fonts" / path;
         m_font_manager->load(font_id, font_path, fonts_size);

src/executables/meson.build

@@ -53,6 +53,10 @@ if build_application
                     )
                 endif
 
+                if not APP_ROMFS.endswith('/')
+                    APP_ROMFS = APP_ROMFS + '/'
+                endif
+
                 emscripten_link_args += ['--preload-file', APP_ROMFS + '@/assets/']
 
             endif

src/graphics/text.cpp

@@ -3,6 +3,34 @@
 #include "manager/service_provider.hpp"
 
 
+#if defined(OOPETRIS_DONT_USE_PRERENDERED_TEXT)
+
+Text::Text(
+        const ServiceProvider* service_provider,
+        const std::string& text,
+        const Font& font,
+        const Color& color,
+        const shapes::URect& dest
+)
+    : m_font{ font },
+      m_color{ color },
+      m_dest{ dest },
+      m_text{ text } {
+    UNUSED(service_provider);
+}
+
+
+void Text::render(const ServiceProvider& service_provider) const {
+    auto texture = service_provider.renderer().prerender_text(m_text, m_font, m_color);
+    service_provider.renderer().draw_texture(texture, m_dest);
+}
+
+void Text::set_text(const ServiceProvider& service_provider, const std::string& text) {
+    UNUSED(service_provider);
+    m_text = text;
+}
+
+#else
 Text::Text(
         const ServiceProvider* service_provider,
         const std::string& text,
@@ -23,3 +51,5 @@ void Text::render(const ServiceProvider& service_provider) const {
 void Text::set_text(const ServiceProvider& service_provider, const std::string& text) {
     m_text = service_provider.renderer().prerender_text(text, m_font, m_color);
 }
+
+#endif

src/graphics/text.hpp

@@ -8,13 +8,22 @@
 #include "rect.hpp"
 #include "texture.hpp"
 
+//TODO: set this flag in the build system, or maybe also fix https://github.com/OpenBrickProtocolFoundation/oopetris/issues/132 in the process
+#if defined(__EMSCRIPTEN__)
+#define OOPETRIS_DONT_USE_PRERENDERED_TEXT
+#endif
+
+
 struct Text final {
 private:
     Font m_font;
     Color m_color;
     shapes::URect m_dest;
+#if defined(OOPETRIS_DONT_USE_PRERENDERED_TEXT)
+    std::string m_text;
+#else
     Texture m_text;
-
+#endif
 public:
     OOPETRIS_GRAPHICS_EXPORTED Text(
             const ServiceProvider* service_provider,

src/helper/graphic_utils.cpp

@@ -2,6 +2,10 @@
 #include "graphic_utils.hpp"
 #include <exception>
 
+#if defined(__EMSCRIPTEN__)
+#include <emscripten.h>
+#endif
+
 SDL_Color utils::sdl_color_from_color(const Color& color) {
     return SDL_Color{ color.r, color.g, color.b, color.a };
 }
@@ -185,6 +189,8 @@ void utils::exit(int status_code) {
     // but is required here
     // see: https://github.com/libsdl-org/SDL/blob/main/docs/README-android.md
     throw utils::ExitException{ status_code };
+#elif defined(__EMSCRIPTEN__)
+    emscripten_force_exit(status_code);
 #else
     std::exit(status_code);
 #endif

src/helper/web_utils.cpp

@@ -9,38 +9,69 @@
 #include <memory>
 #include <string>
 
-std::optional<std::string> web::LocalStorage::get_item(const std::string& key) {
+namespace {
+
+    emscripten::val get_local_storage() {
+        thread_local const emscripten::val localStorage = emscripten::val::global("localStorage");
+        return localStorage;
+    }
+
+    [[maybe_unused]] std::optional<std::string> get_item_impl(const std::string& key) {
 
-    thread_local const emscripten::val localStorage = emscripten::val::global("localStorage");
+        thread_local const emscripten::val localStorage = get_local_storage();
 
-    emscripten::val value = localStorage.call<emscripten::val>("getItem", emscripten::val{ key });
+        emscripten::val value = localStorage.call<emscripten::val>("getItem", emscripten::val{ key });
 
-    if (value.isNull()) {
-        return std::nullopt;
+        if (value.isNull()) {
+            return std::nullopt;
+        }
+
+        return value.as<std::string>();
     }
 
-    return value.as<std::string>();
-}
+    [[maybe_unused]] void set_item_impl(const std::string& key, const std::string& value) {
 
-void web::LocalStorage::set_item(const std::string& key, const std::string& value) {
+        thread_local const emscripten::val localStorage = get_local_storage();
 
-    thread_local const emscripten::val localStorage = emscripten::val::global("localStorage");
+        localStorage.call<void>("setItem", emscripten::val{ key }, emscripten::val{ value });
+    }
 
-    localStorage.call<void>("setItem", emscripten::val{ key }, emscripten::val{ value });
-}
+    [[maybe_unused]] void remove_item_impl(const std::string& key) {
 
-void web::LocalStorage::remove_item(const std::string& key) {
+        thread_local const emscripten::val localStorage = get_local_storage();
+
+        localStorage.call<void>("removeItem", emscripten::val{ key });
+    }
+
+    [[maybe_unused]] void clear_impl() {
 
-    thread_local const emscripten::val localStorage = emscripten::val::global("localStorage");
+        thread_local const emscripten::val localStorage = get_local_storage();
 
-    localStorage.call<void>("removeItem", emscripten::val{ key });
+        localStorage.call<void>("clear");
+    }
+
+} // namespace
+
+std::optional<std::string> web::LocalStorage::get_item(const std::string& key) {
+    // we don't have access to the localStorage in threads (Web workers)
+    //TODO: if we are in the main thread, call the impl directly, otherwise use proxying
+    (void) (key);
+    return std::nullopt;
 }
 
-void web::LocalStorage::clear() {
+void web::LocalStorage::set_item(const std::string& key, const std::string& value) {
+    //TODO:
+    (void) (key);
+    (void) (value);
+}
 
-    thread_local const emscripten::val localStorage = emscripten::val::global("localStorage");
+void web::LocalStorage::remove_item(const std::string& key) {
+    //TODO:
+    (void) (key);
+}
 
-    localStorage.call<void>("clear");
+void web::LocalStorage::clear() {
+    //TODO:
 }
 
 
@@ -57,18 +88,16 @@ void web::console::log(const std::string& message) {
 }
 
 void web::console::info(const std::string& message) {
-    thread_local const emscripten::val console = emscripten::val::global("console");
-    console.call<void>("info", emscripten::val{ message });
+    emscripten_console_log(message.c_str());
 }
 
 void web::console::debug(const std::string& message) {
-    thread_local const emscripten::val console = emscripten::val::global("console");
-    console.call<void>("debug", emscripten::val{ message });
+    // NOTE: really the console, but also debug output
+    emscripten_dbg(message.c_str());
 }
 
 void web::console::trace(const std::string& message) {
-    thread_local const emscripten::val console = emscripten::val::global("console");
-    console.call<void>("trace", emscripten::val{ message });
+    emscripten_console_trace(message.c_str());
 }
 
 void web::console::clear() {

src/manager/music_manager.cpp

@@ -56,14 +56,22 @@ MusicManager::MusicManager(ServiceProvider* service_provider, u8 channel_size)
         }
     }
 
+#if defined(__EMSCRIPTEN__)
+    //TODO: do we need this, first do this:
+    // https://github.com/libsdl-org/SDL/issues/6385
+#else
+    const auto audio_channels = 2;
+
     // 2 here means STEREO, note that channels above means tracks, e.g. simultaneous playing source that are mixed,
     // hence the name SDL2_mixer
     const auto audio_result =
-            Mix_OpenAudio(constants::audio_frequency, MIX_DEFAULT_FORMAT, 2, constants::audio_chunk_size);
+            Mix_OpenAudio(constants::audio_frequency, MIX_DEFAULT_FORMAT, audio_channels, constants::audio_chunk_size);
+
 
     if (audio_result != 0) {
         throw helper::InitializationError{ fmt::format("Failed to open an audio device: {}", SDL_GetError()) };
     }
+#endif
 
     m_s_instance = this;