Skip to content

Commit 84bd6d7

Browse files
authored
Merge pull request #1454 from MadLadSquad/auto
Update
2 parents f730f3a + 675d8ff commit 84bd6d7

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -3745,11 +3745,6 @@ CIMGUI_API void cimgui::ImFont_AddRemapChar(cimgui::ImFont* self,
37453745
reinterpret_cast<::ImFont*>(self)->AddRemapChar(dst, src, overwrite_dst);
37463746
}
37473747

3748-
CIMGUI_API void cimgui::ImFont_SetGlyphVisible(cimgui::ImFont* self, ImWchar c, bool visible)
3749-
{
3750-
reinterpret_cast<::ImFont*>(self)->SetGlyphVisible(c, visible);
3751-
}
3752-
37533748
CIMGUI_API bool cimgui::ImFont_IsGlyphRangeUnused(cimgui::ImFont* self, unsigned int c_begin, unsigned int c_last)
37543749
{
37553750
return reinterpret_cast<::ImFont*>(self)->IsGlyphRangeUnused(c_begin, c_last);

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// **DO NOT EDIT DIRECTLY**
33
// https://github.com/dearimgui/dear_bindings
44

5-
// dear imgui, v1.91.8
5+
// dear imgui, v1.91.9 WIP
66
// (headers)
77

88
// Help:
@@ -32,8 +32,8 @@
3232

3333
// Library Version
3434
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
35-
#define IMGUI_VERSION "1.91.8"
36-
#define IMGUI_VERSION_NUM 19180
35+
#define IMGUI_VERSION "1.91.9 WIP"
36+
#define IMGUI_VERSION_NUM 19182
3737
#define IMGUI_HAS_TABLE
3838
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3939
#define IMGUI_HAS_DOCK // Docking WIP branch
@@ -3405,7 +3405,7 @@ struct ImFontConfig_t
34053405
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.
34063406
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.
34073407
float SizePixels; // // Size in pixels for rasterizer (more or less maps to the resulting font height).
3408-
ImVec2 GlyphExtraSpacing; // 0, 0 // Extra spacing (in pixels) between glyphs when rendered: essentially add to glyph->AdvanceX. Only X axis is supported for now.
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.
34093409
ImVec2 GlyphOffset; // 0, 0 // Offset all glyphs from this font input.
34103410
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).
34113411
float GlyphMinAdvanceX; // 0 // Minimum AdvanceX for glyphs, set Min to align font icons, set both Min/Max to enforce mono-space font
@@ -3427,7 +3427,7 @@ struct ImFontGlyph_t
34273427
unsigned int Colored : 1; // Flag to indicate glyph is colored and should generally ignore tinting (make it usable with no shift on little-endian as this is used in loops)
34283428
unsigned int Visible : 1; // Flag to indicate glyph has no visible pixels (e.g. space). Allow early out when rendering.
34293429
unsigned int Codepoint : 30; // 0x0000..0x10FFFF
3430-
float AdvanceX; // Distance to next character (= data from font + ImFontConfig::GlyphExtraSpacing.x baked in)
3430+
float AdvanceX; // Horizontal distance to advance layout with
34313431
float X0, Y0, X1, Y1; // Glyph corners
34323432
float U0, V0, U1, V1; // Texture coordinates
34333433
};
@@ -3630,7 +3630,6 @@ CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
36303630
CIMGUI_API void ImFont_GrowIndex(ImFont* self, int new_size);
36313631
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);
36323632
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 void ImFont_SetGlyphVisible(ImFont* self, ImWchar c, bool visible);
36343633
CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self, unsigned int c_begin, unsigned int c_last);
36353634

36363635
//-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)