update imgui to version 1.91.1 and README.md, freeze developing for now

Author: CodeWinAdmin

CMakeLists.txt

@@ -285,7 +285,7 @@ target_link_libraries(
 )
 endif(APPLE)
 
-option(DEV_BACKGROUND_TASK "Developping background task feature" ON)
+option(DEV_BACKGROUND_TASK "Developping background task feature" OFF)
 if(DEV_BACKGROUND_TASK)
 target_compile_definitions(${MEDIA_EDITOR_BINARY} PRIVATE ENABLE_BACKGROUND_TASK)
 endif()

README.md

@@ -24,6 +24,9 @@
 <div>
 <a href="https://github.com/opencodewin/MediaEditor/releases/tag/v0.9.9"><img alt="v0.9.9" src="docs/assets/version_4.svg" /></a>
 
+<h3>&nbsp;&nbsp;⚠️⚠️⚠️&nbsp; Update on December 4, 2024.</h3>
+  <h4> We are very sorry, since we disable some code of submodules, Mec 0.9.9 is broken build for a long time. For this project, our developers selflessly provided time, energy, and financial resources, but it is now difficult to have the financial support to complete the promised features. </h4>
+  <h4> Currently project has been suspended, until we can find new resource or financial support. </h4>
 <h3>&nbsp;&nbsp;🎉🎉🎉&nbsp; Released on February 28, 2024.</h3>
 
   - <h4>【New 🔥】Graphic operation mode for video attribute editing.</h4>

imgui/addon/ImVulkanShader/imvk_image_mat.h

