Skip to content

Commit 7f5a81a

Browse files
authored
Merge pull request #1463 from MadLadSquad/auto
Update
2 parents c201b32 + 5d270ef commit 7f5a81a

File tree

3 files changed

+44
-40
lines changed

3 files changed

+44
-40
lines changed

Framework/ThirdParty/source-libraries/cimgui/cimgui.cpp

+18-18
Original file line numberDiff line numberDiff line change
@@ -3670,82 +3670,82 @@ CIMGUI_API bool cimgui::ImFontAtlas_GetMouseCursorTexData(cimg
36703670
return reinterpret_cast<::ImFontAtlas*>(self)->GetMouseCursorTexData(cursor, reinterpret_cast<::ImVec2*>(out_offset), reinterpret_cast<::ImVec2*>(out_size), out_uv_border_converted_array, out_uv_fill_converted_array);
36713671
}
36723672

3673-
CIMGUI_API const cimgui::ImFontGlyph* cimgui::ImFont_FindGlyph(cimgui::ImFont* self, ImWchar c)
3673+
CIMGUI_API cimgui::ImFontGlyph* cimgui::ImFont_FindGlyph(cimgui::ImFont* self, ImWchar c)
36743674
{
3675-
return reinterpret_cast<const ::cimgui::ImFontGlyph*>(reinterpret_cast<::ImFont*>(self)->FindGlyph(c));
3675+
return reinterpret_cast<::cimgui::ImFontGlyph*>(reinterpret_cast<::ImFont*>(self)->FindGlyph(c));
36763676
}
36773677

3678-
CIMGUI_API const cimgui::ImFontGlyph* cimgui::ImFont_FindGlyphNoFallback(cimgui::ImFont* self, ImWchar c)
3678+
CIMGUI_API cimgui::ImFontGlyph* cimgui::ImFont_FindGlyphNoFallback(cimgui::ImFont* self, ImWchar c)
36793679
{
3680-
return reinterpret_cast<const ::cimgui::ImFontGlyph*>(reinterpret_cast<::ImFont*>(self)->FindGlyphNoFallback(c));
3680+
return reinterpret_cast<::cimgui::ImFontGlyph*>(reinterpret_cast<::ImFont*>(self)->FindGlyphNoFallback(c));
36813681
}
36823682

3683-
CIMGUI_API float cimgui::ImFont_GetCharAdvance(cimgui::ImFont* self, ImWchar c)
3683+
CIMGUI_API float cimgui::ImFont_GetCharAdvance(cimgui::ImFont* self, ImWchar c)
36843684
{
36853685
return reinterpret_cast<::ImFont*>(self)->GetCharAdvance(c);
36863686
}
36873687

3688-
CIMGUI_API bool cimgui::ImFont_IsLoaded(const cimgui::ImFont* self)
3688+
CIMGUI_API bool cimgui::ImFont_IsLoaded(const cimgui::ImFont* self)
36893689
{
36903690
return reinterpret_cast<const ::ImFont*>(self)->IsLoaded();
36913691
}
36923692

3693-
CIMGUI_API const char* cimgui::ImFont_GetDebugName(const cimgui::ImFont* self)
3693+
CIMGUI_API const char* cimgui::ImFont_GetDebugName(const cimgui::ImFont* self)
36943694
{
36953695
return reinterpret_cast<const ::ImFont*>(self)->GetDebugName();
36963696
}
36973697

3698-
CIMGUI_API cimgui::ImVec2 cimgui::ImFont_CalcTextSizeA(cimgui::ImFont* self, float size, float max_width, float wrap_width, const char* text_begin)
3698+
CIMGUI_API cimgui::ImVec2 cimgui::ImFont_CalcTextSizeA(cimgui::ImFont* self, float size, float max_width, float wrap_width, const char* text_begin)
36993699
{
37003700
return ConvertFromCPP_ImVec2(reinterpret_cast<::ImFont*>(self)->CalcTextSizeA(size, max_width, wrap_width, text_begin));
37013701
}
37023702

