Skip to content

Commit 38399a7

Browse files
authored
Merge pull request #1416 from MadLadSquad/auto
Update
2 parents b8b7835 + cbb0290 commit 38399a7

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

Framework/ThirdParty/freetype

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

+23-21
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.7
5+
// dear imgui, v1.91.8 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.7"
36-
#define IMGUI_VERSION_NUM 19170
35+
#define IMGUI_VERSION "1.91.8 WIP"
36+
#define IMGUI_VERSION_NUM 19171
3737
#define IMGUI_HAS_TABLE
3838
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3939
#define IMGUI_HAS_DOCK // Docking WIP branch
@@ -192,21 +192,23 @@ typedef unsigned int ImU32; // 32-bit unsigned integer (often used to sto
192192
typedef signed long long ImS64; // 64-bit signed integer
193193
typedef unsigned long long ImU64; // 64-bit unsigned integer
194194

195-
// Forward declarations
196-
typedef struct ImDrawChannel_t ImDrawChannel; // Temporary storage to output draw commands out of order, used by ImDrawListSplitter and ImDrawList::ChannelsSplit()
197-
typedef struct ImDrawCmd_t ImDrawCmd; // A single draw command within a parent ImDrawList (generally maps to 1 GPU draw call, unless it is a callback)
198-
typedef struct ImDrawData_t ImDrawData; // All draw command lists required to render the frame + pos/size coordinates to use for the projection matrix.
199-
typedef struct ImDrawList_t ImDrawList; // A single draw command list (generally one per window, conceptually you may see this as a dynamic "mesh" builder)
200-
typedef struct ImDrawListSharedData_t ImDrawListSharedData; // Data shared among multiple draw lists (typically owned by parent ImGui context, but you may create one yourself)
201-
typedef struct ImDrawListSplitter_t ImDrawListSplitter; // Helper to split a draw list into different layers which can be drawn into out of order, then flattened back.
202-
typedef struct ImDrawVert_t ImDrawVert; // A single vertex (pos + uv + col = 20 bytes by default. Override layout with IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT)
203-
typedef struct ImFont_t ImFont; // Runtime data for a single font within a parent ImFontAtlas
204-
typedef struct ImFontAtlas_t ImFontAtlas; // Runtime data for multiple fonts, bake multiple fonts into a single texture, TTF/OTF font loader
205-
typedef struct ImFontBuilderIO_t ImFontBuilderIO; // Opaque interface to a font builder (stb_truetype or FreeType).
206-
typedef struct ImFontConfig_t ImFontConfig; // Configuration data when adding a font or merging fonts
207-
typedef struct ImFontGlyph_t ImFontGlyph; // A single font glyph (code point + coordinates within in ImFontAtlas + offset)
208-
typedef struct ImFontGlyphRangesBuilder_t ImFontGlyphRangesBuilder; // Helper to build glyph ranges from text/string data
209-
typedef struct ImColor_t ImColor; // Helper functions to create a color that can be converted to either u32 or float4 (*OBSOLETE* please avoid using)
195+
// Forward declarations: ImDrawList, ImFontAtlas layer
196+
typedef struct ImDrawChannel_t ImDrawChannel; // Temporary storage to output draw commands out of order, used by ImDrawListSplitter and ImDrawList::ChannelsSplit()
197+
typedef struct ImDrawCmd_t ImDrawCmd; // A single draw command within a parent ImDrawList (generally maps to 1 GPU draw call, unless it is a callback)
198+
typedef struct ImDrawData_t ImDrawData; // All draw command lists required to render the frame + pos/size coordinates to use for the projection matrix.
199+
typedef struct ImDrawList_t ImDrawList; // A single draw command list (generally one per window, conceptually you may see this as a dynamic "mesh" builder)
200+
typedef struct ImDrawListSharedData_t ImDrawListSharedData; // Data shared among multiple draw lists (typically owned by parent ImGui context, but you may create one yourself)
201+
typedef struct ImDrawListSplitter_t ImDrawListSplitter; // Helper to split a draw list into different layers which can be drawn into out of order, then flattened back.
202+
typedef struct ImDrawVert_t ImDrawVert; // A single vertex (pos + uv + col = 20 bytes by default. Override layout with IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT)
203+
typedef struct ImFont_t ImFont; // Runtime data for a single font within a parent ImFontAtlas
204+
typedef struct ImFontAtlas_t ImFontAtlas; // Runtime data for multiple fonts, bake multiple fonts into a single texture, TTF/OTF font loader
205+
typedef struct ImFontBuilderIO_t ImFontBuilderIO; // Opaque interface to a font builder (stb_truetype or FreeType).
206+
typedef struct ImFontConfig_t ImFontConfig; // Configuration data when adding a font or merging fonts
207+
typedef struct ImFontGlyph_t ImFontGlyph; // A single font glyph (code point + coordinates within in ImFontAtlas + offset)
208+
typedef struct ImFontGlyphRangesBuilder_t ImFontGlyphRangesBuilder; // Helper to build glyph ranges from text/string data
209+
typedef struct ImColor_t ImColor; // Helper functions to create a color that can be converted to either u32 or float4 (*OBSOLETE* please avoid using)
210+
211+
// Forward declarations: ImGui layer
210212
typedef struct ImGuiContext_t ImGuiContext; // Dear ImGui context (opaque structure, unless including imgui_internal.h)
211213
typedef struct ImGuiIO_t ImGuiIO; // Main configuration and I/O between your application and ImGui (also see: ImGuiPlatformIO)
212214
typedef struct ImGuiInputTextCallbackData_t ImGuiInputTextCallbackData; // Shared state of InputText() when using custom ImGuiInputTextCallback (rare/advanced use)
@@ -3081,7 +3083,7 @@ CIMGUI_API void ImGuiSelectionExternalStorage_ApplyRequests(ImGuiSelectionExtern
30813083

30823084
// The maximum line width to bake anti-aliased textures for. Build atlas with ImFontAtlasFlags_NoBakedLines to disable baking.
30833085
#ifndef IM_DRAWLIST_TEX_LINES_WIDTH_MAX
3084-
#define IM_DRAWLIST_TEX_LINES_WIDTH_MAX (63)
3086+
#define IM_DRAWLIST_TEX_LINES_WIDTH_MAX (32)
30853087
#endif // #ifndef IM_DRAWLIST_TEX_LINES_WIDTH_MAX
30863088
// ImDrawCallback: Draw callbacks for advanced uses [configurable type: override in imconfig.h]
30873089
// NB: You most likely do NOT need to use draw callbacks just to create your own widget or customized UI rendering,
@@ -3477,7 +3479,7 @@ struct ImFontAtlas_t
34773479
//-------------------------------------------
34783480

34793481
//-------------------------------------------
3480-
// [BETA] Custom Rectangles/Glyphs API
3482+
// [ALPHA] Custom Rectangles/Glyphs API
34813483
//-------------------------------------------
34823484

34833485
//-------------------------------------------
@@ -3488,11 +3490,11 @@ struct ImFontAtlas_t
34883490
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.
34893491
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.
34903492
int TexGlyphPadding; // FIXME: Should be called "TexPackPadding". Padding between glyphs within texture in pixels. Defaults to 1. If your rendering method doesn't rely on bilinear filtering you may set this to 0 (will also need to set AntiAliasedLinesUseTex = false).
3491-
bool Locked; // Marked as Locked by ImGui::NewFrame() so attempt to modify the atlas will assert.
34923493
void* UserData; // Store your own atlas related user-data (if e.g. you have multiple font atlas).
34933494

34943495
// [Internal]
34953496
// NB: Access texture data via GetTexData*() calls! Which will setup a default font for you.
3497+
bool Locked; // Marked as Locked by ImGui::NewFrame() so attempt to modify the atlas will assert.
34963498
bool TexReady; // Set when texture was built matching current font input
34973499
bool TexPixelsUseColors; // Tell whether our texture data is known to use colors (rather than just alpha channel), in order to help backend select a format.
34983500
unsigned char* TexPixelsAlpha8; // 1 component per pixel, each component is unsigned 8-bit. Total size = TexWidth * TexHeight

0 commit comments

Comments
 (0)