You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: Framework/ThirdParty/source-libraries/cimgui/cimgui.h
+17-16
Original file line number
Diff line number
Diff line change
@@ -2077,6 +2077,8 @@ typedef enum
2077
2077
ImGuiMouseCursor_ResizeNESW, // When hovering over the bottom-left corner of a window
2078
2078
ImGuiMouseCursor_ResizeNWSE, // When hovering over the bottom-right corner of a window
2079
2079
ImGuiMouseCursor_Hand, // (Unused by Dear ImGui functions. Use for e.g. hyperlinks)
2080
+
ImGuiMouseCursor_Wait, // When waiting for something to process/load.
2081
+
ImGuiMouseCursor_Progress, // When waiting for something to process/load, but application is still interactive.
2080
2082
ImGuiMouseCursor_NotAllowed, // When hovering something with disallowed interaction. Usually a crossed circle.
2081
2083
ImGuiMouseCursor_COUNT,
2082
2084
} ImGuiMouseCursor_;
@@ -3545,33 +3547,33 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* se
3545
3547
CIMGUI_APIImFont*ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas*self, void*font_data, intfont_data_size, floatsize_pixels, constImFontConfig*font_cfg/* = NULL */, constImWchar*glyph_ranges/* = NULL */); // Note: Transfer ownership of 'ttf_data' to ImFontAtlas! Will be deleted after destruction of the atlas. Set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed.
3546
3548
CIMGUI_APIImFont*ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas*self, constvoid*compressed_font_data, intcompressed_font_data_size, floatsize_pixels, constImFontConfig*font_cfg/* = NULL */, constImWchar*glyph_ranges/* = NULL */); // 'compressed_font_data' still owned by caller. Compress with binary_to_compressed_c.cpp.
3547
3549
CIMGUI_APIImFont*ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas*self, constchar*compressed_font_data_base85, floatsize_pixels, constImFontConfig*font_cfg/* = NULL */, constImWchar*glyph_ranges/* = NULL */); // 'compressed_font_data_base85' still owned by caller. Compress with binary_to_compressed_c.cpp with -base85 parameter.
3548
-
CIMGUI_APIvoidImFontAtlas_ClearInputData(ImFontAtlas*self); // Clear input data (all ImFontConfig structures including sizes, TTF data, glyph ranges, etc.) = all the data used to build the texture and fonts.
3549
-
CIMGUI_APIvoidImFontAtlas_ClearFonts(ImFontAtlas*self); // Clear input+output font data (same as ClearInputData() + glyphs storage, UV coordinates).
3550
-
CIMGUI_APIvoidImFontAtlas_ClearTexData(ImFontAtlas*self); // Clear output texture data (CPU side). Saves RAM once the texture has been copied to graphics memory.
3551
-
CIMGUI_APIvoidImFontAtlas_Clear(ImFontAtlas*self); // Clear all input and output.
3550
+
CIMGUI_APIvoidImFontAtlas_ClearInputData(ImFontAtlas*self); // Clear input data (all ImFontConfig structures including sizes, TTF data, glyph ranges, etc.) = all the data used to build the texture and fonts.
3551
+
CIMGUI_APIvoidImFontAtlas_ClearFonts(ImFontAtlas*self); // Clear input+output font data (same as ClearInputData() + glyphs storage, UV coordinates).
3552
+
CIMGUI_APIvoidImFontAtlas_ClearTexData(ImFontAtlas*self); // Clear output texture data (CPU side). Saves RAM once the texture has been copied to graphics memory.
3553
+
CIMGUI_APIvoidImFontAtlas_Clear(ImFontAtlas*self); // Clear all input and output.
3552
3554
// Build atlas, retrieve pixel data.
3553
3555
// User is in charge of copying the pixels into graphics memory (e.g. create a texture with your engine). Then store your texture handle with SetTexID().
3554
3556
// The pitch is always = Width * BytesPerPixels (1 or 4)
3555
3557
// Building in RGBA32 format is provided for convenience and compatibility, but note that unless you manually manipulate or copy color data into
3556
3558
// the texture (e.g. when using the AddCustomRect*** api), then the RGB pixels emitted will always be white (~75% of memory/bandwidth waste.
3557
-
CIMGUI_APIboolImFontAtlas_Build(ImFontAtlas*self); // Build pixels data. This is called automatically for you by the GetTexData*** functions.
3559
+
CIMGUI_APIboolImFontAtlas_Build(ImFontAtlas*self); // Build pixels data. This is called automatically for you by the GetTexData*** functions.
CIMGUI_APIboolImFontAtlas_IsBuilt(constImFontAtlas*self); // Bit ambiguous: used to detect when user didn't build texture but effectively we should check TexID != 0 except that would be backend dependent...
3562
+
CIMGUI_APIboolImFontAtlas_IsBuilt(constImFontAtlas*self); // Bit ambiguous: used to detect when user didn't build texture but effectively we should check TexID != 0 except that would be backend dependent...
CIMGUI_APIconstImWchar*ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas*self); // Default + Half-Width + Japanese Hiragana/Katakana + full set of about 21000 CJK Unified Ideographs
3571
-
CIMGUI_APIconstImWchar*ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas*self); // Default + Half-Width + Japanese Hiragana/Katakana + set of 2500 CJK Unified Ideographs for common simplified Chinese
3572
-
CIMGUI_APIconstImWchar*ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas*self); // Default + about 400 Cyrillic characters
CIMGUI_APIconstImWchar*ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas*self); // Default + Half-Width + Japanese Hiragana/Katakana + full set of about 21000 CJK Unified Ideographs
3573
+
CIMGUI_APIconstImWchar*ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas*self); // Default + Half-Width + Japanese Hiragana/Katakana + set of 2500 CJK Unified Ideographs for common simplified Chinese
3574
+
CIMGUI_APIconstImWchar*ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas*self); // Default + about 400 Cyrillic characters
0 commit comments