Various fixes mainly for WebAssembly and Android targets. (#182)

Dandielo · web-flow · commit 8b25a8815dc5 · 2025-02-07T00:43:13.000+09:00
The DevUI now comes with a set of pre-defined menu categories: File, Settings, Engine, Tools, Help

Fixes:
* Fixed crash during AIO port cleanup (uninitialized-variable).
* Fixed 'main' thread to spin uncontrolled and impacting performance.
* Fixed various build issues on Emscripten targets (clang)
* Fixed Android example using old timer API.
diff --git a/source/code/core/utils/private/native_aio.cxx b/source/code/core/utils/private/native_aio.cxx
@@ -503,7 +503,7 @@ namespace ice::native_aio
         ice::ucount num_completed = 0;
         while(limits.events_max > num_completed)
         {
-            ice::native_aio::AIORequest const* request;
+            ice::native_aio::AIORequest const* request = nullptr;
 
             // TODO: Allow different requests
             bool const iocompleted = aio_file_await_request(port, limits, request, bytes);
diff --git a/source/code/core/utils/public/ice/shard_payloads.hxx b/source/code/core/utils/public/ice/shard_payloads.hxx
@@ -10,9 +10,9 @@ namespace ice
 {
 
     template<>
-    constexpr ice::ShardPayloadID Constant_ShardPayloadID<ice::String const*> = ice::shard_payloadid("ice::String const*");
+    constexpr inline ice::ShardPayloadID Constant_ShardPayloadID<ice::String const*> = ice::shard_payloadid("ice::String const*");
 
     template<>
-    constexpr ice::ShardPayloadID Constant_ShardPayloadID<ice::Tns> = ice::shard_payloadid("ice::Tns");
+    constexpr inline ice::ShardPayloadID Constant_ShardPayloadID<ice::Tns> = ice::shard_payloadid("ice::Tns");
 
 } // namespace ice
diff --git a/source/code/example/android/simple/private/example_android.cxx b/source/code/example/android/simple/private/example_android.cxx
@@ -54,7 +54,7 @@ struct TestTrait : public ice::Trait
 
     auto activate(ice::WorldStateParams const& update) noexcept -> ice::Task<> override
     {
-        timer = ice::timer::create_timer(update.clock, 1.0f);
+        timer = ice::timer::create_timer(update.clock, 1_Ts);
         co_return;
     }
 
diff --git a/source/code/iceshard/engine/private/world_trait.cxx b/source/code/iceshard/engine/private/world_trait.cxx
@@ -38,7 +38,7 @@ namespace ice
 
     void Trait::send(ice::ShardID shardid) noexcept
     {
-        _context.send({ shardid });
+        _context.send({ ice::Shard{ shardid } });
     }
 
     void Trait::send(ice::ShardID shardid, ice::Asset asset) noexcept
diff --git a/source/code/iceshard/engine/public/ice/engine_runner.hxx b/source/code/iceshard/engine/public/ice/engine_runner.hxx
@@ -65,4 +65,4 @@ namespace ice
 } // namespace ice
 
 template<>
-inline constexpr ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::EngineFrameUpdate const*> = ice::shard_payloadid("ice::EngineFrameUpdate const*");
+constexpr inline ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::EngineFrameUpdate const*> = ice::shard_payloadid("ice::EngineFrameUpdate const*");
diff --git a/source/code/iceshard/engine/public/ice/gfx/gfx_shards.hxx b/source/code/iceshard/engine/public/ice/gfx/gfx_shards.hxx
@@ -34,7 +34,7 @@ namespace ice::gfx
 } // namespace ice::gfx
 
 template<>
-inline constexpr ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::gfx::GfxFrameUpdate const*> = ice::shard_payloadid("ice::gfx::GfxFrameUpdate const*");
+constexpr inline ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::gfx::GfxFrameUpdate const*> = ice::shard_payloadid("ice::gfx::GfxFrameUpdate const*");
 
 template<>