@@ -198,7 +198,7 @@ inline VkImageMat& VkImageMat::operator=(const ImMat& m)
 
 inline void VkImageMat::allocate_buffer()
 {
-    size_t totalsize = Im_AlignSize(total() * elemsize, 4);
+    size_t totalsize = Im_AlignSize(total() * elemsize, IM_CSTEP_ALIGN);
 
     data = ((VkAllocator*)allocator)->fastMalloc(w, h, c, elemsize, elempack);
     if (!data)
@@ -288,7 +288,7 @@ inline void VkImageMat::create(int _w, int _h, int _c, size_t _elemsize, VkAlloc
     color_range = IM_CR_FULL_RANGE;
     depth = _elemsize == 1 ? 8 : _elemsize == 2 ? 16 : 32;
 
-    cstep = Im_AlignSize((size_t)w * h * elemsize, 16) / elemsize;
+    cstep = Im_AlignSize((size_t)w * h * elemsize, IM_CSTEP_ALIGN) / elemsize;
 
     if (total() > 0)
         allocate_buffer();
@@ -378,7 +378,7 @@ inline void VkImageMat::create(int _w, int _h, int _c, size_t _elemsize, int _el
     color_range = IM_CR_FULL_RANGE;
     depth = _elemsize == 1 ? 8 : _elemsize == 2 ? 16 : 32;
 
-    cstep = Im_AlignSize((size_t)w * h * elemsize, 16) / elemsize;
+    cstep = Im_AlignSize((size_t)w * h * elemsize, IM_CSTEP_ALIGN) / elemsize;
 
     if (total() > 0)
         allocate_buffer();

imgui/addon/ImVulkanShader/imvk_mat.h

@@ -204,7 +204,7 @@ inline VkMat& VkMat::operator=(const ImMat& m)
 
 inline void VkMat::allocate_buffer()
 {
-    size_t totalsize = Im_AlignSize(total() * elemsize, 4);
+    size_t totalsize = Im_AlignSize(total() * elemsize, IM_CSTEP_ALIGN);
 
     data = ((VkAllocator*)allocator)->fastMalloc(totalsize);
     if (!data)
@@ -310,7 +310,7 @@ inline void VkMat::create(int _w, int _h, int _c, size_t _elemsize, VkAllocator*
     duration = NAN;
     index_count = -1;
 
-    cstep = Im_AlignSize((size_t)w * h * elemsize, 16) / elemsize;
+    cstep = Im_AlignSize((size_t)w * h * elemsize, IM_CSTEP_ALIGN) / elemsize;
 
     if (total() > 0)
         allocate_buffer();
@@ -415,7 +415,7 @@ inline void VkMat::create(int _w, int _h, int _c, size_t _elemsize, int _elempac
     duration = NAN;
     index_count = -1;
 
-    cstep = Im_AlignSize((size_t)w * h * elemsize, 16) / elemsize;
+    cstep = Im_AlignSize((size_t)w * h * elemsize, IM_CSTEP_ALIGN) / elemsize;
 
     if (total() > 0)
         allocate_buffer();
@@ -509,7 +509,7 @@ inline void VkMat::create_type(int _w, int _h, int _c, ImDataType _t, VkAllocato
     dh = h = _h;
     c = _c;
 
-    cstep = Im_AlignSize((size_t)w * h * elemsize, 16) / elemsize;
+    cstep = Im_AlignSize((size_t)w * h * elemsize, IM_CSTEP_ALIGN) / elemsize;
     type = _t;
     color_space = IM_CS_SRGB;
     color_format = c == 1 ? IM_CF_GRAY : c == 3 ? IM_CF_BGR : IM_CF_ABGR;

imgui/backends/imgui_impl_glfw.cpp

@@ -590,7 +590,11 @@ void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows)
 }
 
 #ifdef __EMSCRIPTEN__
-EM_JS(void, ImGui_ImplGlfw_EmscriptenOpenURL, (char const* url), { url = url ? UTF8ToString(url) : null; if (url) window.open(url, '_blank'); });
+#if EMSCRIPTEN_USE_PORT_CONTRIB_GLFW3 >= 3'4'0'20240817
+void ImGui_ImplGlfw_EmscriptenOpenURL(const char* url) { if (url) emscripten::glfw3::OpenURL(url); }
+#else
+EM_JS(void, ImGui_ImplGlfw_EmscriptenOpenURL, (const char* url), { url = url ? UTF8ToString(url) : null; if (url) window.open(url, '_blank'); });
+#endif
 #endif
 
 static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, GlfwClientApi client_api)

imgui/backends/imgui_impl_sdl2.cpp

@@ -206,7 +206,8 @@ static void ImGui_ImplSDL2_PlatformSetImeData(ImGuiContext*, ImGuiViewport* view
         r.h = (int)data->InputLineHeight;
         SDL_SetTextInputRect(&r);
 #ifdef _WIN32
-        SDL_Window* window = (SDL_Window*)viewport->PlatformHandle;
+        Uint32 windowID = (Uint32)(intptr_t)(viewport->PlatformHandle);
+        SDL_Window* window = SDL_GetWindowFromID(windowID);
         if (window)
         {
             SDL_SysWMinfo wmInfo;

imgui/backends/imgui_impl_vulkan.cpp

@@ -2378,6 +2378,22 @@ ImTextureID ImGui_ImplVulkan_CreateTexture(const void * pixels, int width, int h
         copyBufferToImage(v, commandPool, stagingBuffer, 0, texture->textureImage, 
                     static_cast<uint32_t>(width), static_cast<uint32_t>(height));
     }
+    else if (bit_depth == 16)
+    {
+        VkImage textureImage = VK_NULL_HANDLE;
+        VkDeviceMemory textureImageMemory = VK_NULL_HANDLE;
+        createImage(v, width, height, VK_FORMAT_R16G16B16A16_UNORM,
+                    VK_IMAGE_TILING_OPTIMAL,
+                    VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+                    VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+                    textureImage, textureImageMemory);
+        copyBufferToImage(v, commandPool, stagingBuffer, 0, textureImage, 
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height));
+        BlitImage(v, commandPool, textureImage, texture->textureImage,
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height));
+        vkDestroyImage(v->Device, textureImage, v->Allocator);
+        vkFreeMemory(v->Device, textureImageMemory, v->Allocator);
+    }
     else if (bit_depth == 32)
     {
         VkImage textureImage = VK_NULL_HANDLE;
@@ -2438,6 +2454,22 @@ ImTextureID ImGui_ImplVulkan_CreateTexture(VkBuffer buffer, size_t buffer_offset
         copyBufferToImage(v, commandPool, buffer, buffer_offset, texture->textureImage, 
                         static_cast<uint32_t>(width), static_cast<uint32_t>(height));
     }
+    else if (bit_depth == 16)
+    {
+        VkImage textureImage = VK_NULL_HANDLE;
+        VkDeviceMemory textureImageMemory = VK_NULL_HANDLE;
+        createImage(v, width, height, VK_FORMAT_R16G16B16A16_UNORM,
+                    VK_IMAGE_TILING_OPTIMAL,
+                    VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+                    VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+                    textureImage, textureImageMemory);
+        copyBufferToImage(v, commandPool, buffer, buffer_offset, textureImage, 
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height));
+        BlitImage(v, commandPool, textureImage, texture->textureImage,
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height));
+        vkDestroyImage(v->Device, textureImage, v->Allocator);
+        vkFreeMemory(v->Device, textureImageMemory, v->Allocator);
+    }
     else if (bit_depth == 32)
     {
         VkImage textureImage = VK_NULL_HANDLE;
@@ -2486,6 +2518,23 @@ void ImGui_ImplVulkan_UpdateTexture(ImTextureID textureid, VkBuffer stagingBuffe
         copyBufferToImage(v, commandPool, stagingBuffer, buffer_offset, texture->textureImage, 
                     static_cast<uint32_t>(width), static_cast<uint32_t>(height), offset_x, offset_y);
     }
+    else if (bit_depth == 16)
+    {
+        VkImage textureImage = VK_NULL_HANDLE;
+        VkDeviceMemory textureImageMemory = VK_NULL_HANDLE;
+        createImage(v, static_cast<uint32_t>(width), static_cast<uint32_t>(height), VK_FORMAT_R16G16B16A16_UNORM,
+                    VK_IMAGE_TILING_OPTIMAL,
+                    VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+                    VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+                    textureImage, textureImageMemory);
+        copyBufferToImage(v, commandPool, stagingBuffer, buffer_offset, textureImage, 
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height));
+        BlitImage(v, commandPool, textureImage, texture->textureImage,
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height),
+                    offset_x, offset_y);
+        vkDestroyImage(v->Device, textureImage, v->Allocator);
+        vkFreeMemory(v->Device, textureImageMemory, v->Allocator);
+    }
     else if (bit_depth == 32)
     {
         VkImage textureImage = VK_NULL_HANDLE;
@@ -2550,6 +2599,23 @@ void ImGui_ImplVulkan_UpdateTexture(ImTextureID textureid, const void * pixels,
         copyBufferToImage(v, commandPool, stagingBuffer, 0, texture->textureImage, 
                     static_cast<uint32_t>(width), static_cast<uint32_t>(height), offset_x, offset_y);
     }
+    else if (bit_depth == 16)
+    {
+        VkImage textureImage = VK_NULL_HANDLE;
+        VkDeviceMemory textureImageMemory = VK_NULL_HANDLE;
+        createImage(v, static_cast<uint32_t>(width), static_cast<uint32_t>(height), VK_FORMAT_R16G16B16A16_UNORM,
+                    VK_IMAGE_TILING_OPTIMAL,
+                    VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+                    VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+                    textureImage, textureImageMemory);
+        copyBufferToImage(v, commandPool, stagingBuffer, 0, textureImage, 
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height));
+        BlitImage(v, commandPool, textureImage, texture->textureImage,
+                    static_cast<uint32_t>(width), static_cast<uint32_t>(height),
+                    offset_x, offset_y);
+        vkDestroyImage(v->Device, textureImage, v->Allocator);
+        vkFreeMemory(v->Device, textureImageMemory, v->Allocator);
+    }
     else if (bit_depth == 32)
     {
         VkImage textureImage = VK_NULL_HANDLE;

imgui/imgui.cpp

@@ -1,4 +1,4 @@
-// dear imgui, v1.91.1 WIP
+// dear imgui, v1.91.1
 // (main code and documentation)
 
 // Help:
@@ -4485,7 +4485,7 @@ bool ImGui::IsItemHovered(ImGuiHoveredFlags flags)
     const float delay = CalcDelayFromHoveredFlags(flags);
     if (delay > 0.0f || (flags & ImGuiHoveredFlags_Stationary))
     {
-        ImGuiID hover_delay_id = (g.LastItemData.ID != 0) ? g.LastItemData.ID : window->GetIDFromRectangle(g.LastItemData.Rect);
+        ImGuiID hover_delay_id = (g.LastItemData.ID != 0) ? g.LastItemData.ID : window->GetIDFromPos(g.LastItemData.Rect.Min);
         if ((flags & ImGuiHoveredFlags_NoSharedDelay) && (g.HoverItemDelayIdPreviousFrame != hover_delay_id))
             g.HoverItemDelayTimer = 0.0f;
         g.HoverItemDelayId = hover_delay_id;
@@ -9242,6 +9242,16 @@ ImGuiID ImGuiWindow::GetID(int n)
 }
 
 // This is only used in rare/specific situations to manufacture an ID out of nowhere.
+// FIXME: Consider instead storing last non-zero ID + count of successive zero-ID, and combine those?
+ImGuiID ImGuiWindow::GetIDFromPos(const ImVec2& p_abs)
+{
+    ImGuiID seed = IDStack.back();
+    ImVec2 p_rel = ImGui::WindowPosAbsToRel(this, p_abs);
+    ImGuiID id = ImHashData(&p_rel, sizeof(p_rel), seed);
+    return id;
+}
+
+// "
 ImGuiID ImGuiWindow::GetIDFromRectangle(const ImRect& r_abs)
 {
     ImGuiID seed = IDStack.back();
@@ -12338,6 +12348,9 @@ void ImGui::ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_
     ImGuiContext& g = *GImGui;
     IMGUI_DEBUG_LOG_POPUP("[popup] ClosePopupToLevel(%d), restore_under=%d\n", remaining, restore_focus_to_window_under_popup);
     IM_ASSERT(remaining >= 0 && remaining < g.OpenPopupStack.Size);
+    if (g.DebugLogFlags & ImGuiDebugLogFlags_EventPopup)
+        for (int n = remaining; n < g.OpenPopupStack.Size; n++)
+            IMGUI_DEBUG_LOG_POPUP("[popup] - Closing PopupID 0x%08X Window \"%s\"\n", g.OpenPopupStack[n].PopupId, g.OpenPopupStack[n].Window ? g.OpenPopupStack[n].Window->Name : NULL);
 
     // Trim open popup stack
     ImGuiPopupData prev_popup = g.OpenPopupStack[remaining];
@@ -20939,7 +20952,7 @@ void ImGui::UpdateDebugToolFlashStyleColor()
     ImGuiContext& g = *GImGui;
     if (g.DebugFlashStyleColorTime <= 0.0f)
         return;
-    ColorConvertHSVtoRGB(cosf(g.DebugFlashStyleColorTime * 6.0f) * 0.5f + 0.5f, 0.5f, 0.5f, g.Style.Colors[g.DebugFlashStyleColorIdx].x, g.Style.Colors[g.DebugFlashStyleColorIdx].y, g.Style.Colors[g.DebugFlashStyleColorIdx].z);
+    ColorConvertHSVtoRGB(ImCos(g.DebugFlashStyleColorTime * 6.0f) * 0.5f + 0.5f, 0.5f, 0.5f, g.Style.Colors[g.DebugFlashStyleColorIdx].x, g.Style.Colors[g.DebugFlashStyleColorIdx].y, g.Style.Colors[g.DebugFlashStyleColorIdx].z);
     g.Style.Colors[g.DebugFlashStyleColorIdx].w = 1.0f;
     if ((g.DebugFlashStyleColorTime -= g.IO.DeltaTime) <= 0.0f)
         DebugFlashStyleColorStop();

imgui/imgui.h

@@ -1,4 +1,4 @@
-// dear imgui, v1.91.1 WIP
+// dear imgui, v1.91.1
 // (headers)
 
 // Help:
@@ -28,8 +28,8 @@
 
 // Library Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
-#define IMGUI_VERSION       "1.91.1 WIP"
-#define IMGUI_VERSION_NUM   19104
+#define IMGUI_VERSION       "1.91.1"
+#define IMGUI_VERSION_NUM   19110
 #define IMGUI_HAS_TABLE
 #define IMGUI_HAS_VIEWPORT          // Viewport WIP branch
 #define IMGUI_HAS_DOCK              // Docking WIP branch
@@ -307,7 +307,7 @@ struct ImVec2
 // add by Dicky
 struct ImMat4x4;
 // A Vec3, Matrix 3x3, Dot & Cross products, A Quaternion.  Some helper functions, bare minimum
-struct ImVec3
+struct IMGUI_API ImVec3
 {
     float                                   x, y, z;
     ImVec3()                                : x(0.0f), y(0.0f), z(0.0f) { }
@@ -321,7 +321,7 @@ struct ImVec3
 // add by Dicky end
 
 // ImVec4: 4D vector used to store clipping rectangles, colors etc. [Compile-time configurable type]
-struct ImVec4
+struct IMGUI_API ImVec4
 {
     float                                                     x, y, z, w;
     constexpr ImVec4()                                        : x(0.0f), y(0.0f), z(0.0f), w(0.0f) { }
@@ -335,7 +335,7 @@ struct ImVec4
 
 // add by Dicky
 // Matrix used to allow user to specify axis orientation
-struct ImMat3x3
+struct IMGUI_API ImMat3x3
 {
     float m[3][3];
     ImMat3x3()
@@ -363,7 +363,7 @@ struct ImMat3x3
     }
 };
 
-struct ImMat4x4
+struct IMGUI_API ImMat4x4
 {
     union
     {
@@ -494,7 +494,7 @@ struct ImMat4x4
     }
 };
 
-struct Vertex {
+struct IMGUI_API Vertex {
     // Attributes
     /** Vertex position */
     ImVec3 position {0.f, 0.f, 0.f};
@@ -674,7 +674,7 @@ namespace ImGui
     // - Use the ShowStyleEditor() function to interactively see/edit the colors.
     IMGUI_API ImFont*       GetFont();                                                      // get current font
     IMGUI_API float         GetFontSize();                                                  // get current font size (= height in pixels) of current font with current scale applied
-    IMGUI_API ImVec2        GetFontTexUvWhitePixel();                                       // get UV coordinate for a while pixel, useful to draw custom shapes via the ImDrawList API
+    IMGUI_API ImVec2        GetFontTexUvWhitePixel();                                       // get UV coordinate for a white pixel, useful to draw custom shapes via the ImDrawList API
     IMGUI_API ImU32         GetColorU32(ImGuiCol idx, float alpha_mul = 1.0f);              // retrieve given style color with style alpha applied and optional extra alpha multiplier, packed as a 32-bit value suitable for ImDrawList
     IMGUI_API ImU32         GetColorU32(const ImVec4& col);                                 // retrieve given color with style alpha applied, packed as a 32-bit value suitable for ImDrawList
     IMGUI_API ImU32         GetColorU32(ImU32 col, float alpha_mul = 1.0f);                 // retrieve given color with style alpha applied, packed as a 32-bit value suitable for ImDrawList
@@ -2298,7 +2298,7 @@ enum ImGuiTableColumnFlags_
     ImGuiTableColumnFlags_NoSort                = 1 << 9,   // Disable ability to sort on this field (even if ImGuiTableFlags_Sortable is set on the table).
     ImGuiTableColumnFlags_NoSortAscending       = 1 << 10,  // Disable ability to sort in the ascending direction.
     ImGuiTableColumnFlags_NoSortDescending      = 1 << 11,  // Disable ability to sort in the descending direction.
-    ImGuiTableColumnFlags_NoHeaderLabel         = 1 << 12,  // TableHeadersRow() will not submit horizontal label for this column. Convenient for some small columns. Name will still appear in context menu or in angled headers.
+    ImGuiTableColumnFlags_NoHeaderLabel         = 1 << 12,  // TableHeadersRow() will submit an empty label for this column. Convenient for some small columns. Name will still appear in context menu or in angled headers. You may append into this cell by calling TableSetColumnIndex() right after the TableHeadersRow() call.
     ImGuiTableColumnFlags_NoHeaderWidth         = 1 << 13,  // Disable header text width contribution to automatic column width.
     ImGuiTableColumnFlags_PreferSortAscending   = 1 << 14,  // Make the initial sort direction Ascending when first sorting on this column (default).
     ImGuiTableColumnFlags_PreferSortDescending  = 1 << 15,  // Make the initial sort direction Descending when first sorting on this column.
@@ -3500,6 +3500,9 @@ struct ImDrawList
     IMGUI_API void  AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col);
     IMGUI_API void  AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments = 0, float thickness = 1.0f);
     IMGUI_API void  AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments = 0);
+    // add by Dicky
+    IMGUI_API void  AddCircleGradient(const ImVec2 center, float radius, ImU32 col_in, ImU32 col_out);
+    // add by Dicky end
     IMGUI_API void  AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness = 1.0f);
     IMGUI_API void  AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments);
     IMGUI_API void  AddEllipse(const ImVec2& center, const ImVec2& radius, ImU32 col, float rot = 0.0f, int num_segments = 0, float thickness = 1.0f);
@@ -3894,7 +3897,7 @@ enum ImGuiViewportFlags_
     ImGuiViewportFlags_None                     = 0,
     ImGuiViewportFlags_IsPlatformWindow         = 1 << 0,   // Represent a Platform Window
     ImGuiViewportFlags_IsPlatformMonitor        = 1 << 1,   // Represent a Platform Monitor (unused yet)
-    ImGuiViewportFlags_OwnedByApp               = 1 << 2,   // Platform Window: Was created/managed by the user application? (rather than our backend)
+    ImGuiViewportFlags_OwnedByApp               = 1 << 2,   // Platform Window: Is created/managed by the user application? (rather than our backend)
     ImGuiViewportFlags_NoDecoration             = 1 << 3,   // Platform Window: Disable platform decorations: title bar, borders, etc. (generally set all windows, but if ImGuiConfigFlags_ViewportsDecoration is set we only set this on popups/tooltips)
     ImGuiViewportFlags_NoTaskBarIcon            = 1 << 4,   // Platform Window: Disable platform task bar icon (generally set on popups/tooltips, or all windows if ImGuiConfigFlags_ViewportsNoTaskBarIcon is set)
     ImGuiViewportFlags_NoFocusOnAppearing       = 1 << 5,   // Platform Window: Don't take focus when created.