3703-
CIMGUI_API cimgui::ImVec2 cimgui::ImFont_CalcTextSizeAEx(cimgui::ImFont* self, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** remaining)
3703+
CIMGUI_API cimgui::ImVec2 cimgui::ImFont_CalcTextSizeAEx(cimgui::ImFont* self, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** remaining)
37043704
{
37053705
return ConvertFromCPP_ImVec2(reinterpret_cast<::ImFont*>(self)->CalcTextSizeA(size, max_width, wrap_width, text_begin, text_end, remaining));
37063706
}
37073707

3708-
CIMGUI_API const char* cimgui::ImFont_CalcWordWrapPositionA(cimgui::ImFont* self, float scale, const char* text, const char* text_end, float wrap_width)
3708+
CIMGUI_API const char* cimgui::ImFont_CalcWordWrapPositionA(cimgui::ImFont* self, float scale, const char* text, const char* text_end, float wrap_width)
37093709
{
37103710
return reinterpret_cast<::ImFont*>(self)->CalcWordWrapPositionA(scale, text, text_end, wrap_width);
37113711
}
37123712

3713-
CIMGUI_API void cimgui::ImFont_RenderChar(cimgui::ImFont* self, cimgui::ImDrawList* draw_list, float size, cimgui::ImVec2 pos, ImU32 col, ImWchar c)
3713+
CIMGUI_API void cimgui::ImFont_RenderChar(cimgui::ImFont* self, cimgui::ImDrawList* draw_list, float size, cimgui::ImVec2 pos, ImU32 col, ImWchar c)
37143714
{
37153715
reinterpret_cast<::ImFont*>(self)->RenderChar(reinterpret_cast<::ImDrawList*>(draw_list), size, ConvertToCPP_ImVec2(pos), col, c);
37163716
}
37173717

3718-
CIMGUI_API void cimgui::ImFont_RenderText(cimgui::ImFont* self, cimgui::ImDrawList* draw_list, float size, cimgui::ImVec2 pos, ImU32 col, cimgui::ImVec4 clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip)
3718+
CIMGUI_API void cimgui::ImFont_RenderText(cimgui::ImFont* self, cimgui::ImDrawList* draw_list, float size, cimgui::ImVec2 pos, ImU32 col, cimgui::ImVec4 clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip)
37193719
{
37203720
reinterpret_cast<::ImFont*>(self)->RenderText(reinterpret_cast<::ImDrawList*>(draw_list), size, ConvertToCPP_ImVec2(pos), col, ConvertToCPP_ImVec4(clip_rect), text_begin, text_end, wrap_width, cpu_fine_clip);
37213721
}
37223722

3723-
CIMGUI_API void cimgui::ImFont_BuildLookupTable(cimgui::ImFont* self)
3723+
CIMGUI_API void cimgui::ImFont_BuildLookupTable(cimgui::ImFont* self)
37243724
{
37253725
reinterpret_cast<::ImFont*>(self)->BuildLookupTable();
37263726
}
37273727

3728-
CIMGUI_API void cimgui::ImFont_ClearOutputData(cimgui::ImFont* self)
3728+
CIMGUI_API void cimgui::ImFont_ClearOutputData(cimgui::ImFont* self)
37293729
{
37303730
reinterpret_cast<::ImFont*>(self)->ClearOutputData();
37313731
}
37323732

3733-
CIMGUI_API void cimgui::ImFont_GrowIndex(cimgui::ImFont* self, int new_size)
3733+
CIMGUI_API void cimgui::ImFont_GrowIndex(cimgui::ImFont* self, int new_size)
37343734
{
37353735
reinterpret_cast<::ImFont*>(self)->GrowIndex(new_size);
37363736
}
37373737

3738-
CIMGUI_API void cimgui::ImFont_AddGlyph(cimgui::ImFont* self, const cimgui::ImFontConfig* src_cfg, ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x)
3738+
CIMGUI_API void cimgui::ImFont_AddGlyph(cimgui::ImFont* self, const cimgui::ImFontConfig* src_cfg, ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x)
37393739
{
37403740
reinterpret_cast<::ImFont*>(self)->AddGlyph(reinterpret_cast<const ::ImFontConfig*>(src_cfg), c, x0, y0, x1, y1, u0, v0, u1, v1, advance_x);
37413741
}
37423742

