Refactor: Build emscripten

Author: portersky

.github/workflows/build-web.yml

@@ -0,0 +1,31 @@
+name: Build Web
+
+on:
+  push:
+    branches:
+      - "trunk"
+      - "dev"
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build-web:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build emscripten using docker image
+        run: |
+          docker run --rm -v "$(pwd):/src" emscripten/emsdk:4.0.6 sh ./web/build.sh
+
+      - name: List build output
+        run: ls -R build-web/dist
+
+      - name: Upload built site
+        uses: actions/upload-artifact@v4
+        with:
+          name: web-dist
+          path: build-web/dist

.github/workflows/deploy-web.yml

@@ -0,0 +1,45 @@
+name: Deploy Web
+
+on:
+  workflow_run:
+    workflows: [ "Build" ]  # This must match build.yml's name exactly
+    branches: [ "trunk" ]
+    types:
+      - completed
+
+permissions:
+  contents: read
+  actions: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Download web build artifact
+        uses: actions/download-artifact@v4
+        with:
+          workflow: build.yml
+          github-token: ${{ github.token }}
+          run-id: ${{ github.event.workflow_run.id }}
+          name: web-dist
+          path: ./build-web
+
+      - name: Upload site artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: "build-web${{ steps.pages.outputs.base_path }}"
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/emscripten-build.yml

@@ -40,3 +40,7 @@ compile_commands.json
 # JetBrains Fleet
 .fleet
 .cache
+
+# Keep
+!.github/workflows/build-web.yml
+!.github/workflows/deploy-web.yml

.gitignore

@@ -4,22 +4,24 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)  # Group CMake targets inside a fol
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)         # Generate compile_commands.json for language servers
 
 include(FetchContent)
-option(GLFW_BUILD_EXAMPLES OFF)
-option(GLFW_BUILD_TESTS OFF)
-option(GLFW_BUILD_DOCS OFF)
-option(GLFW_INSTALL OFF)
-FetchContent_Declare(
-    glfw
-    GIT_REPOSITORY https://github.com/glfw/glfw.git
-    GIT_TAG        3.3.8
-)
-list(APPEND FETCH_CONTENTS glfw)
-FetchContent_Declare(
-    glad
-    GIT_REPOSITORY https://github.com/mononerv/glad.git
-    GIT_TAG        f4759d7c5143c0a23391ab05caaf43052cefdd65
-)
-list(APPEND FETCH_CONTENTS glad)
+if (NOT EMSCRIPTEN)
+    option(GLFW_BUILD_EXAMPLES OFF)
+    option(GLFW_BUILD_TESTS OFF)
+    option(GLFW_BUILD_DOCS OFF)
+    option(GLFW_INSTALL OFF)
+    FetchContent_Declare(
+        glfw
+        GIT_REPOSITORY https://github.com/glfw/glfw.git
+        GIT_TAG        3.4
+    )
+    list(APPEND FETCH_CONTENTS glfw)
+    FetchContent_Declare(
+        glad
+        GIT_REPOSITORY https://github.com/mononerv/glad.git
+        GIT_TAG        f4759d7c5143c0a23391ab05caaf43052cefdd65
+    )
+    list(APPEND FETCH_CONTENTS glad)
+endif()
 FetchContent_Declare(
     fmt
     GIT_REPOSITORY https://github.com/fmtlib/fmt.git
@@ -50,6 +52,12 @@ FetchContent_Declare(
     GIT_TAG        698c6fb9889c71494b49c9187d249af5fc87b211
 )
 list(APPEND FETCH_CONTENTS stb)
+FetchContent_Declare(
+    asio
+    GIT_REPOSITORY https://github.com/mononerv/asio.git
+    GIT_TAG        bcb8a933b27021d77f2d183991d815ea6c8cdc97
+)
+list(APPEND FETCH_CONTENTS asio)
 FetchContent_MakeAvailable(${FETCH_CONTENTS})
 
 # Group dependencies in Visual Studio and Xcode
@@ -63,22 +71,44 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio" OR CMAKE_GENERATOR MATCHES "Xcode")
 endif()
 
 if (APPLE)
+    message("Platform: macOS")
     set(PLATFORM_LINK_LIBRARIES
         "-framework Cocoa"
         "-framework IOKit"
         "-framework CoreVideo"
         "-framework OpenGL"
     )
-elseif (UNIX AND NOT APPLE)  # Linux, BSD, Solaris, Minix
+elseif (UNIX AND NOT APPLE AND NOT EMSCRIPTEN)  # Linux, BSD, Solaris, Minix
+    message("Platform: Linux")
     set(PLATFORM_LINK_LIBRARIES
         "dl"
         "m"
+        "GL"
         "X11"
     )
 elseif (WIN32)
+    message("Platform: Windows")
     set(PLATFORM_LINK_LIBRARIES "OpenGL32.lib")
+    set(PLATFORM_DEFINTIONS
+        ${PLATFORM_DEFINTIONS}
+        "_WIN32_WINNT=0x0A00"
+    )
+elseif(EMSCRIPTEN)
+    message("Platform: Emscripten")
+    add_compile_definitions(
+        "GL_GLEXT_PROTOTYPES"
+        "GL3_PROTOTYPES"
+    )
+    add_compile_options("-pthread" "-fexceptions")
+    add_link_options(
+        "-sLEGACY_GL_EMULATION=0"
+        "-sUSE_WEBGL2=1"
+        "-sFULL_ES3=1"
+        "-fexceptions"
+        "-sALLOW_MEMORY_GROWTH"
+    )
 else()
-    message(FATAL_ERROR "Unkown platform!")
+    message(FATAL_ERROR "Platform: Unkown!")
 endif()
 
 # Compiler specific options
@@ -98,7 +128,22 @@ if (NOT MSVC)
         # glm warnings
         "-Wno-nested-anon-types"
         "-Wno-gnu-anonymous-struct"
+        # clang on windows
+        "-Wno-microsoft-include"
+        # asio
+        "-Wno-sign-conversion"
+        "-Wno-implicit-int-conversion"
     )
