imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-27 23:37:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fonts: Added ImFontAtlasBakedSetFontGlyphBitmap().

Browse Source
This commit is contained in:
ocornut
2025-02-07 14:51:37 +01:00
parent 92993e68c8
commit 76b252f80a
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
imgui_draw.cpp
View File

@@ -4370,9 +4370,10 @@ static bool ImGui_ImplStbTrueType_FontBakedAddGlyph(ImFontAtlas* atlas, ImFontBa
const bool is_visible = (x0 != x1 && y0 != y1);
// Prepare glyph
ImFontGlyph glyph;
glyph.Codepoint = codepoint;
glyph.AdvanceX = advance * scale_for_layout;
ImFontGlyph glyph_in = {};
ImFontGlyph* glyph = &glyph_in;
glyph->Codepoint = codepoint;
glyph->AdvanceX = advance * scale_for_layout;
// Pack and retrieve position inside texture atlas
// (generally based on stbtt_PackFontRangesRenderIntoRects)
@@ -4420,25 +4421,18 @@ static bool ImGui_ImplStbTrueType_FontBakedAddGlyph(ImFontAtlas* atlas, ImFontBa
// Register glyph
// r->x r->y are coordinates inside texture (in pixels)
// glyph.X0, glyph.Y0 are drawing coordinates from base text position, and accounting for oversampling.
glyph.X0 = x0 * recip_h + font_off_x;
glyph.Y0 = y0 * recip_v + font_off_y;
glyph.X1 = (x0 + (int)r->w) * recip_h + font_off_x;
glyph.Y1 = (y0 + (int)r->h) * recip_v + font_off_y;
glyph.Visible = true;
glyph.PackId = pack_id;
ImFontAtlasBakedAddFontGlyph(atlas, baked, src, &glyph);
// Copy to texture, post-process and queue update for backend
ImTextureData* tex = atlas->TexData;
IM_ASSERT(r->x + r->w <= tex->Width && r->y + r->h <= tex->Height);
ImFontAtlasTextureBlockConvert(bitmap_pixels, ImTextureFormat_Alpha8, w, tex->GetPixelsAt(r->x, r->y), tex->Format, tex->GetPitch(), w, h);
ImFontAtlasPostProcessData pp_data = { atlas, baked->ContainerFont, src, baked, &baked->Glyphs.back(), tex->GetPixelsAt(r->x, r->y), tex->Format, tex->GetPitch(), w, h };
ImFontAtlasTextureBlockPostProcess(&pp_data);
ImFontAtlasTextureBlockQueueUpload(atlas, tex, r->x, r->y, r->w, r->h);
glyph->X0 = x0 * recip_h + font_off_x;
glyph->Y0 = y0 * recip_v + font_off_y;
glyph->X1 = (x0 + (int)r->w) * recip_h + font_off_x;
glyph->Y1 = (y0 + (int)r->h) * recip_v + font_off_y;
glyph->Visible = true;
glyph->PackId = pack_id;
glyph = ImFontAtlasBakedAddFontGlyph(atlas, baked, src, glyph);
ImFontAtlasBakedSetFontGlyphBitmap(atlas, baked, src, glyph, r, bitmap_pixels, ImTextureFormat_Alpha8, w);
}
else
{
ImFontAtlasBakedAddFontGlyph(atlas, baked, src, &glyph);
glyph = ImFontAtlasBakedAddFontGlyph(atlas, baked, src, glyph);
}
return true;
@@ -4891,6 +4885,17 @@ ImFontGlyph* ImFontAtlasBakedAddFontGlyph(ImFontAtlas* atlas, ImFontBaked* baked
return &glyph;
}
// Copy to texture, post-process and queue update for backend
void ImFontAtlasBakedSetFontGlyphBitmap(ImFontAtlas* atlas, ImFontBaked* baked, ImFontConfig* src, ImFontGlyph* glyph, ImFontAtlasRect* r, const unsigned char* src_pixels, ImTextureFormat src_fmt, int src_pitch)
{
ImTextureData* tex = atlas->TexData;
IM_ASSERT(r->x + r->w <= tex->Width && r->y + r->h <= tex->Height);
ImFontAtlasTextureBlockConvert(src_pixels, src_fmt, src_pitch, tex->GetPixelsAt(r->x, r->y), tex->Format, tex->GetPitch(), r->w, r->h);
ImFontAtlasPostProcessData pp_data = { atlas, baked->ContainerFont, src, baked, glyph, tex->GetPixelsAt(r->x, r->y), tex->Format, tex->GetPitch(), r->w, r->h };
ImFontAtlasTextureBlockPostProcess(&pp_data);
ImFontAtlasTextureBlockQueueUpload(atlas, tex, r->x, r->y, r->w, r->h);
}
void ImFont::AddRemapChar(ImWchar from_codepoint, ImWchar to_codepoint, bool overwrite_dst)
{
// FIXME-BAKED: Implement AddRemapChar()