[thirdparty] updated imgui to latest

PanosK92 · Oct 31, 2024 · 260dc27 · 260dc27
1 parent d527baa
commit 260dc27
Show file tree

Hide file tree

Showing 17 changed files with 2,288 additions and 1,379 deletions.
diff --git a/editor/Editor.cpp b/editor/Editor.cpp
@@ -27,7 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "ImGui/ImGuiExtension.h"
 #include "ImGui/Implementation/ImGui_RHI.h"
 #include "ImGui/Implementation/imgui_impl_sdl2.h"
-#include "ImGui/Implementation/ImGui_Style.h"
 #include "Widgets/AssetBrowser.h"
 #include "Widgets/Console.h"
 #include "Widgets/Style.h"

diff --git a/editor/EditorWindow.cpp b/editor/EditorWindow.cpp
@@ -400,8 +400,6 @@ namespace
                 const float col_b = 20.0f;
 
                 {
-
-
                     ImGui::NewLine();
                     ImGui::SameLine(col_b);
                     ImGui::Text("Shortcut");

diff --git a/editor/ImGui/ImGuiExtension.h b/editor/ImGui/ImGuiExtension.h
@@ -154,13 +154,13 @@ namespace ImGuiSp
 
         bool result = ImGui::ImageButton
         (
-            std::to_string(id).c_str(),        // str_id
-            static_cast<ImTextureID>(texture), // user_texture_id
-            size,                              // size
-            ImVec2(0, 0),                      // uv0
-            ImVec2(1, 1),                      // uv1
-            ImColor(0, 0, 0, 0),               // bg_col
-            tint                               // tint_col
+            std::to_string(id).c_str(),             // str_id
+            reinterpret_cast<ImTextureID>(texture), // user_texture_id
+            size,                                   // size
+            ImVec2(0, 0),                           // uv0
+            ImVec2(1, 1),                           // uv1
+            ImColor(0, 0, 0, 0),                    // bg_col
+            tint                                    // tint_col
         );
 
         if (!border)
@@ -174,7 +174,7 @@ namespace ImGuiSp
     static void image(const Icon& icon, const float size)
     {
         ImGui::Image(
-            static_cast<ImTextureID>(icon.GetTexture()),
+            reinterpret_cast<ImTextureID>(icon.GetTexture()),
             ImVec2(size, size),
             ImVec2(0, 0),
             ImVec2(1, 1),
@@ -191,7 +191,7 @@ namespace ImGuiSp
         }
 
         ImGui::Image(
-            static_cast<ImTextureID>(texture),
+            reinterpret_cast<ImTextureID>(texture),
             size,
             ImVec2(0, 0),
             ImVec2(1, 1),
@@ -208,7 +208,7 @@ namespace ImGuiSp
     static void image(Spartan::RHI_Texture* texture, const ImVec2& size, const ImVec4& tint = default_tint, const ImColor& border = ImColor(0, 0, 0, 0))
     {
         ImGui::Image(
-            static_cast<ImTextureID>(texture),
+            reinterpret_cast<ImTextureID>(texture),
             size,
             ImVec2(0, 0),
             ImVec2(1, 1),
@@ -220,7 +220,7 @@ namespace ImGuiSp
     static void image(const IconType icon, const float size)
     {
         ImGui::Image(
-            static_cast<void*>(IconLoader::GetTextureByType(icon)),
+            reinterpret_cast<ImTextureID>(IconLoader::GetTextureByType(icon)),
             ImVec2(size, size),
             ImVec2(0, 0),
             ImVec2(1, 1),
@@ -232,7 +232,7 @@ namespace ImGuiSp
     static void image(const IconType icon, const float size,const ImVec4 tint)
     {
         ImGui::Image(
-            static_cast<void*>(IconLoader::GetTextureByType(icon)),
+            reinterpret_cast<ImTextureID>(IconLoader::GetTextureByType(icon)),
             ImVec2(size, size),
             ImVec2(0, 0),
             ImVec2(1, 1),

diff --git a/editor/ImGui/Implementation/ImGui_RHI.h b/editor/ImGui/Implementation/ImGui_RHI.h
@@ -41,6 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "RHI/RHI_RasterizerState.h"
 #include "RHI/RHI_DepthStencilState.h"
 #include <Debugging.h>
+#include <SDL_video.h>
 //======================================
 
 namespace ImGui::RHI
@@ -167,7 +168,7 @@ namespace ImGui::RHI
 
             // upload texture to graphics system
             g_font_atlas = make_shared<RHI_Texture>(RHI_Texture_Type::Type2D, atlas_width, atlas_height, 1, 1, RHI_Format::R8G8B8A8_Unorm, RHI_Texture_Srv, "imgui_font_atlas", texture_data);
-            io.Fonts->TexID = static_cast<ImTextureID>(g_font_atlas.get());
+            io.Fonts->TexID = reinterpret_cast<ImTextureID>(g_font_atlas.get());
         }
 
         // setup back-end capabilities flags
@@ -326,7 +327,7 @@ namespace ImGui::RHI
                                 bool is_texture_visualised = false;
                                 bool is_frame_texture      = false;
 
-                                if (RHI_Texture* texture = static_cast<RHI_Texture*>(pcmd->TextureId))
+                                if (RHI_Texture* texture = reinterpret_cast<RHI_Texture*>(pcmd->TextureId))
                                 {
                                     is_frame_texture = Renderer::GetRenderTarget(Renderer_RenderTarget::frame_output)->GetObjectId() == texture->GetObjectId();
 
@@ -398,14 +399,15 @@ namespace ImGui::RHI
 
     void window_create(ImGuiViewport* viewport)
     {
-        // note: platformHandle is SDL_Window, PlatformHandleRaw is HWND
-
         SP_ASSERT_MSG(viewport->PlatformHandle != nullptr, "Platform handle is invalid");
 
+        // note: platformHandle is SDL_Window, PlatformHandleRaw is HWND
+        SDL_Window* sdl_window = SDL_GetWindowFromID(static_cast<uint32_t>(reinterpret_cast<uintptr_t>(viewport->PlatformHandle)));
+
         WindowData* window = new WindowData();
         window->swapchain = make_shared<RHI_SwapChain>
         (
-            viewport->PlatformHandle,
+            sdl_window, 
             static_cast<uint32_t>(viewport->Size.x),
             static_cast<uint32_t>(viewport->Size.y),
             RHI_Present_Mode::Immediate,

diff --git a/editor/ImGui/Implementation/ImGui_Style.h b/editor/ImGui/Implementation/ImGui_Style.h
@@ -205,7 +205,7 @@ namespace ImGui::Style
         style.Colors[ImGuiCol_SliderGrabActive]          = color_accent_1;
         style.Colors[ImGuiCol_ResizeGripActive]          = color_accent_1;
         style.Colors[ImGuiCol_DragDropTarget]            = color_accent_1;
-        style.Colors[ImGuiCol_NavHighlight]              = color_accent_1;
+        style.Colors[ImGuiCol_NavCursor]                 = color_accent_1;
         style.Colors[ImGuiCol_NavWindowingHighlight]     = color_accent_1;
         style.Colors[ImGuiCol_TabSelectedOverline]       = color_accent_1;
         style.Colors[ImGuiCol_TabDimmedSelectedOverline] = color_accent_1;