Merge pull request #1438 from MadLadSquad/auto

Update

Author: Madman10K

Framework/ThirdParty/freetype

@@ -3554,14 +3554,14 @@ CIMGUI_API void                   cimgui::ImFontAtlas_ClearInputData(cimgui::ImF
     reinterpret_cast<::ImFontAtlas*>(self)->ClearInputData();
 }
 
-CIMGUI_API void                   cimgui::ImFontAtlas_ClearTexData(cimgui::ImFontAtlas* self)
+CIMGUI_API void                   cimgui::ImFontAtlas_ClearFonts(cimgui::ImFontAtlas* self)
 {
-    reinterpret_cast<::ImFontAtlas*>(self)->ClearTexData();
+    reinterpret_cast<::ImFontAtlas*>(self)->ClearFonts();
 }
 
-CIMGUI_API void                   cimgui::ImFontAtlas_ClearFonts(cimgui::ImFontAtlas* self)
+CIMGUI_API void                   cimgui::ImFontAtlas_ClearTexData(cimgui::ImFontAtlas* self)
 {
-    reinterpret_cast<::ImFontAtlas*>(self)->ClearFonts();
+    reinterpret_cast<::ImFontAtlas*>(self)->ClearTexData();
 }
 
 CIMGUI_API void                   cimgui::ImFontAtlas_Clear(cimgui::ImFontAtlas* self)

Framework/ThirdParty/imgui

@@ -175,6 +175,7 @@ typedef struct ImVector_ImFontPtr_t ImVector_ImFontPtr;
 typedef struct ImVector_ImFontAtlasCustomRect_t ImVector_ImFontAtlasCustomRect;
 typedef struct ImVector_ImFontConfig_t ImVector_ImFontConfig;
 typedef struct ImVector_float_t ImVector_float;
+typedef struct ImVector_ImU16_t ImVector_ImU16;
 typedef struct ImVector_ImFontGlyph_t ImVector_ImFontGlyph;
 typedef struct ImVector_ImGuiPlatformMonitor_t ImVector_ImGuiPlatformMonitor;
 typedef struct ImVector_ImGuiViewportPtr_t ImVector_ImGuiViewportPtr;
@@ -2327,6 +2328,7 @@ struct ImVector_ImFontPtr_t { int Size; int Capacity; ImFont** Data; };  // Inst
 struct ImVector_ImFontAtlasCustomRect_t { int Size; int Capacity; ImFontAtlasCustomRect* Data; };  // Instantiation of ImVector<ImFontAtlasCustomRect>
 struct ImVector_ImFontConfig_t { int Size; int Capacity; ImFontConfig* Data; };  // Instantiation of ImVector<ImFontConfig>
 struct ImVector_float_t { int Size; int Capacity; float* Data; };  // Instantiation of ImVector<float>
+struct ImVector_ImU16_t { int Size; int Capacity; ImU16* Data; };  // Instantiation of ImVector<ImU16>
 struct ImVector_ImFontGlyph_t { int Size; int Capacity; ImFontGlyph* Data; };  // Instantiation of ImVector<ImFontGlyph>
 struct ImVector_ImGuiPlatformMonitor_t { int Size; int Capacity; ImGuiPlatformMonitor* Data; };  // Instantiation of ImVector<ImGuiPlatformMonitor>
 struct ImVector_ImGuiViewportPtr_t { int Size; int Capacity; ImGuiViewport** Data; };  // Instantiation of ImVector<ImGuiViewport*>
@@ -3400,8 +3402,8 @@ struct ImFontConfig_t
     bool           MergeMode;             // false    // Merge into previous ImFont, so you can combine multiple inputs font into one ImFont (e.g. ASCII font + icons + Japanese glyphs). You may want to use GlyphOffset.y when merge font of different heights.
     bool           PixelSnapH;            // false    // Align every glyph AdvanceX to pixel boundaries. Useful e.g. if you are merging a non-pixel aligned font with the default font. If enabled, you can set OversampleH/V to 1.
     int            FontNo;                // 0        // Index of font within TTF/OTF file
-    int            OversampleH;           // 2        // Rasterize at higher quality for sub-pixel positioning. 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.
-    int            OversampleV;           // 1        // Rasterize at higher quality for sub-pixel positioning. This is not really useful as we don't use sub-pixel positions on the Y axis.
+    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.
+    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.
     float          SizePixels;            //          // Size in pixels for rasterizer (more or less maps to the resulting font height).
     ImVec2         GlyphExtraSpacing;     // 0, 0     // Extra spacing (in pixels) between glyphs when rendered: essentially add to glyph->AdvanceX. Only X axis is supported for now.
     ImVec2         GlyphOffset;           // 0, 0     // Offset all glyphs from this font input.
