Explorar o código

Comments (fixed old comments)

ocornut %!s(int64=10) %!d(string=hai) anos
pai
achega
99a92ee7c5
Modificáronse 2 ficheiros con 7 adicións e 6 borrados
  1. 6 6
      extra_fonts/README.txt
  2. 1 0
      imgui.cpp

+ 6 - 6
extra_fonts/README.txt

@@ -69,7 +69,7 @@
    config.OversampleH = 3;
    config.OversampleH = 3;
    config.OversampleV = 3;
    config.OversampleV = 3;
    config.GlyphExtraSpacing.x = 1.0f;
    config.GlyphExtraSpacing.x = 1.0f;
-   io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, &config);
+   io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, &config);
 
 
  Merge two fonts:
  Merge two fonts:
 
 
@@ -80,14 +80,14 @@
    ImWchar ranges[] = { 0xf000, 0xf3ff, 0 };
    ImWchar ranges[] = { 0xf000, 0xf3ff, 0 };
    ImFontConfig config;
    ImFontConfig config;
    config.MergeMode = true;
    config.MergeMode = true;
-   io.Fonts->LoadFromFileTTF("fontawesome-webfont.ttf", 16.0f, &config, ranges);
-   io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, NULL, &config, io.Fonts->GetGlyphRangesJapanese());
+   io.Fonts->AddFontFromFileTTF("fontawesome-webfont.ttf", 16.0f, &config, ranges);
+   io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, NULL, &config, io.Fonts->GetGlyphRangesJapanese());
 
 
  Add a fourth parameter to bake specific font ranges only:
  Add a fourth parameter to bake specific font ranges only:
 
 
-   io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, NULL, io.Fonts->GetGlyphRangesDefault());   // Basic Latin, Extended Latin 
-   io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, NULL, io.Fonts->GetGlyphRangesJapanese());  // Default + Hiragana, Katakana, Half-Width, Selection of 1946 Ideographs
-   io.Fonts->LoadFromFileTTF("myfontfile.ttf", size_pixels, NULL, io.Fonts->GetGlyphRangesChinese());   // Include full set of about 21000 CJK Unified Ideographs
+   io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, NULL, io.Fonts->GetGlyphRangesDefault());   // Basic Latin, Extended Latin 
+   io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, NULL, io.Fonts->GetGlyphRangesJapanese());  // Default + Hiragana, Katakana, Half-Width, Selection of 1946 Ideographs
+   io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, NULL, io.Fonts->GetGlyphRangesChinese());   // Include full set of about 21000 CJK Unified Ideographs
 
 
  Offset font vertically by altering the io.Font->DisplayOffset value:
  Offset font vertically by altering the io.Font->DisplayOffset value:
 
 

+ 1 - 0
imgui.cpp

@@ -139,6 +139,7 @@
  Here is a change-log of API breaking changes, if you are using one of the functions listed, expect to have to fix some code.
  Here is a change-log of API breaking changes, if you are using one of the functions listed, expect to have to fix some code.
  
  
  - 2015/07/14 (1.43) - add new ImFontAtlas::AddFont() API. For the old AddFont***, moved the 'font_no' parameter of ImFontAtlas::AddFont** functions to the ImFontConfig structure.
  - 2015/07/14 (1.43) - add new ImFontAtlas::AddFont() API. For the old AddFont***, moved the 'font_no' parameter of ImFontAtlas::AddFont** functions to the ImFontConfig structure.
+                       you need to render your textured triangles with bilinear filtering to benefit from subpixel positioning of text.
  - 2015/07/08 (1.43) - switched rendering data to use indexed rendering. this is saving a fair amount of CPU/GPU and enables us to get anti-aliasing for a marginal cost.
  - 2015/07/08 (1.43) - switched rendering data to use indexed rendering. this is saving a fair amount of CPU/GPU and enables us to get anti-aliasing for a marginal cost.
                        this necessary change will break your rendering function! the fix should be very easy. sorry for that :(
                        this necessary change will break your rendering function! the fix should be very easy. sorry for that :(
                      - if you are using a vanilla copy of one of the imgui_impl_XXXX.cpp provided in the example, you just need to update your copy and you can ignore the rest.
                      - if you are using a vanilla copy of one of the imgui_impl_XXXX.cpp provided in the example, you just need to update your copy and you can ignore the rest.