3743-
CIMGUI_API void cimgui::ImFont_AddRemapChar(cimgui::ImFont* self, ImWchar dst, ImWchar src, bool overwrite_dst)
3743+
CIMGUI_API void cimgui::ImFont_AddRemapChar(cimgui::ImFont* self, ImWchar dst, ImWchar src, bool overwrite_dst)
37443744
{
37453745
reinterpret_cast<::ImFont*>(self)->AddRemapChar(dst, src, overwrite_dst);
37463746
}
37473747

3748-
CIMGUI_API bool cimgui::ImFont_IsGlyphRangeUnused(cimgui::ImFont* self, unsigned int c_begin, unsigned int c_last)
3748+
CIMGUI_API bool cimgui::ImFont_IsGlyphRangeUnused(cimgui::ImFont* self, unsigned int c_begin, unsigned int c_last)
37493749
{
37503750
return reinterpret_cast<::ImFont*>(self)->IsGlyphRangeUnused(c_begin, c_last);
37513751
}

Framework/ThirdParty/source-libraries/cimgui/cimgui.h

+25-21
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// Library Version
3434
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
3535
#define IMGUI_VERSION "1.91.9 WIP"
36-
#define IMGUI_VERSION_NUM 19182
36+
#define IMGUI_VERSION_NUM 19183
3737
#define IMGUI_HAS_TABLE
3838
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3939
#define IMGUI_HAS_DOCK // Docking WIP branch
@@ -2349,6 +2349,7 @@ struct ImGuiStyle_t
23492349
ImVec2 WindowPadding; // Padding within a window.
23502350
float WindowRounding; // Radius of window corners rounding. Set to 0.0f to have rectangular windows. Large values tend to lead to variety of artifacts and are not recommended.
23512351
float WindowBorderSize; // Thickness of border around windows. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly).
2352+
float WindowBorderHoverPadding; // Hit-testing extent outside/inside resizing border. Also extend determination of hovered window. Generally meaningfully larger than WindowBorderSize to make it easy to reach borders.
23522353
ImVec2 WindowMinSize; // Minimum window size. This is a global setting. If you want to constrain individual windows, use SetNextWindowSizeConstraints().
23532354
ImVec2 WindowTitleAlign; // Alignment for title bar text. Defaults to (0.0f,0.5f) for left-aligned,vertically centered.
23542355
ImGuiDir WindowMenuButtonPosition; // Side of the collapsing/docking button in the title bar (None/Left/Right). Defaults to ImGuiDir_Left.
@@ -3405,11 +3406,12 @@ struct ImFontConfig_t
34053406
int OversampleH; // 0 (2) // Rasterize at higher quality for sub-pixel positioning. 0 == auto == 1 or 2 depending on size. Note the difference between 2 and 3 is minimal. You can reduce this to 1 for large glyphs save memory. Read https://github.com/nothings/stb/blob/master/tests/oversample/README.md for details.
34063407
int OversampleV; // 0 (1) // Rasterize at higher quality for sub-pixel positioning. 0 == auto == 1. This is not really useful as we don't use sub-pixel positions on the Y axis.
34073408
float SizePixels; // // Size in pixels for rasterizer (more or less maps to the resulting font height).
3408-
//ImVec2 GlyphExtraSpacing; // 0, 0 // (REMOVED AT IT SEEMS LARGELY OBSOLETE. PLEASE REPORT IF YOU WERE USING THIS). Extra spacing (in pixels) between glyphs when rendered: essentially add to glyph->AdvanceX. Only X axis is supported for now.
3409+
//ImVec2 GlyphExtraSpacing; // 0, 0 // (REMOVED IN 1.91.9: use GlyphExtraAdvanceX)
34093410
ImVec2 GlyphOffset; // 0, 0 // Offset all glyphs from this font input.
34103411
const ImWchar* GlyphRanges; // NULL // THE ARRAY DATA NEEDS TO PERSIST AS LONG AS THE FONT IS ALIVE. Pointer to a user-provided list of Unicode range (2 value per range, values are inclusive, zero-terminated list).
34113412
float GlyphMinAdvanceX; // 0 // Minimum AdvanceX for glyphs, set Min to align font icons, set both Min/Max to enforce mono-space font
34123413
float GlyphMaxAdvanceX; // FLT_MAX // Maximum AdvanceX for glyphs
3414+
float GlyphExtraAdvanceX; // 0 // Extra spacing (in pixels) between glyphs. Please contact us if you are using this.
34133415
unsigned int FontBuilderFlags; // 0 // Settings for custom font builder. THIS IS BUILDER IMPLEMENTATION DEPENDENT. Leave as zero if unsure.
34143416
float RasterizerMultiply; // 1.0f // Linearly brighten (>1.0f) or darken (<1.0f) font output. Brightening small fonts may be a good workaround to make them more readable. This is a silly thing we may remove in the future.
34153417
float RasterizerDensity; // 1.0f // DPI scale for rasterization, not altering other font metrics: make it easy to swap between e.g. a 100% and a 400% fonts for a zooming display. IMPORTANT: If you increase this it is expected that you increase font scale accordingly, otherwise quality may look lowered.
@@ -3501,6 +3503,7 @@ struct ImFontAtlas_t
35013503
// Members
35023504
//-------------------------------------------
35033505

