Update imgui to 1.90.8

drhelius · Jun 8, 2024 · c4c7880 · c4c7880
1 parent 209e7d0
commit c4c7880
Show file tree

Hide file tree

Showing 11 changed files with 2,159 additions and 1,076 deletions.
diff --git a/platforms/desktop-shared/imgui/imgui.cpp b/platforms/desktop-shared/imgui/imgui.cpp
diff --git a/platforms/desktop-shared/imgui/imgui.h b/platforms/desktop-shared/imgui/imgui.h
diff --git a/platforms/desktop-shared/imgui/imgui_demo.cpp b/platforms/desktop-shared/imgui/imgui_demo.cpp
diff --git a/platforms/desktop-shared/imgui/imgui_draw.cpp b/platforms/desktop-shared/imgui/imgui_draw.cpp
diff --git a/platforms/desktop-shared/imgui/imgui_impl_opengl2.cpp b/platforms/desktop-shared/imgui/imgui_impl_opengl2.cpp
@@ -83,6 +83,7 @@ static ImGui_ImplOpenGL2_Data* ImGui_ImplOpenGL2_GetBackendData()
 bool    ImGui_ImplOpenGL2_Init()
 {
     ImGuiIO& io = ImGui::GetIO();
+    IMGUI_CHECKVERSION();
     IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!");
 
     // Setup backend capabilities flags
@@ -108,7 +109,7 @@ void    ImGui_ImplOpenGL2_Shutdown()
 void    ImGui_ImplOpenGL2_NewFrame()
 {
     ImGui_ImplOpenGL2_Data* bd = ImGui_ImplOpenGL2_GetBackendData();
-    IM_ASSERT(bd != nullptr && "Did you call ImGui_ImplOpenGL2_Init()?");
+    IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplOpenGL2_Init()?");
 
     if (!bd->FontTexture)
         ImGui_ImplOpenGL2_CreateDeviceObjects();
@@ -299,4 +300,4 @@ void    ImGui_ImplOpenGL2_DestroyDeviceObjects()
 #pragma clang diagnostic pop
 #endif
 
-#endif // #ifndef IMGUI_DISABLE
+#endif // #ifndef IMGUI_DISABLE
diff --git a/platforms/desktop-shared/imgui/imgui_impl_opengl2.h b/platforms/desktop-shared/imgui/imgui_impl_opengl2.h
@@ -35,4 +35,4 @@ IMGUI_IMPL_API void     ImGui_ImplOpenGL2_DestroyFontsTexture();
 IMGUI_IMPL_API bool     ImGui_ImplOpenGL2_CreateDeviceObjects();
 IMGUI_IMPL_API void     ImGui_ImplOpenGL2_DestroyDeviceObjects();
 
-#endif // #ifndef IMGUI_DISABLE
+#endif // #ifndef IMGUI_DISABLE
diff --git a/platforms/desktop-shared/imgui/imgui_impl_sdl2.cpp b/platforms/desktop-shared/imgui/imgui_impl_sdl2.cpp
@@ -306,8 +306,9 @@ static void ImGui_ImplSDL2_UpdateKeyModifiers(SDL_Keymod sdl_key_mods)
 // If you have multiple SDL events and some of them are not meant to be used by dear imgui, you may need to filter events based on their windowID field.
 bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event)
 {
-    ImGuiIO& io = ImGui::GetIO();
     ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
+    IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplSDL2_Init()?");
+    ImGuiIO& io = ImGui::GetIO();
 
     switch (event->type)
     {
@@ -399,6 +400,7 @@ bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event)
 static bool ImGui_ImplSDL2_Init(SDL_Window* window, SDL_Renderer* renderer)
 {
     ImGuiIO& io = ImGui::GetIO();
+    IMGUI_CHECKVERSION();
     IM_ASSERT(io.BackendPlatformUserData == nullptr && "Already initialized a platform backend!");
 
     // Check and store if we are on a SDL backend that supports global mouse position
@@ -704,7 +706,7 @@ static void ImGui_ImplSDL2_UpdateGamepads()
 void ImGui_ImplSDL2_NewFrame()
 {
     ImGui_ImplSDL2_Data* bd = ImGui_ImplSDL2_GetBackendData();
-    IM_ASSERT(bd != nullptr && "Did you call ImGui_ImplSDL2_Init()?");
+    IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplSDL2_Init()?");
     ImGuiIO& io = ImGui::GetIO();
 
     // Setup display size (every frame to accommodate for window resizing)
@@ -750,4 +752,4 @@ void ImGui_ImplSDL2_NewFrame()
 #pragma clang diagnostic pop
 #endif
 
-#endif // #ifndef IMGUI_DISABLE
+#endif // #ifndef IMGUI_DISABLE
diff --git a/platforms/desktop-shared/imgui/imgui_impl_sdl2.h b/platforms/desktop-shared/imgui/imgui_impl_sdl2.h
@@ -42,4 +42,4 @@ IMGUI_IMPL_API bool     ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
 enum ImGui_ImplSDL2_GamepadMode { ImGui_ImplSDL2_GamepadMode_AutoFirst, ImGui_ImplSDL2_GamepadMode_AutoAll, ImGui_ImplSDL2_GamepadMode_Manual };
 IMGUI_IMPL_API void     ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode, struct _SDL_GameController** manual_gamepads_array = NULL, int manual_gamepads_count = -1);
 
-#endif // #ifndef IMGUI_DISABLE
+#endif // #ifndef IMGUI_DISABLE
diff --git a/platforms/desktop-shared/imgui/imgui_internal.h b/platforms/desktop-shared/imgui/imgui_internal.h
diff --git a/platforms/desktop-shared/imgui/imgui_tables.cpp b/platforms/desktop-shared/imgui/imgui_tables.cpp
diff --git a/platforms/desktop-shared/imgui/imgui_widgets.cpp b/platforms/desktop-shared/imgui/imgui_widgets.cpp