mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Fonts: clarify ClearTexData() as not supported with dynamic atlases.

Browse source
This commit is contained in:
ocornut 2025-01-30 16:32:25 +01:00
parent 093d01269a
commit 80404fae30
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
imgui_draw.cpp
View file

@ -2607,9 +2607,11 @@ ImFontAtlas::~ImFontAtlas()
void ImFontAtlas::Clear()
{
ClearInputData();
ClearTexData();
ClearFonts();
bool backup_renderer_has_textures = RendererHasTextures;
RendererHasTextures = false; // Full Clear() is supported, but ClearTexData() only isn't.
ClearTexData();
RendererHasTextures = backup_renderer_has_textures;
}
void ImFontAtlas::ClearCache()
@ -2647,12 +2649,14 @@ void ImFontAtlas::ClearInputData()
Sources.clear();
}
// Clear CPU-side copy of the texture data.
void ImFontAtlas::ClearTexData()
{
IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas!");
TexList.clear();
IM_DELETE(TexData);
TexData = NULL;
IM_ASSERT(RendererHasTextures == false && "Not supported for dynamic atlases, but you may call Clear().");
for (ImTextureData* tex : TexList)
tex->DestroyPixels();
//Locked = true; // Hoped to be able to lock this down but some reload patterns may not be happy with it.
}
void ImFontAtlas::ClearFonts()
@ -2686,7 +2690,7 @@ static void ImFontAtlasBuildUpdateRendererHasTexturesFromContext(ImFontAtlas* at
}
// Called by NewFrame(). When multiple context own the atlas, only the first one calls this.
// If you are calling this yourself, ensure atlas->RendererHasTexUpdates is et.
// If you are calling this yourself, ensure atlas->RendererHasTextures is set.
// 'frame_count' needs to be provided because we can gc/prioritize baked fonts based on their age.
void ImFontAtlasUpdateNewFrame(ImFontAtlas* atlas, int frame_count)
{
@ -3256,7 +3260,7 @@ bool ImFontAtlasGetMouseCursorTexData(ImFontAtlas* atlas, ImGuiMouseCursor curso
return true;
}
// When atlas->RendererHasTexUpdates == true, this is only called if no font were loaded.
// When atlas->RendererHasTextures = true, this is only called if no font were loaded.
void ImFontAtlasBuildMain(ImFontAtlas* atlas)
{
IM_ASSERT(!atlas->Locked && "Cannot modify a locked ImFontAtlas!");
@ -3481,16 +3485,6 @@ static void ImFontAtlasBuildUpdateLinesTexData(ImFontAtlas* atlas, bool add_and_
//-----------------------------------------------------------------------------------------------------------------------------
ImGuiID ImFontAtlasBakedGetId(ImGuiID font_id, float baked_size)
{
struct { ImGuiID FontId; float BakedSize; } hashed_data;
hashed_data.FontId = font_id;
hashed_data.BakedSize = baked_size;
return ImHashData(&hashed_data, sizeof(hashed_data));
}
//-----------------------------------------------------------------------------------------------------------------------------
bool ImFontAtlasBuildAddFont(ImFontAtlas* atlas, ImFontConfig* src)
{
ImFont* font = src->DstFont;
@ -4910,6 +4904,14 @@ float ImFontBaked::GetCharAdvance(ImWchar c)
}
IM_MSVC_RUNTIME_CHECKS_RESTORE
ImGuiID ImFontAtlasBakedGetId(ImGuiID font_id, float baked_size)
{
struct { ImGuiID FontId; float BakedSize; } hashed_data;
hashed_data.FontId = font_id;
hashed_data.BakedSize = baked_size;
return ImHashData(&hashed_data, sizeof(hashed_data));
}
// ImFontBaked pointers are valid for the entire frame but shall never be kept between frames.
ImFontBaked* ImFont::GetFontBaked(float size)
{
@ -4920,18 +4922,22 @@ ImFontBaked* ImFont::GetFontBaked(float size)
ImFontAtlas* atlas = ContainerAtlas;
ImFontAtlasBuilder* builder = atlas->Builder;
// FIXME-BAKED: Design for picking a nearest size?
ImGuiID baked_id = ImFontAtlasBakedGetId(FontId, size);
ImFontBaked** p_baked_in_map = (ImFontBaked**)builder->BakedMap.GetVoidPtrRef(baked_id);
baked = *p_baked_in_map;
if (baked != NULL)
{
// FIXME-BAKED: Design for picking a nearest size?
IM_ASSERT(baked->Size == size && baked->ContainerFont == this && baked->BakedId == baked_id);
baked->LastUsedFrame = builder->FrameCount;
LastBaked = baked;
return baked;
}
// FIXME-BAKED: If atlas is locked, find closest match
if (atlas->Locked)
IM_ASSERT(!atlas->Locked && "Cannot use dynamic font size with a locked ImFontAtlas!"); // Locked because rendering backend does not support ImGuiBackendFlags_RendererHasTextures!
// Create new
ImGuiContext& g = *GImGui;
IM_UNUSED(g); // for IMGUI_DEBUG_LOG_FONT()