Update ImGui to 1.91.6

Author: halx99

extensions/ImGui/src/ImGui/ImGuiPresenter.cpp

@@ -31,6 +31,8 @@ THE SOFTWARE.
 #endif
 #include "imgui/imgui_internal.h"
 
+#include "xxhash.h"
+
 // TODO: mac metal
 #if defined(AX_USE_GL) && defined(AX_PLATFORM_PC)
 #    define AX_IMGUI_ENABLE_MULTI_VIEWPORT 1
@@ -40,7 +42,6 @@ THE SOFTWARE.
 
 NS_AX_EXT_BEGIN
 
-
 namespace
 {
 uint32_t fourccValue(std::string_view str)
@@ -139,12 +140,12 @@ std::tuple<ImVec2, ImVec2, ImVec2, ImVec2> getFourPointTextureUV(SpriteFrame* fr
 
 ImVec2 operator+(const ImVec2& lhs, const ImVec2& rhs)
 {
-    return { lhs.x + rhs.x, lhs.y + rhs.y };
+    return {lhs.x + rhs.x, lhs.y + rhs.y};
 }
 
 ImVec2 ImRotate(const ImVec2& v, float cos_a, float sin_a)
 {
-    return { v.x * cos_a - v.y * sin_a, v.x * sin_a + v.y * cos_a };
+    return {v.x * cos_a - v.y * sin_a, v.x * sin_a + v.y * cos_a};
 }
 
 ImVec2& operator+=(ImVec2& lhs, const ImVec2& rhs)
@@ -153,8 +154,7 @@ ImVec2& operator+=(ImVec2& lhs, const ImVec2& rhs)
     lhs.y += rhs.y;
     return lhs;
 }
-}
-
+}  // namespace
 
 class ImGuiEventTracker
 {
@@ -592,8 +592,8 @@ void ImGuiPresenter::endFrame()
 void ImGuiPresenter::update()
 {
     // clear things from last frame
-    usedCCRefIdMap.clear();
-    usedCCRef.clear();
+    _objsRefIdMap.clear();
+    _usedObjs.clear();
     // drawing commands
 
     for (auto iter = _renderLoops.begin(); iter != _renderLoops.end();)
@@ -661,7 +661,7 @@ void ImGuiPresenter::image(Texture2D* tex,
         size_.x = tex->getPixelsWide();
     if (size_.y <= 0.f)
         size_.y = tex->getPixelsHigh();
-    ImGui::PushID(getCCRefId(tex));
+    ImGui::PushID(objectRef(tex));
     ImGui::Image((ImTextureID)tex, size_, uv0, uv1, tint_col, border_col);
     ImGui::PopID();
 }
@@ -705,7 +705,7 @@ void ImGuiPresenter::image(Sprite* sprite,
     const ImVec2 pos[4] = {ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Max.x, bb.Min.y), ImVec2(bb.Max.x, bb.Max.y),
                            ImVec2(bb.Min.x, bb.Max.y)};
 
-    ImGui::PushID(getCCRefId(sprite));
+    ImGui::PushID(objectRef(sprite));
     if (border_col.w > 0.0f)
     {
         window->DrawList->AddRect(bb.Min, bb.Max, ImGui::GetColorU32(border_col), 0.0f);
@@ -759,7 +759,7 @@ void ImGuiPresenter::image(SpriteFrame* spriteFrame,
     const ImVec2 pos[4] = {ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Max.x, bb.Min.y), ImVec2(bb.Max.x, bb.Max.y),
                            ImVec2(bb.Min.x, bb.Max.y)};
 
-    ImGui::PushID(getCCRefId(spriteFrame));
+    ImGui::PushID(objectRef(spriteFrame));
     if (border_col.w > 0.0f)
     {
         window->DrawList->AddRect(bb.Min, bb.Max, ImGui::GetColorU32(border_col), 0.0f);
@@ -780,7 +780,6 @@ bool ImGuiPresenter::imageButton(Texture2D* tex,
                                  const ImVec2& size,
                                  const ImVec2& uv0,
                                  const ImVec2& uv1,
-                                 int frame_padding,
                                  const ImVec4& bg_col,
                                  const ImVec4& tint_col)
 {
@@ -791,15 +790,14 @@ bool ImGuiPresenter::imageButton(Texture2D* tex,
         size_.x = tex->getPixelsWide();
     if (size_.y <= 0.f)
         size_.y = tex->getPixelsHigh();
-    ImGui::PushID(getCCRefId(tex));
-    const auto ret = ImGui::ImageButton((ImTextureID)tex, size_, uv0, uv1, frame_padding, bg_col, tint_col);
+    ImGui::PushID(objectRef(tex));
+    const auto ret = ImGui::ImageButton("###", (ImTextureID)tex, size_, uv0, uv1, bg_col, tint_col);
     ImGui::PopID();
     return ret;
 }
 
 bool ImGuiPresenter::imageButton(Sprite* sprite,
                                  const ImVec2& size,
-                                 int frame_padding,
                                  const ImVec4& bg_col,
                                  const ImVec4& tint_col)
 {
@@ -812,9 +810,8 @@ bool ImGuiPresenter::imageButton(Sprite* sprite,
     if (size_.y <= 0.f)
         size_.y = rect.size.height;
     auto [uv0, uv1] = getTwoPointTextureUV(sprite);
-    ImGui::PushID(getCCRefId(sprite));
-    const auto ret =
-        ImGui::ImageButton((ImTextureID)sprite->getTexture(), size_, uv0, uv1, frame_padding, bg_col, tint_col);
+    ImGui::PushID(objectRef(sprite));
+    const auto ret = ImGui::ImageButton("###", (ImTextureID)sprite->getTexture(), size_, uv0, uv1, bg_col, tint_col);
     ImGui::PopID();
     return ret;
 }
@@ -835,12 +832,12 @@ void ImGuiPresenter::node(Node* node, const ImVec4& tint_col, const ImVec4& bord
         tr.m[13] += 1;
     }
     node->setNodeToParentTransform(tr);
-    ImGui::PushID(getCCRefId(node));
+    ImGui::PushID(objectRef(node));
     ImGui::Image((ImTextureID)node, ImVec2(size.width, size.height), ImVec2(0, 0), ImVec2(1, 1), tint_col, border_col);
     ImGui::PopID();
 }
 
-bool ImGuiPresenter::nodeButton(Node* node, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col)
+bool ImGuiPresenter::nodeButton(Node* node, const ImVec4& bg_col, const ImVec4& tint_col)
 {
     if (!node)
         return false;
@@ -850,50 +847,43 @@ bool ImGuiPresenter::nodeButton(Node* node, int frame_padding, const ImVec4& bg_
     tr.m[5]  = -1;
     tr.m[12] = pos.x;
     tr.m[13] = pos.y + size.height;
-    if (frame_padding >= 0)
-    {
-        tr.m[12] += (float)frame_padding;
-        tr.m[13] += (float)frame_padding;
-    }
-    else
-    {
-        tr.m[12] += ImGui::GetStyle().FramePadding.x;
-        tr.m[13] += ImGui::GetStyle().FramePadding.y;
-    }
+    tr.m[12] += ImGui::GetStyle().FramePadding.x;
+    tr.m[13] += ImGui::GetStyle().FramePadding.y;
+
     node->setNodeToParentTransform(tr);
-    ImGui::PushID(getCCRefId(node));
-    const auto ret = ImGui::ImageButton((ImTextureID)node, ImVec2(size.width, size.height), ImVec2(0, 0), ImVec2(1, 1),
-                                        frame_padding, bg_col, tint_col);
+    ImGui::PushID(objectRef(node));
+    const auto ret = ImGui::ImageButton("###", (ImTextureID)node, ImVec2(size.width, size.height), ImVec2(0, 0),
+                                        ImVec2(1, 1), bg_col, tint_col);
     ImGui::PopID();
     return ret;
 }
 
 std::tuple<ImTextureID, int> ImGuiPresenter::useTexture(Texture2D* texture)
 {
     if (!texture)
-        return std::tuple<ImTextureID, int>{nullptr, 0};
-    return std::tuple{(ImTextureID)texture, getCCRefId(texture)};
+        return std::tuple<ImTextureID, int>{0, 0};
+    return std::tuple{(ImTextureID)texture, objectRef(texture)};
 }
 
 std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiPresenter::useSprite(Sprite* sprite)
 {
     if (!sprite || !sprite->getTexture())
-        return std::tuple<ImTextureID, ImVec2, ImVec2, int>{nullptr, {}, {}, 0};
+        return std::tuple<ImTextureID, ImVec2, ImVec2, int>{0, {}, {}, 0};
     auto [uv0, uv1] = getTwoPointTextureUV(sprite);
-    return std::tuple{(ImTextureID)sprite->getTexture(), uv0, uv1, getCCRefId(sprite)};
+    return std::tuple{(ImTextureID)sprite->getTexture(), uv0, uv1, objectRef(sprite)};
 }
 
 std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiPresenter::useNode(Node* node, const ImVec2& pos)
 {
     if (!node)
-        return std::tuple<ImTextureID, ImVec2, ImVec2, int>{nullptr, {}, {}, 0};
+        return std::tuple<ImTextureID, ImVec2, ImVec2, int>{0, {}, {}, 0};
     const auto size = node->getContentSize();
     Mat4 tr;
     tr.m[5]  = -1;
     tr.m[12] = pos.x;
     tr.m[13] = pos.y + size.height;
     node->setNodeToParentTransform(tr);
-    return std::tuple{(ImTextureID)node, pos, ImVec2(pos.x + size.width, pos.y + size.height), getCCRefId(node)};
+    return std::tuple{(ImTextureID)node, pos, ImVec2(pos.x + size.width, pos.y + size.height), objectRef(node)};
 }
 
 void ImGuiPresenter::setNodeColor(Node* node, const ImVec4& col)
@@ -1050,25 +1040,19 @@ void ImGuiPresenter::mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, Im
     dst->BuildLookupTable();
 }
 
-int ImGuiPresenter::getCCRefId(Object* p)
+int ImGuiPresenter::objectRef(Object* p)
 {
     int id        = 0;
-    const auto it = usedCCRefIdMap.find(p);
-    if (it == usedCCRefIdMap.end())
+    const auto it = _objsRefIdMap.find(p);
+    if (it == _objsRefIdMap.end())
     {
-        usedCCRefIdMap[p] = 0;
-        usedCCRef.pushBack(p);
+        _objsRefIdMap[p] = 0;
+        _usedObjs.pushBack(p);
     }
     else
         id = ++it->second;
-    // BKDR hash
-    constexpr unsigned int seed = 131;
-    unsigned int hash           = 0;
-    for (auto i = 0u; i < sizeof(void*); ++i)
-        hash = hash * seed + ((const char*)&p)[i];
-    for (auto i = 0u; i < sizeof(int); ++i)
-        hash = hash * seed + ((const char*)&id)[i];
-    return (int)hash;
+
+    return XXH32(&p, sizeof(p), id);
 }
 
 std::string_view ImGuiPresenter::getGlyphRangesId(GLYPH_RANGES glyphRanges)

extensions/ImGui/src/ImGui/ImGuiPresenter.h

@@ -103,8 +103,8 @@ class ImGuiPresenter
     /// <param name="glyphRange"></param>
     /// <param name="fontConfig"></param>
     void addFont(std::string_view fontFile,
-                 float fontSize          = DEFAULT_FONT_SIZE,
-                 GLYPH_RANGES glyphRange = GLYPH_RANGES::NONE,
+                 float fontSize                 = DEFAULT_FONT_SIZE,
+                 GLYPH_RANGES glyphRange        = GLYPH_RANGES::NONE,
                  const ImFontConfig& fontConfig = ImFontConfig());
     /// <summary>
     /// Add ImGui font with contentZoomFactor and use pre-existing glyph range for the specified font
@@ -169,7 +169,7 @@ class ImGuiPresenter
                const ImVec4& border_col = ImVec4(0, 0, 0, 0));
     void image(Sprite* sprite,
                const ImVec2& size,
-               bool keepAspectRatio = true,
+               bool keepAspectRatio     = true,
                const ImVec4& tint_col   = ImVec4(1, 1, 1, 1),
                const ImVec4& border_col = ImVec4(0, 0, 0, 0));
     void image(SpriteFrame* spriteFrame,
@@ -181,18 +181,15 @@ class ImGuiPresenter
                      const ImVec2& size,
                      const ImVec2& uv0      = ImVec2(0, 0),
                      const ImVec2& uv1      = ImVec2(1, 1),
-                     int frame_padding      = -1,
                      const ImVec4& bg_col   = ImVec4(0, 0, 0, 0),
                      const ImVec4& tint_col = ImVec4(1, 1, 1, 1));
     bool imageButton(Sprite* sprite,
                      const ImVec2& size,
-                     int frame_padding      = -1,
                      const ImVec4& bg_col   = ImVec4(0, 0, 0, 0),
                      const ImVec4& tint_col = ImVec4(1, 1, 1, 1));
 
     void node(Node* node, const ImVec4& tint_col = ImVec4(1, 1, 1, 1), const ImVec4& border_col = ImVec4(0, 0, 0, 0));
     bool nodeButton(Node* node,
-                    int frame_padding      = -1,
                     const ImVec4& bg_col   = ImVec4(0, 0, 0, 0),
                     const ImVec4& tint_col = ImVec4(1, 1, 1, 1));
 
@@ -211,7 +208,7 @@ class ImGuiPresenter
     void removeGlyphRanges(std::string_view key);
     void clearGlyphRanges();
     static void mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, ImWchar end);
-    int getCCRefId(Object* p);
+    int objectRef(Object* p);
 
 private:
     static void loadCustomFonts(void*);
@@ -233,12 +230,12 @@ class ImGuiPresenter
 
     std::unordered_map<uint32_t, ImGuiLoop> _renderLoops;
 
-    std::unordered_map<Object*, int> usedCCRefIdMap;
+    std::unordered_map<Object*, int> _objsRefIdMap;
     // cocos objects should be retained until next frame
-    Vector<Object*> usedCCRef;
+    Vector<Object*> _usedObjs;
 
     hlookup::string_map<std::vector<ImWchar>> _glyphRanges;
-    std::unordered_set<uintptr_t> _usedGlyphRanges; // there should be one intance of "each glyph ranges"
+    std::unordered_set<uintptr_t> _usedGlyphRanges;  // there should be one intance of "each glyph ranges"
     // temporarily stores the current erased/replaced ranges, gets cleared in the next `loadCustomFonts` interation
     std::vector<std::vector<ImWchar>> _eraseGlyphRanges;
 

extensions/ImGui/src/ImGui/imgui/imconfig.h

@@ -21,14 +21,14 @@
 
 //---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
 // Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
-// DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
-// for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
-//#define IMGUI_API __declspec( dllexport )
-//#define IMGUI_API __declspec( dllimport )
+// - Windows DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
+//   for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
+//#define IMGUI_API __declspec(dllexport)                   // MSVC Windows: DLL export
+//#define IMGUI_API __declspec(dllimport)                   // MSVC Windows: DLL import
+//#define IMGUI_API __attribute__((visibility("default")))  // GCC/Clang: override visibility when set is hidden
 
 //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names.
 //#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
-//#define IMGUI_DISABLE_OBSOLETE_KEYIO                      // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS.
 
 //---- Disable all of Dear ImGui or don't implement standard windows/tools.
 // It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp.
@@ -42,21 +42,29 @@
 //#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] [Default with non-Visual Studio compilers] Don't implement default IME handler (won't require imm32.lib/.a)
 //#define IMGUI_DISABLE_WIN32_FUNCTIONS                     // [Win32] Won't use and link with any Win32 function (clipboard, IME).
 //#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
+//#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS             // Don't implement default platform_io.Platform_OpenInShellFn() handler (Win32: ShellExecute(), require shell32.lib/.a, Mac/Linux: use system("")).
 //#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
 //#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS              // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
 //#define IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)
 //#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
 //#define IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
+//#define IMGUI_DISABLE_DEFAULT_FONT                        // Disable default embedded font (ProggyClean.ttf), remove ~9.5 KB from output binary. AddFontDefault() will assert.
 //#define IMGUI_DISABLE_SSE                                 // Disable use of SSE intrinsics even if available
 
+//---- Enable Test Engine / Automation features.
+//#define IMGUI_ENABLE_TEST_ENGINE                          // Enable imgui_test_engine hooks. Generally set automatically by include "imgui_te_config.h", see Test Engine for details.
+
 //---- Include imgui_user.h at the end of imgui.h as a convenience
 // May be convenient for some users to only explicitly include vanilla imgui.h and have extra stuff included.
 //#define IMGUI_INCLUDE_IMGUI_USER_H
 //#define IMGUI_USER_H_FILENAME         "my_folder/my_imgui_user.h"
 
-//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another)
+//---- Pack vertex colors as BGRA8 instead of RGBA8 (to avoid converting from one to another). Need dedicated backend support.
 //#define IMGUI_USE_BGRA_PACKED_COLOR
 
+//---- Use legacy CRC32-adler tables (used before 1.91.6), in order to preserve old .ini data that you cannot afford to invalidate.
+//#define IMGUI_USE_LEGACY_CRC32_ADLER
+
 //---- Use 32-bit for ImWchar (default is 16-bit) to support Unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
 //#define IMGUI_USE_WCHAR32
 
@@ -78,10 +86,13 @@
 // On Windows you may use vcpkg with 'vcpkg install freetype --triplet=x64-windows' + 'vcpkg integrate install'.
 //#define IMGUI_ENABLE_FREETYPE
 
-//---- Use FreeType+lunasvg library to render OpenType SVG fonts (SVGinOT)
-// Requires lunasvg headers to be available in the include path + program to be linked with the lunasvg library (not provided).
+//---- Use FreeType + plutosvg or lunasvg to render OpenType SVG fonts (SVGinOT)
 // Only works in combination with IMGUI_ENABLE_FREETYPE.
-// (implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
+// - lunasvg is currently easier to acquire/install, as e.g. it is part of vcpkg.
+// - plutosvg will support more fonts and may load them faster. It currently requires to be built manually but it is fairly easy. See misc/freetype/README for instructions.
+// - Both require headers to be available in the include path + program to be linked with the library code (not provided).
+// - (note: lunasvg implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
+//#define IMGUI_ENABLE_FREETYPE_PLUTOSVG
 //#define IMGUI_ENABLE_FREETYPE_LUNASVG
 
 //---- Use stb_truetype to build and rasterize the font atlas (default)