Skip to content

Commit 96e1ec5

Browse files
authored
Merge pull request #1477 from MadLadSquad/auto
Update
2 parents 73703e6 + dc441f5 commit 96e1ec5

File tree

3 files changed

+18
-28
lines changed

3 files changed

+18
-28
lines changed

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

-11
Original file line numberDiff line numberDiff line change
@@ -3659,17 +3659,6 @@ CIMGUI_API void cimgui::ImFontAtlas_CalcCustomRectUV(const cim
36593659
reinterpret_cast<const ::ImFontAtlas*>(self)->CalcCustomRectUV(reinterpret_cast<const ::ImFontAtlasCustomRect*>(rect), reinterpret_cast<::ImVec2*>(out_uv_min), reinterpret_cast<::ImVec2*>(out_uv_max));
36603660
}
36613661

3662-
CIMGUI_API bool cimgui::ImFontAtlas_GetMouseCursorTexData(cimgui::ImFontAtlas* self, ImGuiMouseCursor cursor, cimgui::ImVec2* out_offset, cimgui::ImVec2* out_size, cimgui::ImVec2 out_uv_border[2], cimgui::ImVec2 out_uv_fill[2])
3663-
{
3664-
::ImVec2 out_uv_border_converted_array[2];
3665-
for (int i=0; i<2; i++)
3666-
out_uv_border_converted_array[i] = ConvertToCPP_ImVec2(out_uv_border[i]);
3667-
::ImVec2 out_uv_fill_converted_array[2];
3668-
for (int i=0; i<2; i++)
3669-
out_uv_fill_converted_array[i] = ConvertToCPP_ImVec2(out_uv_fill[i]);
3670-
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);
3671-
}
3672-
36733662
CIMGUI_API cimgui::ImFontGlyph* cimgui::ImFont_FindGlyph(cimgui::ImFont* self, ImWchar c)
36743663
{
36753664
return reinterpret_cast<::cimgui::ImFontGlyph*>(reinterpret_cast<::ImFont*>(self)->FindGlyph(c));

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

+17-16
Original file line numberDiff line numberDiff line change
@@ -2077,6 +2077,8 @@ typedef enum
20772077
ImGuiMouseCursor_ResizeNESW, // When hovering over the bottom-left corner of a window
20782078
ImGuiMouseCursor_ResizeNWSE, // When hovering over the bottom-right corner of a window
20792079
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.
20802082
ImGuiMouseCursor_NotAllowed, // When hovering something with disallowed interaction. Usually a crossed circle.
20812083
ImGuiMouseCursor_COUNT,
20822084
} ImGuiMouseCursor_;
@@ -3545,33 +3547,33 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromFileTTF(ImFontAtlas* se
35453547
CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas* self, void* font_data, int font_data_size, float size_pixels, const ImFontConfig* font_cfg /* = NULL */, const ImWchar* 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.
35463548
CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* self, const void* compressed_font_data, int compressed_font_data_size, float size_pixels, const ImFontConfig* font_cfg /* = NULL */, const ImWchar* glyph_ranges /* = NULL */); // 'compressed_font_data' still owned by caller. Compress with binary_to_compressed_c.cpp.
35473549
CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* self, const char* compressed_font_data_base85, float size_pixels, const ImFontConfig* font_cfg /* = NULL */, const ImWchar* glyph_ranges /* = NULL */); // 'compressed_font_data_base85' still owned by caller. Compress with binary_to_compressed_c.cpp with -base85 parameter.
3548-
CIMGUI_API void ImFontAtlas_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_API void ImFontAtlas_ClearFonts(ImFontAtlas* self); // Clear input+output font data (same as ClearInputData() + glyphs storage, UV coordinates).
3550-
CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self); // Clear output texture data (CPU side). Saves RAM once the texture has been copied to graphics memory.
3551-
CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self); // Clear all input and output.
3550+
CIMGUI_API void ImFontAtlas_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_API void ImFontAtlas_ClearFonts(ImFontAtlas* self); // Clear input+output font data (same as ClearInputData() + glyphs storage, UV coordinates).
3552+
CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self); // Clear output texture data (CPU side). Saves RAM once the texture has been copied to graphics memory.
3553+
CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self); // Clear all input and output.
35523554
// Build atlas, retrieve pixel data.
35533555
// 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().
35543556
// The pitch is always = Width * BytesPerPixels (1 or 4)
35553557
// Building in RGBA32 format is provided for convenience and compatibility, but note that unless you manually manipulate or copy color data into
35563558
// 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_API bool ImFontAtlas_Build(ImFontAtlas* self); // Build pixels data. This is called automatically for you by the GetTexData*** functions.
3559+
CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self); // Build pixels data. This is called automatically for you by the GetTexData*** functions.
35583560
CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel /* = NULL */); // 1 byte per-pixel
35593561
CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel /* = NULL */); // 4 bytes-per-pixel
3560-
CIMGUI_API bool ImFontAtlas_IsBuilt(const ImFontAtlas* 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_API bool ImFontAtlas_IsBuilt(const ImFontAtlas* 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...
35613563
CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self, ImTextureID id);
35623564
// Helpers to retrieve list of common Unicode ranges (2 value per range, values are inclusive, zero-terminated list)
35633565
// NB: Make sure that your string are UTF-8 and NOT in your local code page.
35643566
// Read https://github.com/ocornut/imgui/blob/master/docs/FONTS.md/#about-utf-8-encoding for details.
35653567
// NB: Consider using ImFontGlyphRangesBuilder to build glyph ranges from textual data.
3566-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesDefault(ImFontAtlas* self); // Basic Latin, Extended Latin
3567-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesGreek(ImFontAtlas* self); // Default + Greek and Coptic
3568-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesKorean(ImFontAtlas* self); // Default + Korean characters
3569-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesJapanese(ImFontAtlas* self); // Default + Hiragana, Katakana, Half-Width, Selection of 2999 Ideographs
3570-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* self); // Default + Half-Width + Japanese Hiragana/Katakana + full set of about 21000 CJK Unified Ideographs
3571-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self); // Default + Half-Width + Japanese Hiragana/Katakana + set of 2500 CJK Unified Ideographs for common simplified Chinese
3572-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self); // Default + about 400 Cyrillic characters
3573-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self); // Default + Thai characters
3574-
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self); // Default + Vietnamese characters
3568+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesDefault(ImFontAtlas* self); // Basic Latin, Extended Latin
3569+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesGreek(ImFontAtlas* self); // Default + Greek and Coptic
3570+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesKorean(ImFontAtlas* self); // Default + Korean characters
3571+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesJapanese(ImFontAtlas* self); // Default + Hiragana, Katakana, Half-Width, Selection of 2999 Ideographs
3572+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* self); // Default + Half-Width + Japanese Hiragana/Katakana + full set of about 21000 CJK Unified Ideographs
3573+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self); // Default + Half-Width + Japanese Hiragana/Katakana + set of 2500 CJK Unified Ideographs for common simplified Chinese
3574+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self); // Default + about 400 Cyrillic characters
3575+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self); // Default + Thai characters
3576+
CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self); // Default + Vietnamese characters
35753577
// You can request arbitrary rectangles to be packed into the atlas, for your own purposes.
35763578
// - After calling Build(), you can query the rectangle position and render your pixels.
35773579
// - If you render colored output, set 'atlas->TexPixelsUseColors = true' as this may help some backends decide of preferred texture format.
@@ -3584,7 +3586,6 @@ CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas
35843586
CIMGUI_API ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self, int index);
35853587
// [Internal]
35863588
CIMGUI_API void ImFontAtlas_CalcCustomRectUV(const ImFontAtlas* self, const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max);
3587-
CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self, ImGuiMouseCursor cursor, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]);
35883589

35893590
// Font runtime data and rendering
35903591
// ImFontAtlas automatically loads a default embedded font for you when you call GetTexDataAsAlpha8() or GetTexDataAsRGBA32().

0 commit comments

Comments
 (0)