Port to web

.gitignore

@@ -366,8 +366,9 @@ MigrationBackup/
 FodyWeavers.xsd
 
 # VS Code files for those working on multiple tools
-.vscode/
+.vscode/*
 *.code-workspace
+!.vscode/cmake-kits.json
 
 # Local History for Visual Studio Code
 .history/
@@ -403,4 +404,5 @@ imgui.ini
 /.envrc
 /.direnv
 
-.DS_store
+.DS_store
+/.em_cache

.vscode/cmake-kits.json

@@ -0,0 +1,6 @@
+[
+    {
+        "name": "Emscripten",
+        "toolchainFile": "cmake/Emscripten.cmake"
+    }
+]

CMakeLists.txt

@@ -113,14 +113,30 @@ function(cubos_common_target_options target)
             set_target_properties(${target} PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
         endif()
     endif()
+
+    if (EMSCRIPTEN)
+        target_link_options(${target} PUBLIC -sSTRICT -sASSERTIONS=0)
+        target_link_options(${target} PUBLIC -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2)
+        target_link_options(${target} PUBLIC -pthread -sPTHREAD_POOL_SIZE=navigator.hardwareConcurrency)
+        target_link_options(${target} PUBLIC -sMINIFY_HTML=0)
+
+        if (WITH_GLFW)
+            target_link_options(${target} PUBLIC -sUSE_GLFW=3)
+        endif ()
+
+        set_target_properties(${target} PROPERTIES SUFFIX ".html")
+	    target_compile_options(${target} PUBLIC -pthread)
+    endif ()
 endfunction()
 
 # Add doctest as a submodule if it is not installed
 
-if (DOCTEST_USE_SUBMODULE)
-    add_subdirectory(lib/doctest)
-else ()
-    find_package(doctest REQUIRED)
+if (BUILD_CORE_TESTS OR BUILD_ENGINE_TESTS)
+    if (DOCTEST_USE_SUBMODULE)
+        add_subdirectory(lib/doctest)
+    else ()
+        find_package(doctest REQUIRED)
+    endif ()
 endif ()
 
 add_subdirectory(core)

api/core/CMakeLists.txt

@@ -1,6 +1,11 @@
 option(BUILD_API_CORE_SAMPLES "Build cubos core c api samples" OFF)
 option(BUILD_API_CORE_SHARED "Build cubos core c api as shared library?" ON)
 
+if (EMSCRIPTEN AND BUILD_API_CORE_SHARED)
+	message(WARNING "Cannot build API core as shared library on Emscripten")
+	set(BUILD_API_CORE_SHARED OFF)
+endif()
+
 message("# Building core c api samples: " ${BUILD_API_CORE_SAMPLES})
 message("# Building core c api as shared library: " ${BUILD_API_CORE_SHARED})
 

api/engine/CMakeLists.txt

@@ -5,6 +5,11 @@ set(CUBOS_API_ENGINE_SOURCE
 option(BUILD_API_ENGINE_SAMPLES "Build cubos engine c api samples" OFF)
 option(BUILD_API_ENGINE_SHARED "Build cubos engine c api as shared library?" ON)
 
+if (EMSCRIPTEN AND BUILD_API_ENGINE_SHARED)
+	message(WARNING "Cannot build API engine as shared library on Emscripten")
+	set(BUILD_API_ENGINE_SHARED OFF)
+endif()
+
 message("# Building engine c api samples: " ${BUILD_API_ENGINE_SAMPLES})
 message("# Building engine c api as shared library: " ${BUILD_API_ENGINE_SHARED})
 

core/CMakeLists.txt

@@ -17,6 +17,11 @@ option(BUILD_CORE_SAMPLES "Build cubos core samples" OFF)
 option(BUILD_CORE_TESTS "Build cubos core tests?" OFF)
 option(BUILD_CORE_SHARED "Build cubos core as shared library?" ON)
 
+if (EMSCRIPTEN AND BUILD_CORE_SHARED)
+	message(WARNING "Cannot build core as shared library on Emscripten")
+	set(BUILD_CORE_SHARED OFF)
+endif()
+
 message("# Building core samples: " ${BUILD_CORE_SAMPLES})
 message("# Building core tests: " ${BUILD_CORE_TESTS})
 message("# Building core as shared library: " ${BUILD_CORE_SHARED})
@@ -155,56 +160,75 @@ cubos_common_target_options(cubos-core)
 if(WITH_OPENGL)
 	set(GLAD_SOUURCES_DIR "lib/glad")
 	add_subdirectory("${GLAD_SOUURCES_DIR}/cmake" glad_cmake SYSTEM)
-	glad_add_library(glad REPRODUCIBLE API gl:core=3.3)
+	if(EMSCRIPTEN)
+		glad_add_library(glad REPRODUCIBLE API gles2=3.0 EXTENSIONS GL_EXT_color_buffer_float)
+	else()
+		glad_add_library(glad REPRODUCIBLE API gl:core=3.3)
+	endif()
 	if(BUILD_CORE_SHARED)
 		set_property(TARGET glad PROPERTY POSITION_INDEPENDENT_CODE ON)
 	endif()
+    if (EMSCRIPTEN)
+        target_link_libraries(cubos-core PRIVATE GL)
+    endif ()
 	target_link_libraries(cubos-core PRIVATE glad)
 	target_compile_definitions(cubos-core PRIVATE WITH_OPENGL GLAD_GLAPI_EXPORT GLAD_GLAPI_EXPORT_BUILD)
 endif()
 
 if(WITH_GLFW)
-	if(GLFW_USE_SUBMODULE)
-		set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
-		set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-		set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-		add_subdirectory(lib/glfw)
-	else()
-		find_package(glfw3 REQUIRED)
-	endif()
+	if (NOT EMSCRIPTEN)
+        if (GLFW_USE_SUBMODULE)
+            set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+            set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+            set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+            add_subdirectory(lib/glfw)
+        else ()
+            find_package(glfw3 REQUIRED)
+        endif ()
+    endif ()
 
 	target_link_libraries(cubos-core PRIVATE glfw)
 	target_compile_definitions(cubos-core PRIVATE WITH_GLFW)
 endif()
 
-if(WITH_OPENAL)
-	set(ALSOFT_UTILS OFF CACHE BOOL "" FORCE)
-	set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "" FORCE)
-	set(ALSOFT_EXAMPLES OFF CACHE BOOL "" FORCE)
-	add_subdirectory(lib/openal-soft)
-	target_include_directories(cubos-core PRIVATE lib/openal-soft/include)
-	target_link_libraries(cubos-core PRIVATE OpenAL)
-	target_compile_definitions(cubos-core PRIVATE WITH_OPENAL)
+if (WITH_OPENAL)
+    if (NOT EMSCRIPTEN)
+        set(ALSOFT_UTILS OFF CACHE BOOL "" FORCE)
+        set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "" FORCE)
+        set(ALSOFT_EXAMPLES OFF CACHE BOOL "" FORCE)
+        add_subdirectory(lib/openal-soft)
+        target_include_directories(cubos-core PRIVATE lib/openal-soft/include)
+        target_link_libraries(cubos-core PRIVATE OpenAL)
+    else ()
+        target_link_libraries(cubos-core PRIVATE openal)
+    endif ()
+
+    target_compile_definitions(cubos-core PRIVATE WITH_OPENAL)
 endif()
 
-if(GLM_USE_SUBMODULE)
+if(GLM_USE_SUBMODULE OR EMSCRIPTEN)
 	add_subdirectory(lib/glm SYSTEM)
 else()
 	find_package(glm REQUIRED)
 endif()
+target_compile_definitions(cubos-core PUBLIC GLM_FORCE_SILENT_WARNINGS) # Needed for compilation to succeed on MSVC
+target_link_libraries(cubos-core PUBLIC glm::glm)
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 add_subdirectory(lib/json)
+target_link_libraries(cubos-core PUBLIC nlohmann_json::nlohmann_json)
 
 add_subdirectory(lib/stduuid)
 target_link_libraries(cubos-core PUBLIC stduuid)
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
+target_link_libraries(cubos-core PUBLIC ${CMAKE_DL_LIBS})
 
-target_compile_definitions(cubos-core PUBLIC GLM_FORCE_SILENT_WARNINGS) # Needed for compilation to succeed on MSVC
-target_link_libraries(cubos-core PUBLIC glm::glm nlohmann_json::nlohmann_json ${CMAKE_DL_LIBS})
-target_link_libraries(cubos-core PRIVATE Threads::Threads)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+if (NOT EMSCRIPTEN)
+    find_package(Threads REQUIRED)
+    target_link_libraries(cubos-core PRIVATE Threads::Threads)
+endif ()
 
 # Add core tests
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_CORE_TESTS)

core/include/cubos/core/ecs/cubos.hpp

@@ -88,6 +88,10 @@ namespace cubos::core::ecs
         /// @param argv Argument array.
         Cubos(int argc, char** argv);
 
+        /// @brief Move constructs.
+        /// @param other Other application.
+        Cubos(Cubos&& other) noexcept;
+
         /// @name Forbid copying.
         /// @{
         Cubos(const Cubos&) = delete;
@@ -300,7 +304,7 @@ namespace cubos::core::ecs
         /// @param plugin Plugin.
         void uninstall(Plugin plugin);
 
-        World mWorld;
+        World* mWorld;
         SystemRegistry mSystemRegistry;
         State* mState{nullptr};
 
@@ -370,7 +374,7 @@ namespace cubos::core::ecs
         TagBuilder& runIf(auto func)
         {
             auto conditionId = mCubos.mSystemRegistry.add(mName + "#condition",
-                                                          System<bool>::make(mCubos.mWorld, std::move(func), {}));
+                                                          System<bool>::make(*mCubos.mWorld, std::move(func), {}));
             mPlanner.onlyIf(mTagId, conditionId);
             return *this;
         }
@@ -381,7 +385,7 @@ namespace cubos::core::ecs
         TagBuilder& repeatWhile(auto func)
         {
             auto conditionId =
-                mCubos.mSystemRegistry.add(mName, System<bool>::make(mCubos.mWorld, std::move(func), {}));
+                mCubos.mSystemRegistry.add(mName, System<bool>::make(*mCubos.mWorld, std::move(func), {}));
             CUBOS_ASSERT(mPlanner.repeatWhile(mTagId, conditionId), "Tag was already set to repeating");
             return *this;
         }
@@ -517,15 +521,15 @@ namespace cubos::core::ecs
         SystemBuilder&& onlyIf(auto function) &&
         {
             CUBOS_ASSERT(!mCondition.contains(), "Only one condition can be set per system");
-            mCondition.replace(System<bool>::make(mCubos.mWorld, std::move(function), {}));
+            mCondition.replace(System<bool>::make(*mCubos.mWorld, std::move(function), {}));
             return std::move(*this);
         }
 
         /// @brief Finishes building the system with the given function.
         /// @param function System function.
         void call(auto function) &&
         {
-            this->finish(System<void>::make(mCubos.mWorld, std::move(function), mOptions));
+            this->finish(System<void>::make(*mCubos.mWorld, std::move(function), mOptions));
         }
 
     private:
@@ -660,7 +664,7 @@ namespace cubos::core::ecs
         /// @param function System function.
         void call(auto function) &&
         {
-            this->finish(System<void>::make(mCubos.mWorld, std::move(function), mOptions));
+            this->finish(System<void>::make(*mCubos.mWorld, std::move(function), mOptions));
         }
 
     private:

core/include/cubos/core/ecs/system/registry.hpp

@@ -45,6 +45,9 @@ namespace cubos::core::ecs
         /// @brief Constructs.
         SystemRegistry() = default;
 
+        /// @brief Move constructs.
+        SystemRegistry(SystemRegistry&&) = default;
+
         /// @brief Forbid copying.
         SystemRegistry(const SystemRegistry&) = delete;