Set ImGui to docking branch

JenjinEngine · Oct 8, 2024 · 2c89ee8 · 2c89ee8
1 parent 21cd994
commit 2c89ee8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -10,6 +10,7 @@
 [submodule "libs/imgui"]
 	path = libs/imgui
 	url = https://github.com/ocornut/imgui
+	branch = docking
 [submodule "libs/stb"]
 	path = libs/stb
 	url = https://github.com/nothings/stb.git
diff --git a/libs/imgui b/libs/imgui
+16 −15		backends/imgui_impl_allegro5.cpp
+2 −1		backends/imgui_impl_allegro5.h
+1 −0		backends/imgui_impl_android.cpp
+1 −0		backends/imgui_impl_android.h
+201 −67		backends/imgui_impl_dx10.cpp
+1 −0		backends/imgui_impl_dx10.h
+220 −74		backends/imgui_impl_dx11.cpp
+13 −0		backends/imgui_impl_dx11.h
+395 −59		backends/imgui_impl_dx12.cpp
+12 −2		backends/imgui_impl_dx12.h
+243 −72		backends/imgui_impl_dx9.cpp
+1 −0		backends/imgui_impl_dx9.h
+545 −33		backends/imgui_impl_glfw.cpp
+4 −0		backends/imgui_impl_glfw.h
+1 −1		backends/imgui_impl_glut.cpp
+1 −1		backends/imgui_impl_glut.h
+1 −0		backends/imgui_impl_metal.h
+169 −9		backends/imgui_impl_metal.mm
+50 −6		backends/imgui_impl_opengl2.cpp
+1 −0		backends/imgui_impl_opengl2.h
+54 −12		backends/imgui_impl_opengl3.cpp
+2 −1		backends/imgui_impl_opengl3.h
+6 −0		backends/imgui_impl_opengl3_loader.h
+4 −0		backends/imgui_impl_osx.h
+344 −12		backends/imgui_impl_osx.mm
+418 −21		backends/imgui_impl_sdl2.cpp
+5 −1		backends/imgui_impl_sdl2.h
+405 −21		backends/imgui_impl_sdl3.cpp
+4 −0		backends/imgui_impl_sdl3.h
+9 −7		backends/imgui_impl_sdlrenderer2.cpp
+2 −0		backends/imgui_impl_sdlrenderer2.h
+9 −7		backends/imgui_impl_sdlrenderer3.cpp
+2 −0		backends/imgui_impl_sdlrenderer3.h
+381 −28		backends/imgui_impl_vulkan.cpp
+25 −14		backends/imgui_impl_vulkan.h
+27 −14		backends/imgui_impl_wgpu.cpp
+12 −0		backends/imgui_impl_wgpu.h
+473 −12		backends/imgui_impl_win32.cpp
+1 −0		backends/imgui_impl_win32.h
+519 −2		docs/CHANGELOG.txt
+43 −1		docs/TODO.txt
+1 −0		examples/example_allegro5/main.cpp
+19 −6		examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
+17 −0		examples/example_apple_metal/main.mm
+17 −0		examples/example_apple_opengl2/main.mm
+18 −1		examples/example_glfw_metal/main.mm
+23 −0		examples/example_glfw_opengl2/main.cpp
+23 −0		examples/example_glfw_opengl3/main.cpp
+29 −9		examples/example_glfw_vulkan/main.cpp
+1 −0		examples/example_glfw_wgpu/main.cpp
+1 −1		examples/example_glut_opengl2/main.cpp
+19 −0		examples/example_sdl2_directx11/main.cpp
+17 −0		examples/example_sdl2_metal/main.mm
+25 −0		examples/example_sdl2_opengl2/main.cpp
+25 −0		examples/example_sdl2_opengl3/main.cpp
+1 −0		examples/example_sdl2_sdlrenderer2/main.cpp
+29 −9		examples/example_sdl2_vulkan/main.cpp
+25 −0		examples/example_sdl3_opengl3/main.cpp
+1 −0		examples/example_sdl3_sdlrenderer3/main.cpp
+19 −1		examples/example_win32_directx10/main.cpp
+37 −1		examples/example_win32_directx11/main.cpp
+19 −1		examples/example_win32_directx12/main.cpp
+33 −1		examples/example_win32_directx9/main.cpp
+70 −0		examples/example_win32_opengl3/main.cpp
+6,051 −182		imgui.cpp
+281 −18		imgui.h
+307 −9		imgui_demo.cpp
+27 −1		imgui_draw.cpp
+324 −23		imgui_internal.h
+1 −1		imgui_tables.cpp
+151 −27		imgui_widgets.cpp
+4 −0		misc/debuggers/imgui.natvis