Skip to content

Commit

Permalink
Update to ImGui 1.90.5
Browse files Browse the repository at this point in the history
  • Loading branch information
pkdawson committed May 1, 2024
1 parent 52c8ee8 commit 916d9cd
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gdext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:


env:
vcpkg_tag: a34c873a9717a888f58dc05268dea15592c2f0ff # 2024.03.25
vcpkg_tag: 943c5ef1c8f6b5e6ced092b242c8299caae2ff01 # 2024.04.26

jobs:
windows:
Expand Down
10 changes: 5 additions & 5 deletions Dear ImGui for Godot Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
<EmbeddedResource Remove="doc\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ImGui.NET" Version="1.90.1.1" />
<PackageReference Include="Roslynator.Analyzers" Version="4.12.1">
<PackageReference Include="ImGui.NET" Version="1.90.5.1" />
<PackageReference Include="Roslynator.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.1">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeFixes" Version="4.12.1">
<PackageReference Include="Roslynator.CodeFixes" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.1">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/GDExt/SConstruct
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

IMGUI_GODOT_INCLUDE = "../../../addons/imgui-godot/include"
IMGUI_TAG = "v1.90.1-docking"
IMGUI_TAG = "v1.90.5-docking"

import os
import subprocess
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/Module/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Run, for example:

```
git clone https://github.com/ocornut/imgui
git -C imgui checkout v1.90.1-docking
git -C imgui checkout v1.90.5-docking
git clone https://github.com/godotengine/godot
cd godot
scons custom_modules=../modules
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/ToolCSharp/ToolCSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ImGui.NET" Version="1.90.1.1" />
<PackageReference Include="ImGui.NET" Version="1.90.5.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion gdext/imgui
Submodule imgui updated 43 files
+7 −7 .github/workflows/build.yml
+1 −1 .github/workflows/static-analysis.yml
+1 −1 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
+26 −4 backends/imgui_impl_dx9.cpp
+9 −10 backends/imgui_impl_glfw.cpp
+2 −3 backends/imgui_impl_glfw.h
+1 −1 backends/imgui_impl_metal.mm
+2 −2 backends/imgui_impl_opengl2.cpp
+27 −19 backends/imgui_impl_opengl3.cpp
+2 −0 backends/imgui_impl_opengl3_loader.h
+3 −1 backends/imgui_impl_osx.h
+5 −4 backends/imgui_impl_osx.mm
+138 −58 backends/imgui_impl_sdl2.cpp
+8 −5 backends/imgui_impl_sdl2.h
+139 −58 backends/imgui_impl_sdl3.cpp
+9 −2 backends/imgui_impl_sdl3.h
+4 −5 backends/imgui_impl_sdlrenderer3.cpp
+88 −80 backends/imgui_impl_vulkan.cpp
+27 −9 backends/imgui_impl_vulkan.h
+37 −20 backends/imgui_impl_wgpu.cpp
+18 −1 backends/imgui_impl_wgpu.h
+11 −1 backends/imgui_impl_win32.cpp
+205 −4 docs/CHANGELOG.txt
+1 −1 docs/CONTRIBUTING.md
+2 −2 docs/FAQ.md
+1 −1 docs/FONTS.md
+12 −8 docs/README.md
+0 −0 examples/example_emscripten_wgpu/Makefile.emscripten
+1 −1 examples/example_emscripten_wgpu/README.md
+163 −136 examples/example_emscripten_wgpu/main.cpp
+2 −2 examples/example_glfw_metal/Makefile
+12 −11 examples/example_glfw_vulkan/main.cpp
+12 −11 examples/example_sdl2_vulkan/main.cpp
+660 −343 imgui.cpp
+69 −49 imgui.h
+72 −26 imgui_demo.cpp
+332 −21 imgui_draw.cpp
+187 −120 imgui_internal.h
+77 −34 imgui_tables.cpp
+90 −43 imgui_widgets.cpp
1 change: 1 addition & 0 deletions gdext/scripts/gds_bindings.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"ImGui_GetColorU32",
"ImGui_GetColorU32Ex",
"ImGui_GetColorU32ImU32",
"ImGui_GetColorU32ImU32Ex",
"ImGui_GetColorU32ImVec4",
"ImGui_GetCurrentContext",
"ImGui_NewFrame",
Expand Down

0 comments on commit 916d9cd

Please sign in to comment.