3506+
// Input
35043507
ImFontAtlasFlags Flags; // Build flags (see ImFontAtlasFlags_)
35053508
ImTextureID TexID; // User data to refer to the texture once it has been uploaded to user's graphic systems. It is passed back to you during rendering via the ImDrawCmd structure.
35063509
int TexDesiredWidth; // Texture width desired by user before Build(). Must be a power-of-two. If have many glyphs your graphics API have texture size restrictions you may want to increase texture width to decrease height.
@@ -3532,8 +3535,8 @@ struct ImFontAtlas_t
35323535
int PackIdLines; // Custom texture rectangle ID for baked anti-aliased lines
35333536

35343537
// [Obsolete]
3535-
//typedef ImFontAtlasCustomRect CustomRect; // OBSOLETED in 1.72+
3536-
//typedef ImFontGlyphRangesBuilder GlyphRangesBuilder; // OBSOLETED in 1.67+
3538+
//typedef ImFontAtlasCustomRect CustomRect; // OBSOLETED in 1.72+
3539+
//typedef ImFontGlyphRangesBuilder GlyphRangesBuilder; // OBSOLETED in 1.67+
35373540
};
35383541
CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self, const ImFontConfig* font_cfg);
35393542
CIMGUI_API ImFont* ImFontAtlas_AddFontDefault(ImFontAtlas* self, const ImFontConfig* font_cfg /* = NULL */);
@@ -3594,7 +3597,7 @@ struct ImFont_t
35943597
// [Internal] Members: Hot ~28/40 bytes (for RenderText loop)
35953598
ImVector_ImU16 IndexLookup; // 12-16 // out // Sparse. Index glyphs by Unicode code-point.
35963599
ImVector_ImFontGlyph Glyphs; // 12-16 // out // All glyphs.
3597-
const ImFontGlyph* FallbackGlyph; // 4-8 // out // = FindGlyph(FontFallbackChar)
3600+
ImFontGlyph* FallbackGlyph; // 4-8 // out // = FindGlyph(FontFallbackChar)
35983601