+    if (EMSCRIPTEN)
+        set(BASE_OPTIONS
+            ${BASE_OPTIONS}
+            # asio
+            "-Wno-shadow"
+            "-Wno-shorten-64-to-32"
+            "-Wno-unused-private-field"
+            "-Wno-deprecated-declarations"
+        )
+    endif()
 else()
     set(BASE_OPTIONS
         "/W4"
@@ -112,29 +157,34 @@ endif()
 
 # libtxtr
 set(HEADERS
-    txt/buffer.hpp
+    txt/graphics/buffer.hpp
+    txt/graphics/image.hpp
+    txt/graphics/shader.hpp
+    txt/graphics/texture.hpp
+    txt/text/engine.hpp
+    txt/text/fonts.hpp
+    txt/input/keyboard.hpp
+    txt/input/mouse.hpp
+    txt/input/touch.hpp
     txt/event.hpp
-    txt/fonts.hpp
-    txt/image.hpp
     txt/input.hpp
     txt/renderer.hpp
-    txt/shader.hpp
-    txt/text_engine.hpp
-    txt/texture.hpp
     txt/types.hpp
-    txt/utility.hpp
+    txt/utils.hpp
     txt/window.hpp
 )
 set(SOURCES
-    txt/buffer.cpp
-    txt/fonts.cpp
-    txt/image.cpp
-    txt/input.cpp
-    txt/renderer.cpp
-    txt/shader.cpp
-    txt/text_engine.cpp
-    txt/texture.cpp
-    txt/window.cpp
+    txt/graphics/buffer.cpp
+    txt/graphics/image.cpp
+    txt/graphics/renderer.cpp
+    txt/graphics/shader.cpp
+    txt/graphics/texture.cpp
+    txt/input/input.cpp
+    txt/text/engine.cpp
+    txt/text/fonts.cpp
+    txt/window/window.cpp
+    $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:txt/window/glfw_window.cpp>
+    $<$<BOOL:${EMSCRIPTEN}>:txt/window/web_window.cpp>
 )
 add_library(libtxtr STATIC ${HEADERS} ${SOURCES})
 target_include_directories(libtxtr
@@ -145,21 +195,24 @@ target_include_directories(libtxtr
 )
 target_compile_features(libtxtr PRIVATE cxx_std_23)
 target_compile_options(libtxtr PRIVATE ${BASE_OPTIONS})
+target_compile_definitions(libtxtr PRIVATE ${PLATFORM_DEFINTIONS})
 target_link_libraries(libtxtr
     PRIVATE
     ${PLATFORM_LINK_LIBRARIES}
-    glfw
-    fmt
     utf8::cpp
     stb::stb
+    fmt
+    $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:glfw>
 
     PUBLIC
+    asio::asio
     freetype
-    glad
+    $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:glad::glad>
     glm
 )
-source_group(TREE "${CMAKE_CURRENT_LIST_DIR}" FILES ${HEADERS} ${SOURCES})
+# source_group(TREE "${CMAKE_CURRENT_LIST_DIR}" FILES ${HEADERS} ${SOURCES})
 
+# hellotext app
 set(HEADERS
     demos/app.hpp
     demos/text_bounce.hpp
@@ -171,6 +224,7 @@ add_executable(hellotext ${HEADERS} ${SOURCES})
 target_include_directories(hellotext PRIVATE ${PROJECT_SOURCE_DIR})
 target_compile_features(hellotext PRIVATE cxx_std_20)
 target_compile_options(hellotext PRIVATE ${BASE_OPTIONS})
+target_compile_definitions(hellotext PRIVATE ${PLATFORM_DEFINTIONS})
 target_link_libraries(hellotext
     PRIVATE
     ${PLATFORM_LINK_LIBRARIES}

CMakeLists.txt

@@ -1,13 +1,13 @@
 #include <span>
 
-#include "fmt/format.h"
-
 #include "txt/window.hpp"
-#include "txt/image.hpp"
 #include "txt/renderer.hpp"
-#include "txt/fonts.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);
     ren->load_font({
@@ -21,18 +21,18 @@ static auto entry([[maybe_unused]]std::span<char const*> const& args) -> void {
 
     win->add_event_listener([&](txt::mouse_move_event const& e) {
         fmt::print("{}\n", e.str());
-        mouse_x = (float)e.x();
-        mouse_y = (float)win->buffer_height() - (float)e.y();
+        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());
     });
     win->add_event_listener([&](txt::key_up_event const& e) {
         if (e.keycode() == txt::keycode::Q) win->close();
-        if (e.keycode() == txt::keycode::F) win->fullscreen();
+        if (e.keycode() == txt::keycode::F) win->toggle_fullscreen();
     });
 
-    while (!win->should_close()) {
+    txt::loop(win, [&] {
         ren->begin();
         ren->viewport(0, 0, win->buffer_width(), win->buffer_height());
         ren->clear_color(0x000000);
@@ -43,8 +43,7 @@ static auto entry([[maybe_unused]]std::span<char const*> const& args) -> void {
         ren->end();
 
         win->swap();
-        win->poll();
-    }
+    });
 }
 
 auto main(int argc, char const* argv[]) -> int {