Skip to content

Commit 5eebc03

Browse files
committed
update imgui to 1.87
1 parent 1411f5f commit 5eebc03

File tree

12 files changed

+3137
-1549
lines changed

12 files changed

+3137
-1549
lines changed

depend/imgui/imconfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
3030
//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
31+
//#define IMGUI_DISABLE_OBSOLETE_KEYIO // 1.87: disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This will be folded into IMGUI_DISABLE_OBSOLETE_FUNCTIONS in a few versions.
3132

3233
//---- Disable all of Dear ImGui or don't implement standard windows.
3334
// It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.

depend/imgui/imgui.cpp

Lines changed: 1749 additions & 881 deletions
Large diffs are not rendered by default.

depend/imgui/imgui.h

Lines changed: 316 additions & 185 deletions
Large diffs are not rendered by default.

depend/imgui/imgui_demo.cpp

Lines changed: 287 additions & 41 deletions
Large diffs are not rendered by default.

depend/imgui/imgui_draw.cpp

Lines changed: 55 additions & 48 deletions
Large diffs are not rendered by default.

depend/imgui/imgui_impl_dx11.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
266266
// Project scissor/clipping rectangles into framebuffer space
267267
ImVec2 clip_min(pcmd->ClipRect.x - clip_off.x, pcmd->ClipRect.y - clip_off.y);
268268
ImVec2 clip_max(pcmd->ClipRect.z - clip_off.x, pcmd->ClipRect.w - clip_off.y);
269-
if (clip_max.x < clip_min.x || clip_max.y < clip_min.y)
269+
if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y)
270270
continue;
271271

272272
// Apply scissor/clipping rectangle

depend/imgui/imgui_impl_dx9.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
251251
// Project scissor/clipping rectangles into framebuffer space
252252
ImVec2 clip_min(pcmd->ClipRect.x - clip_off.x, pcmd->ClipRect.y - clip_off.y);
253253
ImVec2 clip_max(pcmd->ClipRect.z - clip_off.x, pcmd->ClipRect.w - clip_off.y);
254-
if (clip_max.x < clip_min.x || clip_max.y < clip_min.y)
254+
if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y)
255255
continue;
256256

257257
// Apply Scissor/clipping rectangle, Bind texture, Draw

depend/imgui/imgui_impl_win32.cpp

Lines changed: 270 additions & 96 deletions
Large diffs are not rendered by default.

depend/imgui/imgui_impl_win32.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
// Implemented features:
55
// [X] Platform: Clipboard support (for Win32 this is actually part of core dear imgui)
6-
// [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
7-
// [X] Platform: Keyboard arrays indexed using VK_* Virtual Key Codes, e.g. ImGui::IsKeyPressed(VK_SPACE).
6+
// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy VK_* values will also be supported unless IMGUI_DISABLE_OBSOLETE_KEYIO is set]
87
// [X] Platform: Gamepad support. Enabled with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'.
8+
// [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
99

10-
// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
10+
// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
1111
// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
1212
// If you are new to Dear ImGui, read documentation from the docs/ folder + read the top of imgui.cpp.
1313
// Read online: https://github.com/ocornut/imgui/tree/master/docs

depend/imgui/imgui_internal.h

Lines changed: 210 additions & 94 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)