@@ -3540,8 +3542,8 @@ CIMGUI_API ImFont*                ImFontAtlas_AddFontFromMemoryTTF(ImFontAtlas*
 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.
 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.
 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.
+CIMGUI_API void                   ImFontAtlas_ClearFonts(ImFontAtlas* self);                                                                                         // Clear input+output font data (same as ClearInputData() + glyphs storage, UV coordinates).
 CIMGUI_API void                   ImFontAtlas_ClearTexData(ImFontAtlas* self);                                                                                       // Clear output texture data (CPU side). Saves RAM once the texture has been copied to graphics memory.
-CIMGUI_API void                   ImFontAtlas_ClearFonts(ImFontAtlas* self);                                                                                         // Clear output font data (glyphs storage, UV coordinates).
 CIMGUI_API void                   ImFontAtlas_Clear(ImFontAtlas* self);                                                                                              // Clear all input and output.
 // Build atlas, retrieve pixel data.
 // 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().
@@ -3585,28 +3587,28 @@ CIMGUI_API bool                   ImFontAtlas_GetMouseCursorTexData(ImFontAtlas*
 struct ImFont_t
 {
     // [Internal] Members: Hot ~20/24 bytes (for CalcTextSize)
-    ImVector_float       IndexAdvanceX;                                         // 12-16 // out //            // Sparse. Glyphs->AdvanceX in a directly indexable way (cache-friendly for CalcTextSize functions which only this info, and are often bottleneck in large UI).
+    ImVector_float       IndexAdvanceX;                                         // 12-16 // out // Sparse. Glyphs->AdvanceX in a directly indexable way (cache-friendly for CalcTextSize functions which only this info, and are often bottleneck in large UI).
     float                FallbackAdvanceX;                                      // 4     // out // = FallbackGlyph->AdvanceX
-    float                FontSize;                                              // 4     // in  //            // Height of characters/line, set during loading (don't change after loading)
+    float                FontSize;                                              // 4     // in  // Height of characters/line, set during loading (don't change after loading)
 
     // [Internal] Members: Hot ~28/40 bytes (for RenderText loop)
-    ImVector_ImWchar     IndexLookup;                                           // 12-16 // out //            // Sparse. Index glyphs by Unicode code-point.
-    ImVector_ImFontGlyph Glyphs;                                                // 12-16 // out //            // All glyphs.
+    ImVector_ImU16       IndexLookup;                                           // 12-16 // out // Sparse. Index glyphs by Unicode code-point.
+    ImVector_ImFontGlyph Glyphs;                                                // 12-16 // out // All glyphs.
     const ImFontGlyph*   FallbackGlyph;                                         // 4-8   // out // = FindGlyph(FontFallbackChar)
 
     // [Internal] Members: Cold ~32/40 bytes
     // Conceptually ConfigData[] is the list of font sources merged to create this font.
-    ImFontAtlas*         ContainerAtlas;                                        // 4-8   // out //            // What we has been loaded into
-    const ImFontConfig*  ConfigData;                                            // 4-8   // in  //            // Pointer within ContainerAtlas->ConfigData to ConfigDataCount instances
-    short                ConfigDataCount;                                       // 2     // in  // ~ 1        // Number of ImFontConfig involved in creating this font. Bigger than 1 when merging multiple font sources into one ImFont.
+    ImFontAtlas*         ContainerAtlas;                                        // 4-8   // out // What we has been loaded into
+    const ImFontConfig*  ConfigData;                                            // 4-8   // in  // Pointer within ContainerAtlas->ConfigData to ConfigDataCount instances
+    short                ConfigDataCount;                                       // 2     // in  // Number of ImFontConfig involved in creating this font. Usually 1, or >1 when merging multiple font sources into one ImFont.
     short                EllipsisCharCount;                                     // 1     // out // 1 or 3
-    ImWchar              EllipsisChar;                                          // 2-4   // out // = '...'/'.'// Character used for ellipsis rendering.
-    ImWchar              FallbackChar;                                          // 2-4   // out // = FFFD/'?' // Character used if a glyph isn't found.
-    float                EllipsisWidth;                                         // 4     // out               // Width
-    float                EllipsisCharStep;                                      // 4     // out               // Step between characters when EllipsisCount > 0
-    float                Scale;                                                 // 4     // in  // = 1.f      // Base font scale, multiplied by the per-window font scale which you can adjust with SetWindowFontScale()
-    float                Ascent, Descent;                                       // 4+4   // out //            // Ascent: distance from top to bottom of e.g. 'A' [0..FontSize] (unscaled)
-    int                  MetricsTotalSurface;                                   // 4     // out //            // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs)
+    ImWchar              EllipsisChar;                                          // 2-4   // out // Character used for ellipsis rendering ('...').
+    ImWchar              FallbackChar;                                          // 2-4   // out // Character used if a glyph isn't found (U+FFFD, '?')
+    float                EllipsisWidth;                                         // 4     // out // Total ellipsis Width
+    float                EllipsisCharStep;                                      // 4     // out // Step between characters when EllipsisCount > 0
+    float                Scale;                                                 // 4     // in  // Base font scale (1.0f), multiplied by the per-window font scale which you can adjust with SetWindowFontScale()
+    float                Ascent, Descent;                                       // 4+4   // out // Ascent: distance from top to bottom of e.g. 'A' [0..FontSize] (unscaled)
+    int                  MetricsTotalSurface;                                   // 4     // out // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs)
     bool                 DirtyLookupTables;                                     // 1     // out //
     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.
 };