35993602
// [Internal] Members: Cold ~32/40 bytes
36003603
// Conceptually ConfigData[] is the list of font sources merged to create this font.
@@ -3612,25 +3615,26 @@ struct ImFont_t
36123615
bool DirtyLookupTables; // 1 // out //
36133616
ImU8 Used8kPagesMap[(IM_UNICODE_CODEPOINT_MAX +1)/8192/8]; // 1 bytes if ImWchar=ImWchar16, 16 bytes if ImWchar==ImWchar32. Store 1-bit for each block of 4K codepoints that has one active glyph. This is mainly used to facilitate iterations across all used codepoints.
36143617
};
3615-
CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self, ImWchar c);
3616-
CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self, ImWchar c);
3617-
CIMGUI_API float ImFont_GetCharAdvance(ImFont* self, ImWchar c);
3618-
CIMGUI_API bool ImFont_IsLoaded(const ImFont* self);
3619-
CIMGUI_API const char* ImFont_GetDebugName(const ImFont* self);
3618+
CIMGUI_API ImFontGlyph* ImFont_FindGlyph(ImFont* self, ImWchar c);
3619+
CIMGUI_API ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self, ImWchar c);
3620+
CIMGUI_API float ImFont_GetCharAdvance(ImFont* self, ImWchar c);
3621+
CIMGUI_API bool ImFont_IsLoaded(const ImFont* self);
3622+
CIMGUI_API const char* ImFont_GetDebugName(const ImFont* self);
3623+
// [Internal] Don't use!
36203624
// 'max_width' stops rendering after a certain width (could be turned into a 2d size). FLT_MAX to disable.
36213625
// 'wrap_width' enable automatic word-wrapping across multiple lines to fit into given width. 0.0f to disable.
3622-
CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self, float size, float max_width, float wrap_width, const char* text_begin); // Implied text_end = NULL, remaining = NULL
3623-
CIMGUI_API ImVec2 ImFont_CalcTextSizeAEx(ImFont* self, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end /* = NULL */, const char** remaining /* = NULL */); // utf8
3624-
CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self, float scale, const char* text, const char* text_end, float wrap_width);
3625-
CIMGUI_API void ImFont_RenderChar(ImFont* self, ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c);
3626-
CIMGUI_API void ImFont_RenderText(ImFont* self, ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImVec4 clip_rect, const char* text_begin, const char* text_end, float wrap_width /* = 0.0f */, bool cpu_fine_clip /* = false */);
3626+
CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self, float size, float max_width, float wrap_width, const char* text_begin); // Implied text_end = NULL, remaining = NULL
3627+
CIMGUI_API ImVec2 ImFont_CalcTextSizeAEx(ImFont* self, float size, float max_width, float wrap_width, const char* text_begin, const char* text_end /* = NULL */, const char** remaining /* = NULL */); // utf8
3628+
CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self, float scale, const char* text, const char* text_end, float wrap_width);
3629+
CIMGUI_API void ImFont_RenderChar(ImFont* self, ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c);
3630+
CIMGUI_API void ImFont_RenderText(ImFont* self, ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImVec4 clip_rect, const char* text_begin, const char* text_end, float wrap_width /* = 0.0f */, bool cpu_fine_clip /* = false */);
36273631
// [Internal] Don't use!
3628-
CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
3629-
CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
3630-
CIMGUI_API void ImFont_GrowIndex(ImFont* self, int new_size);
3631-
CIMGUI_API void ImFont_AddGlyph(ImFont* self, const ImFontConfig* src_cfg, ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x);
3632-
CIMGUI_API void ImFont_AddRemapChar(ImFont* self, ImWchar dst, ImWchar src, bool overwrite_dst /* = true */); // Makes 'dst' character/glyph points to 'src' character/glyph. Currently needs to be called AFTER fonts have been built.
3633-
CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self, unsigned int c_begin, unsigned int c_last);
3632+
CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
3633+
CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
3634+
CIMGUI_API void ImFont_GrowIndex(ImFont* self, int new_size);
3635+
CIMGUI_API void ImFont_AddGlyph(ImFont* self, const ImFontConfig* src_cfg, ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x);
3636+
CIMGUI_API void ImFont_AddRemapChar(ImFont* self, ImWchar dst, ImWchar src, bool overwrite_dst /* = true */); // Makes 'dst' character/glyph points to 'src' character/glyph. Currently needs to be called AFTER fonts have been built.
3637+
CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self, unsigned int c_begin, unsigned int c_last);
36343638

36353639
//-----------------------------------------------------------------------------
36363640
// [SECTION] Viewports

0 commit comments

Comments
 (0)