Fix CI script for PR

.github/workflows/ci.yml

@@ -183,10 +183,9 @@ jobs:
           CROSS_COMPILE_ROOT: ${{ matrix.requires-toolchain && runner.temp }}/cross-compile
 
   build-react-native:
-    if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
+    if: ${{ (github.event_name == 'push' || github.event_name == 'pull_request') && (contains(join(github.event.head_commit.modified, ','), 'react-native/') || contains(join(github.event.head_commit.added, ','), 'react-native/') || contains(join(github.event.head_commit.removed, ','), 'react-native/')) }}
     runs-on: ubuntu-latest
     # Only run if files in react-native/ changed
-    if: ${{ contains(join(github.event.head_commit.modified, ','), 'react-native/') || contains(join(github.event.head_commit.added, ','), 'react-native/') || contains(join(github.event.head_commit.removed, ','), 'react-native/') }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -216,7 +215,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - name:  Setup EAS
+      - name:  Setup EAS
         uses: expo/expo-github-action@v8
         with:
           eas-version: latest
@@ -235,4 +234,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: react-native-apk
-          path: app-latest.apk
+          path: app-latest.apk

CMakeLists.txt

@@ -48,7 +48,7 @@ foreach(PLUGIN_NAME ${PLUGIN_DIRS})
     endif()
 endforeach()
 
-project(main VERSION 1.9.0)
+project(main VERSION 1.9.1)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 
 # Define version macros for compile-time access

CMakePresets.json

@@ -55,6 +55,9 @@
             "cacheVariables": {
                 "DESKTOP_DEBUG_CONSOLE": true
             },
+            "environment": {
+                "TRIPLET": "x64-windows"
+            },
             "inherits": "desktop"
         }
     ],

plugins/AudioVisualizer/desktop/AudioVisualizerDesktop.cpp

@@ -249,6 +249,12 @@ void AudioVisualizerDesktop::addVisualizer() {
     }
 }
 
+void AudioVisualizerDesktop::initialize_imgui(ImGuiContext *im_gui_context, ImGuiMemAllocFunc*alloc_fn,
+    ImGuiMemFreeFunc*free_fn, void **user_data) {
+    ImGui::SetCurrentContext(im_gui_context);
+    ImGui::GetAllocatorFunctions(alloc_fn, free_fn, user_data);
+}
+
 std::optional<std::unique_ptr<UdpPacket, void (*)(UdpPacket *)> > AudioVisualizerDesktop::compute_next_packet(
     const std::string sceneName) {
 #ifndef _WIN32

plugins/AudioVisualizer/desktop/AudioVisualizerDesktop.h

@@ -32,6 +32,7 @@ class AudioVisualizerDesktop final : public Plugins::DesktopPlugin
         return PLUGIN_NAME;
     }
 
+    void initialize_imgui(ImGuiContext *im_gui_context, ImGuiMemAllocFunc*alloc_fn, ImGuiMemFreeFunc*free_fn, void **user_data) override;
 private:
     ImPlotContext *implotContext = nullptr;
 

plugins/Shadertoy/desktop/ShadertoyDesktop.cpp

@@ -59,6 +59,12 @@ void ShadertoyDesktop::after_swap(ImGuiContext *imCtx)
     currData = data;
 }
 
+void ShadertoyDesktop::initialize_imgui(ImGuiContext *im_gui_context, ImGuiMemAllocFunc*alloc_fn,
+    ImGuiMemFreeFunc*free_fn, void **user_data) {
+    ImGui::SetCurrentContext(im_gui_context);
+    ImGui::GetAllocatorFunctions(alloc_fn, free_fn, user_data);
+}
+
 void ShadertoyDesktop::render()
 {
     if (!initError.empty())

plugins/Shadertoy/desktop/ShadertoyDesktop.h

@@ -22,6 +22,7 @@ class ShadertoyDesktop final : public Plugins::DesktopPlugin
 
     void post_init() override;
     void after_swap(ImGuiContext *imCtx) override;
+    void initialize_imgui(ImGuiContext *im_gui_context, ImGuiMemAllocFunc*alloc_fn, ImGuiMemFreeFunc*free_fn, void **user_data) override;
 
 private:
     int width, height;

shared/desktop/include/shared/desktop/plugin/main.h

@@ -63,9 +63,6 @@ namespace Plugins
             return std::nullopt;
         }
 
-        virtual void initialize_imgui(ImGuiContext * im_gui_context, ImGuiMemAllocFunc* alloc_fn, ImGuiMemFreeFunc* free_fn, void** user_data) {
-            ImGui::SetCurrentContext(im_gui_context);
-            ImGui::GetAllocatorFunctions(alloc_fn, free_fn, user_data);
-        }
+        virtual void initialize_imgui(ImGuiContext * im_gui_context, ImGuiMemAllocFunc* alloc_fn, ImGuiMemFreeFunc* free_fn, void** user_data) = 0;
     };
 }

src_desktop/main.cpp

@@ -49,7 +49,7 @@
 std::string get_noto_color_emoji_path() {
     std::string result;
     const char* cmd = "fc-list :family=file | grep -i 'Noto Color Emoji' | awk -F: '{print $1}' | head -n 1";
     std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
     if (!pipe) return result;
     char buffer[512];
     if (fgets(buffer, sizeof(buffer), pipe.get())) {
@@ -110,15 +110,6 @@
     auto cfg = ConfigManager::instance();
     pl->initialize();
 
-    ImGuiMemAllocFunc alloc_fn = nullptr;
-    ImGuiMemFreeFunc free_fn = nullptr;
-    void* user_data = nullptr;
-
-    ImGui::GetAllocatorFunctions(&alloc_fn, &free_fn, &user_data);
-    for(auto &[name, plugin]: pl->get_plugins()) {
-        plugin->initialize_imgui(ImGui::GetCurrentContext(), &alloc_fn, &free_fn, &user_data);
-    }
-
     for (const auto &[plName, plugin]: pl->get_plugins()) {
         plugin->load_config(cfg->getPluginSetting(plName));
     }
@@ -214,7 +205,7 @@
         const std::string stateStr = ws->getReadyStateString();
         std::string statusText = "WebSocket is currently: " + stateStr;
 
         ImGui::Text(statusText.c_str());
         if (state != ix::ReadyState::Open) {
             if (ImGui::Button("Connect", ImVec2(0, 0))) {
                 ws->setUrl(fmt::format("ws://{}:{}/desktopWebsocket", hostname, port));
@@ -233,7 +224,7 @@
             }
         }
 
         ImGui::Text(("Active Scene: " + ws->getActiveScene()).c_str());
         auto last = ws->getLastError();
         if (!last.empty()) {
             ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Last Error: %s", last.c_str());
@@ -398,6 +389,16 @@
         }
     };
     runnerParams.callbacks.PostInit = [&]() {
+        ImGuiMemAllocFunc alloc_fn = nullptr;
+        ImGuiMemFreeFunc free_fn = nullptr;
+        void* user_data = nullptr;
+
+        ImGui::GetAllocatorFunctions(&alloc_fn, &free_fn, &user_data);
+        auto context = ImGui::GetCurrentContext();
+        for(auto &[name, plugin]: pl->get_plugins()) {
+            plugin->initialize_imgui(context, &alloc_fn, &free_fn, &user_data);
+        }
+
         auto *window = (GLFWwindow *) HelloImGui::GetRunnerParams()->backendPointers.glfwWindow;
         setMainGLFWWindow(window);
         glfwSwapInterval(0);