-inline constexpr ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::gfx::GfxStateChange const*> = ice::shard_payloadid("ice::gfx::GfxStateChange const*");
+constexpr inline ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::gfx::GfxStateChange const*> = ice::shard_payloadid("ice::gfx::GfxStateChange const*");
diff --git a/source/code/iceshard/engine/public/ice/world/world_trait_details.hxx b/source/code/iceshard/engine/public/ice/world/world_trait_details.hxx
@@ -4,6 +4,7 @@
 #pragma once
 #include <ice/world/world_trait_types.hxx>
 #include <ice/assert.hxx>
+#include <ice/task.hxx>
 
 namespace ice::detail
 {
diff --git a/source/code/iceshard/engine/public/ice/world/world_updater.hxx b/source/code/iceshard/engine/public/ice/world/world_updater.hxx
@@ -37,4 +37,4 @@ namespace ice
 } // namespace ice
 
 template<>
-inline constexpr ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::WorldStateParams const*> = ice::shard_payloadid("ice::WorldStateParams const*");
+constexpr inline ice::ShardPayloadID ice::Constant_ShardPayloadID<ice::WorldStateParams const*> = ice::shard_payloadid("ice::WorldStateParams const*");
diff --git a/source/code/iceshard/iceshard/private/iceshard_trait_context.hxx b/source/code/iceshard/iceshard/private/iceshard_trait_context.hxx
@@ -42,7 +42,7 @@ namespace ice
         IceshardTraitContext(ice::IceshardWorldContext& world_context, ice::u32 index) noexcept;
         ~IceshardTraitContext() noexcept;
 
-        void send(ice::detail::TraitEvent event) noexcept;
+        void send(ice::detail::TraitEvent event) noexcept override;
         void sync(ice::ShardContainer& out_shards) noexcept;
 
         auto checkpoint(ice::StringID id) noexcept -> ice::TaskCheckpointGate override;
diff --git a/source/code/iceshard/iceshard/private/iceshard_world_manager_devui.cxx b/source/code/iceshard/iceshard/private/iceshard_world_manager_devui.cxx
@@ -42,6 +42,7 @@ namespace ice
 
         ice::array::resize(_entries, ice::hashmap::count(_manager._worlds));
 
+        [[maybe_unused]]
         ImVec2 const avail = ImGui::GetContentRegionAvail();
         if (ImGui::BeginTable("##details", 2))
         {
diff --git a/source/code/modules/imgui_module/private/imgui_system.cxx b/source/code/modules/imgui_module/private/imgui_system.cxx
@@ -66,9 +66,10 @@ namespace ice::devui
     ImGuiSystem::ImGuiSystem(ice::Allocator& alloc) noexcept
         : _allocator{ alloc, "ImGUI-System" }
         , _builtin_widgets{ alloc }
+        , _menu_categories{ _allocator }
         , _widget_manager{ _allocator }
+        , _widget_frame{ }
         , _widget_logger{ _allocator }
-        , _menu_categories{ _allocator }
     {
         ice::array::push_back(_builtin_widgets, create_allocator_tree_widget(_allocator));
         // ice::array::push_back(_builtin_widgets, (ice::UniquePtr<ice::DevUIWidget>) ice::make_unique<ImGuiLogger>(_allocator, _allocator));
@@ -80,6 +81,10 @@ namespace ice::devui
         {
             _widget_manager.add_widget(widget.get());
         }
+
+        // Setup default main-menu categories
+        ice::String categories[]{ "File", "Settings", "Engine", "Tools", "Help" };
+        setup_mainmenu(categories);
     }
 
     ImGuiSystem::~ImGuiSystem() noexcept
diff --git a/source/code/platforms/platform_webasm/private/webasm_core_app.cxx b/source/code/platforms/platform_webasm/private/webasm_core_app.cxx
@@ -32,6 +32,7 @@ namespace ice::platform::webasm
         _runtime.reset();
         _state.reset();
         _config.reset();
+        _wait.reset();
     }
 
     void WebAsmCoreApp::initialize(ice::Span<ice::Shard const> params) noexcept
@@ -105,6 +106,7 @@ namespace ice::platform::webasm
         else if (_initstage == 3)
         {
             _threads->queue_gfx.process_all();
+            _wait.set(); // Allow the 'main' thread to run since we finished drawing.
         }
         else if (_initstage == 4) // OnSuspend
         {
@@ -138,6 +140,11 @@ namespace ice::platform::webasm
                 ICE_ASSERT_CORE(res == ice::app::S_ApplicationUpdate);
             }
         }
