update to imgui 1.89.9, add lunasvg

.github/workflows/gdext.yml

@@ -45,7 +45,7 @@ jobs:
       - name: vcpkg install
         run: |
           cd gdext
-          ${{ env.VCPKG_ROOT }}\vcpkg install --triplet x64-windows-static-md
+          ${{ env.VCPKG_ROOT }}\vcpkg install --triplet x64-windows-static
 
       - name: GDScript bindings
         run: |

gdext/CMakeLists.txt

@@ -22,15 +22,22 @@ if (NOT TARGET godot-cpp)
 endif()
 
 find_package(freetype CONFIG REQUIRED)
+find_package(unofficial-lunasvg CONFIG REQUIRED)
 
 add_library(imgui-godot-native SHARED)
 target_compile_features(imgui-godot-native PRIVATE cxx_std_20)
 target_compile_definitions(imgui-godot-native PUBLIC
     IMGUI_USER_CONFIG="imconfig-godot.h"
     IMGUI_ENABLE_FREETYPE
+    IMGUI_ENABLE_FREETYPE_LUNASVG
     IGN_EXPORT
     )
 
+if (MSVC)
+    target_compile_options(godot-cpp PRIVATE "/MP")
+    target_compile_options(imgui-godot-native PRIVATE "/MP")
+endif()
+
 add_subdirectory(src)
 
 target_sources(imgui-godot-native PRIVATE
@@ -52,6 +59,7 @@ target_sources(imgui-godot-native PRIVATE
 target_link_libraries(imgui-godot-native PUBLIC
     godot-cpp
     freetype
+    unofficial::lunasvg::lunasvg
     )
 
 target_include_directories(imgui-godot-native PRIVATE src imgui gen PUBLIC include)

gdext/SConstruct

@@ -15,7 +15,7 @@ project_name = Path(extension_path).stem
 
 config = "release" if env["target"] == "template_release" else "debug"
 
-libpath = env["LIBPATH"]
+libpath = env.get("LIBPATH", [])
 libs = [env["LIBS"]]
 
 windows = env["platform"] == "windows"
@@ -26,19 +26,20 @@ if config == "release":
         env.Append(CPPDEFINES=["NDEBUG"])
 
 if windows:
-    triplet = "x64-windows-static-md"
+    triplet = "x64-windows-static"
 elif linux:
     triplet = "x64-linux"
 else:
     triplet = "arm64-osx"
 
 env.Append(CPPPATH=["imgui/misc/freetype/"])
 env.Append(CPPPATH=[f"vcpkg_installed/{triplet}/include"])
-env.Append(CPPDEFINES=["IMGUI_ENABLE_FREETYPE"])
+env.Append(CPPDEFINES=["IMGUI_ENABLE_FREETYPE", "IMGUI_ENABLE_FREETYPE_LUNASVG"])
 sources += Glob("imgui/misc/freetype/*.cpp")
 libpath += [f"vcpkg_installed/{triplet}/lib"]
 libs += [
     "freetype",
+    "lunasvg",
     "bz2",
     "libpng16" if windows else "png16",
     "zlib" if windows else "z",

gdext/src/RdRendererThreadSafe.cpp

@@ -13,24 +13,30 @@ struct RdRendererThreadSafe::Impl
     {
         ClonedDrawData(ImDrawData* drawData)
         {
-            data = (ImDrawData*)IM_ALLOC(sizeof(ImDrawData));
-            memcpy(data, drawData, sizeof(ImDrawData));
-            data->CmdLists = (ImDrawList**)IM_ALLOC(sizeof(void*) * drawData->CmdListsCount);
-
-            for (int i = 0; i < drawData->CmdListsCount; ++i)
+            data = IM_NEW(ImDrawData);
+            data->Valid = drawData->Valid;
+            data->CmdListsCount = drawData->CmdListsCount;
+            data->TotalIdxCount = drawData->TotalIdxCount;
+            data->TotalVtxCount = drawData->TotalVtxCount;
+            data->CmdLists = {};
+            data->DisplayPos = drawData->DisplayPos;
+            data->DisplaySize = drawData->DisplaySize;
+            data->FramebufferScale = drawData->FramebufferScale;
+            data->OwnerViewport = drawData->OwnerViewport;
+
+            for (int i = 0; i < drawData->CmdLists.Size; ++i)
             {
-                data->CmdLists[i] = drawData->CmdLists[i]->CloneOutput();
+                data->CmdLists.push_back(drawData->CmdLists[i]->CloneOutput());
             }
         }
 
         ~ClonedDrawData()
         {
-            for (int i = 0; i < data->CmdListsCount; ++i)
+            for (int i = 0; i < data->CmdLists.Size; ++i)
             {
                 IM_DELETE(data->CmdLists[i]);
             }
-            IM_FREE(data->CmdLists);
-            IM_FREE(data);
+            IM_DELETE(data);
         }
 
         ImDrawData* data;

gdext/vcpkg.json

@@ -1,5 +1,6 @@
 {
     "dependencies": [
-        "freetype"
+        "freetype",
+        "lunasvg"
     ]
 }