Bump imgui

code/framework/src/external/imgui/widgets/console.cpp

@@ -65,7 +65,6 @@ namespace Framework::External::ImGUI::Widgets {
         }
         else {
             ImGui::SetNextWindowBgAlpha(_consoleUnfocusedAlpha);
-            ImGui::PushFontShadow(0xFF000000);
         }
 
         auto windowFlags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;
@@ -299,10 +298,6 @@ namespace Framework::External::ImGUI::Widgets {
         ImGui::Separator();
         ImGui::TextColored(ImVec4(1, 0, 0, 1), "Press ALT to return controls to game or console");
 
-        if (!_consoleControl) {
-            ImGui::PopFontShadow();
-        }
-
         ImGui::End();
 
         return true;

code/framework/src/external/imgui/widgets/corner_text.h

@@ -21,7 +21,7 @@ namespace Framework::External::ImGUI::Widgets {
         CORNER_RIGHT_BOTTOM,
     };
     // Adapted from Mafia: Oakwood Multiplayer
-    static inline void DrawCornerText(Corner corner, const std::string &text, bool shadow = true) {
+    static inline void DrawCornerText(Corner corner, const std::string &text) {
         constexpr float padding       = 2.0f;
         ImGuiIO &io                   = ImGui::GetIO();
         ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav;
@@ -40,11 +40,7 @@ namespace Framework::External::ImGUI::Widgets {
         const auto windowName = fmt::format("Overlay #{}", corner);
 
         if (ImGui::Begin(windowName.c_str(), nullptr, window_flags)) {
-            if (shadow)
-                ImGui::PushFontShadow(0xFF000000);
             ImGui::Text("%s", text.c_str());
-            if (shadow)
-                ImGui::PopFontShadow();
         }
         ImGui::End();
     }

code/framework/src/external/imgui/wrapper.cpp

@@ -13,7 +13,6 @@
 #include <backends/imgui_impl_dx11.h>
 #include <backends/imgui_impl_dx12.h>
 #include <backends/imgui_impl_dx9.h>
-#include <backends/imgui_impl_sdl.h>
 #include <backends/imgui_impl_win32.h>
 
 extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -34,10 +33,6 @@ namespace Framework::External::ImGUI {
             return Error::IMGUI_WINDOW_NOT_SET;
         }
 
-        if (!_config.sdlWindow && _config.windowBackend == Graphics::PlatformBackend::PLATFORM_SDL2) {
-            return Error::IMGUI_WINDOW_NOT_SET;
-        }
-
         IMGUI_CHECKVERSION();
         ImGui::CreateContext();
         auto &io = ImGui::GetIO();
@@ -65,9 +60,6 @@ namespace Framework::External::ImGUI {
         case Graphics::PlatformBackend::PLATFORM_WIN32: {
             ImGui_ImplWin32_Init(_config.windowHandle);
         } break;
-        case Graphics::PlatformBackend::PLATFORM_SDL2: {
-            ImGui_ImplSDL2_InitForD3D(_config.sdlWindow);
-        } break;
         }
 
         _initialized = isContextInitialized = true;
@@ -95,9 +87,6 @@ namespace Framework::External::ImGUI {
         case Graphics::PlatformBackend::PLATFORM_WIN32: {
             ImGui_ImplWin32_Shutdown();
         } break;
-        case Graphics::PlatformBackend::PLATFORM_SDL2: {
-            ImGui_ImplSDL2_Shutdown();
-        } break;
         }
 
         ImGui::DestroyContext();
@@ -125,9 +114,6 @@ namespace Framework::External::ImGUI {
         case Graphics::PlatformBackend::PLATFORM_WIN32: {
             ImGui_ImplWin32_NewFrame();
         } break;
-        case Graphics::PlatformBackend::PLATFORM_SDL2: {
-            ImGui_ImplSDL2_NewFrame();
-        } break;
         }
 
         ImGui::NewFrame();
@@ -173,13 +159,6 @@ namespace Framework::External::ImGUI {
     }
 
     InputState Wrapper::ProcessEvent(const SDL_Event *event) const {
-        if (_config.windowBackend != Graphics::PlatformBackend::PLATFORM_SDL2) {
-            return InputState::ERROR_MISMATCH;
-        }
-
-        if (ImGui_ImplSDL2_ProcessEvent(event)) {
-            return InputState::BLOCK;
-        }
         return InputState::PASS;
     }
 

code/framework/src/graphics/types.h

@@ -22,7 +22,6 @@ namespace Framework::Graphics {
 
     enum class PlatformBackend {
         PLATFORM_WIN32,
-        PLATFORM_SDL2
     };
 
     enum class RendererState {

vendors/imgui/CMakeLists.txt

@@ -8,7 +8,6 @@ add_library(DearImGUI STATIC
     backends/imgui_impl_dx9.cpp
     backends/imgui_impl_dx11.cpp
     backends/imgui_impl_dx12.cpp
-    backends/imgui_impl_sdl.cpp
     backends/imgui_impl_win32.cpp
 )
 

vendors/imgui/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2024 Omar Cornut
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.