+
+        // Before a new frame can be processed wait for drawing to finish.
+        //  ensure the browser does not spend 100% on this single thread.
+        _wait.wait();
+        _wait.reset();
     }
 
     auto WebAsmCoreApp::native_webapp_thread(void* userdata, ice::TaskQueue& queue) noexcept -> ice::u32
diff --git a/source/code/platforms/platform_webasm/private/webasm_core_app.hxx b/source/code/platforms/platform_webasm/private/webasm_core_app.hxx
@@ -9,6 +9,7 @@
 #include <ice/shard_container.hxx>
 #include <ice/task_queue.hxx>
 #include <ice/task_thread.hxx>
+#include <ice/sync_manual_events.hxx>
 #include <ice/app.hxx>
 
 #include <ice/input/device_event_queue.hxx>
@@ -49,6 +50,7 @@ namespace ice::platform::webasm
     protected:
         ice::HostAllocator _allocator;
         ice::UniquePtr<WebASM_Threads> _threads;
+        ice::ManualResetEvent _wait;
 
     private:
         ice::app::Factories _factories;

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ namespace ice::native_aio`
`503`	`503`	`ice::ucount num_completed = 0;`
`504`	`504`	`while(limits.events_max > num_completed)`
`505`	`505`	`{`
`506`		`- ice::native_aio::AIORequest const* request;`
	`506`	`+ ice::native_aio::AIORequest const* request = nullptr;`
`507`	`507`
`508`	`508`	`// TODO: Allow different requests`
`509`	`509`	`bool const iocompleted = aio_file_await_request(port, limits, request, bytes);`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ namespace ice`
`10`	`10`	`{`
`11`	`11`
`12`	`12`	`template<>`
`13`		`- constexpr ice::ShardPayloadID Constant_ShardPayloadID<ice::String const> = ice::shard_payloadid("ice::String const");`
	`13`	`+ constexpr inline ice::ShardPayloadID Constant_ShardPayloadID<ice::String const> = ice::shard_payloadid("ice::String const");`
`14`	`14`
`15`	`15`	`template<>`
`16`		`- constexpr ice::ShardPayloadID Constant_ShardPayloadID<ice::Tns> = ice::shard_payloadid("ice::Tns");`
	`16`	`+ constexpr inline ice::ShardPayloadID Constant_ShardPayloadID<ice::Tns> = ice::shard_payloadid("ice::Tns");`
`17`	`17`
`18`	`18`	`} // namespace ice`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ struct TestTrait : public ice::Trait`
`54`	`54`
`55`	`55`	`auto activate(ice::WorldStateParams const& update) noexcept -> ice::Task<> override`
`56`	`56`	`{`
`57`		`- timer = ice::timer::create_timer(update.clock, 1.0f);`
	`57`	`+ timer = ice::timer::create_timer(update.clock, 1_Ts);`
`58`	`58`	`co_return;`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace ice`
`38`	`38`
`39`	`39`	`void Trait::send(ice::ShardID shardid) noexcept`
`40`	`40`	`{`
`41`		`- _context.send({ shardid });`
	`41`	`+ _context.send({ ice::Shard{ shardid } });`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`void Trait::send(ice::ShardID shardid, ice::Asset asset) noexcept`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#pragma once`
`5`	`5`	`#include <ice/world/world_trait_types.hxx>`
`6`	`6`	`#include <ice/assert.hxx>`
	`7`	`+#include <ice/task.hxx>`
`7`	`8`
`8`	`9`	`namespace ice::detail`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ namespace ice`
`42`	`42`
`43`	`43`	`ice::array::resize(_entries, ice::hashmap::count(_manager._worlds));`
`44`	`44`
	`45`	`+ [[maybe_unused]]`
`45`	`46`	`ImVec2 const avail = ImGui::GetContentRegionAvail();`
`46`	`47`	`if (ImGui::BeginTable("##details", 2))`
`47`	`48`	`{`