Update to ImGui 1.90.6

pkdawson · May 16, 2024 · 4f6d9b0 · 4f6d9b0
1 parent 8733afb
commit 4f6d9b0
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/godot.yml b/.github/workflows/godot.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        gdver: ["4.2.2", "4.3.0-dev.5"]
+        gdver: ["4.2.2", "4.3.0-dev.6"]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.gitignore b/.gitignore
@@ -36,7 +36,7 @@ addons/imgui-godot-native/
 gdext/proj/addons/imgui-godot/
 gdext/samples/project/addons/
 addons/imgui-godot/imgui-godot-native.gdextension
-addons/imgui-godot/include/*.h
+addons/imgui-godot/include/
 scons_cache
 doc/**/addons/
 addons/imgui-godot/include/imgui-version.txt
diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj
@@ -11,7 +11,7 @@
     <EmbeddedResource Remove="doc\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ImGui.NET" Version="1.90.5.1" />
+    <PackageReference Include="ImGui.NET" Version="1.90.6.1" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/doc/examples/GDExt/CMakeLists.txt b/doc/examples/GDExt/CMakeLists.txt
@@ -17,7 +17,7 @@ FetchContent_MakeAvailable(godot-cpp)
 FetchContent_Declare(
     imgui
     GIT_REPOSITORY https://github.com/ocornut/imgui
-    GIT_TAG v1.90.5-docking
+    GIT_TAG v1.90.6-docking
 )
 FetchContent_MakeAvailable(imgui)
 

diff --git a/doc/examples/GDExt/SConstruct b/doc/examples/GDExt/SConstruct
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 IMGUI_GODOT_INCLUDE = "../../../addons/imgui-godot/include"
-IMGUI_TAG = "v1.90.5-docking"
+IMGUI_TAG = "v1.90.6-docking"
 
 import os
 import subprocess

diff --git a/doc/examples/Module/README.md b/doc/examples/Module/README.md
@@ -2,7 +2,7 @@ Run, for example:
 
 ```
 git clone https://github.com/ocornut/imgui
-git -C imgui checkout v1.90.5-docking
+git -C imgui checkout v1.90.6-docking
 git clone https://github.com/godotengine/godot
 cd godot
 scons custom_modules=../modules

diff --git a/doc/examples/ToolCSharp/ToolCSharp.csproj b/doc/examples/ToolCSharp/ToolCSharp.csproj
@@ -5,6 +5,6 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ImGui.NET" Version="1.90.5.1" />
+    <PackageReference Include="ImGui.NET" Version="1.90.6.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/gdext/SConstruct b/gdext/SConstruct
@@ -49,9 +49,11 @@ else:
 if not os.path.exists("gen/imgui_bindings.gen.h"):
     subprocess.call("python scripts/gds_bindings.py", shell=True)
 
+shutil.copy("imgui-godot-native.gdextension", "../addons/imgui-godot/")
+shutil.copytree("include", "../addons/imgui-godot/include", dirs_exist_ok=True)
+
 sources = Glob("src/*.cpp") + Glob("imgui/*.cpp") + Glob("gen/*.cpp")
 
-shutil.copy("imgui-godot-native.gdextension", "../addons/imgui-godot/")
 (extension_path,) = glob("../addons/imgui-godot/*.gdextension")
 addon_path = Path(extension_path).parent
 project_name = Path(extension_path).stem

diff --git a/gdext/dear_bindings b/gdext/dear_bindings
diff --git a/gdext/imgui b/gdext/imgui
diff --git a/gdext/include/.gdignore b/gdext/include/.gdignore
+2 −2		.github/workflows/build.yml
+2 −1		.gitignore
+3 −2		backends/imgui_impl_allegro5.cpp
+1 −1		backends/imgui_impl_dx10.cpp
+1 −1		backends/imgui_impl_dx11.cpp
+1 −1		backends/imgui_impl_dx12.cpp
+1 −1		backends/imgui_impl_dx9.cpp
+6 −2		backends/imgui_impl_glfw.cpp
+1 −1		backends/imgui_impl_metal.mm
+1 −1		backends/imgui_impl_opengl2.cpp
+23 −23		backends/imgui_impl_opengl3.cpp
+3 −3		backends/imgui_impl_opengl3.h
+109 −15		backends/imgui_impl_opengl3_loader.h
+1 −0		backends/imgui_impl_osx.mm
+3 −2		backends/imgui_impl_sdl2.cpp
+34 −27		backends/imgui_impl_sdl3.cpp
+1 −0		backends/imgui_impl_sdl3.h
+1 −1		backends/imgui_impl_sdlrenderer2.cpp
+1 −1		backends/imgui_impl_sdlrenderer3.cpp
+44 −21		backends/imgui_impl_vulkan.cpp
+11 −5		backends/imgui_impl_vulkan.h
+1 −1		backends/imgui_impl_wgpu.cpp
+42 −23		backends/imgui_impl_win32.cpp
+2 −2		docs/BACKENDS.md
+70 −0		docs/CHANGELOG.txt
+2 −2		docs/EXAMPLES.md
+2 −2		docs/FAQ.md
+2 −2		docs/README.md
+17 −7		examples/example_glfw_vulkan/main.cpp
+100 −0		examples/example_glfw_wgpu/CMakeLists.txt
+0 −0		examples/example_glfw_wgpu/Makefile.emscripten
+2 −2		examples/example_glfw_wgpu/README.md
+82 −18		examples/example_glfw_wgpu/main.cpp
+5 −1		examples/example_glfw_wgpu/web/index.html
+17 −7		examples/example_sdl2_vulkan/main.cpp
+1 −1		examples/example_sdl3_sdlrenderer3/main.cpp
+228 −128		imgui.cpp
+59 −55		imgui.h
+52 −11		imgui_demo.cpp
+7 −3		imgui_draw.cpp
+44 −10		imgui_internal.h
+63 −28		imgui_tables.cpp
+44 −20		imgui_widgets.cpp