Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-25 00:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

PushFont/PopFont changes texture at high-level in current draw list - faster

Browse Source
This commit is contained in:
ocornut 2015-01-17 14:00:43 +00:00
parent 7ebd7ef9ac
commit 3e30ad3802
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
imgui.cpp
View File

@ -90,7 +90,7 @@
// Load texture // Load texture
unsigned char* pixels; unsigned char* pixels;
int width, height; int width, height;
io.Font->GetTextureData(&pixels, &width, &height); io.Font->GetTextureDataAlpha8(&pixels, &width, &height); // or use GetTextureDataRGBA32()
// TODO: copy texture to graphics memory. Store texture identifier for your engine in io.Font->TexID // TODO: copy texture to graphics memory. Store texture identifier for your engine in io.Font->TexID
// Application main loop // Application main loop
@ -1688,6 +1688,7 @@ void ImGui::Shutdown()
g.Settings.clear(); g.Settings.clear();
g.ColorModifiers.clear(); g.ColorModifiers.clear();
g.StyleModifiers.clear(); g.StyleModifiers.clear();
g.FontStack.clear();
g.ColorEditModeStorage.Clear(); g.ColorEditModeStorage.Clear();
if (g.LogFile && g.LogFile != stdout) if (g.LogFile && g.LogFile != stdout)
{ {
@ -2373,7 +2374,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
if (first_begin_of_the_frame) if (first_begin_of_the_frame)
{ {
window->DrawList->Clear(); window->DrawList->Clear();
window->DrawList->PushTextureID(g.IO.Font->TexID); window->DrawList->PushTextureID(g.Font->TexID);
window->Visible = true; window->Visible = true;
// New windows appears in front // New windows appears in front
@ -2686,7 +2687,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
else else
{ {
// Short path when we do multiple Begin in the same frame. // Short path when we do multiple Begin in the same frame.
window->DrawList->PushTextureID(g.IO.Font->TexID); window->DrawList->PushTextureID(g.Font->TexID);
// Outer clipping rectangle // Outer clipping rectangle
if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_ComboBox)) if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_ComboBox))
@ -2811,14 +2812,16 @@ void ImGui::PushFont(ImFont* font)
{ {
ImGuiState& g = GImGui; ImGuiState& g = GImGui;
g.FontStack.push_back(font); SetFont(font);
SetFont(font); g.FontStack.push_back(font);
g.CurrentWindow->DrawList->PushTextureID(font->TexID);
} }
void ImGui::PopFont() void ImGui::PopFont()
{ {
ImGuiState& g = GImGui; ImGuiState& g = GImGui;
g.CurrentWindow->DrawList->PopTextureID();
g.FontStack.pop_back(); g.FontStack.pop_back();
SetFont(g.FontStack.empty() ? g.IO.Font : g.FontStack.back()); SetFont(g.FontStack.empty() ? g.IO.Font : g.FontStack.back());
} }
@ -6220,9 +6223,7 @@ void ImDrawList::AddText(ImFont* font, float font_size, const ImVec2& pos, ImU32
if (text_end == NULL) if (text_end == NULL)
text_end = text_begin + strlen(text_begin); text_end = text_begin + strlen(text_begin);
const bool push_texture_id = font->TexID != texture_id_stack.back(); IM_ASSERT(font->TexID == texture_id_stack.back()); // Use high-level ImGui::PushFont() or low-level ImDrawList::PushTextureId() to change font.
if (push_texture_id)
PushTextureID(font->TexID);
// reserve vertices for worse case // reserve vertices for worse case
const unsigned int char_count = (unsigned int)(text_end - text_begin); const unsigned int char_count = (unsigned int)(text_end - text_begin);
@ -6237,9 +6238,6 @@ void ImDrawList::AddText(ImFont* font, float font_size, const ImVec2& pos, ImU32
const size_t vtx_count = vtx_buffer.size() - vtx_begin; const size_t vtx_count = vtx_buffer.size() - vtx_begin;
commands.back().vtx_count -= (unsigned int)(vtx_count_max - vtx_count); commands.back().vtx_count -= (unsigned int)(vtx_count_max - vtx_count);
vtx_write -= (vtx_count_max - vtx_count); vtx_write -= (vtx_count_max - vtx_count);
if (push_texture_id)
PopTextureID();
} }
void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv0, const ImVec2& uv1, ImU32 col) void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv0, const ImVec2& uv1, ImU32 col)

15
imgui.h
View File

@ -175,18 +175,21 @@ namespace ImGui
IMGUI_API void SetStateStorage(ImGuiStorage* tree); // replace tree state storage with our own (if you want to manipulate it yourself, typically clear subsection of it). IMGUI_API void SetStateStorage(ImGuiStorage* tree); // replace tree state storage with our own (if you want to manipulate it yourself, typically clear subsection of it).
IMGUI_API ImGuiStorage* GetStateStorage(); IMGUI_API ImGuiStorage* GetStateStorage();
IMGUI_API void PushItemWidth(float item_width); // width of items for the common item+label case. default to ~2/3 of windows width. // Parameters stacks (shared)
IMGUI_API void PopItemWidth();
IMGUI_API float GetItemWidth();
IMGUI_API void PushFont(ImFont* font); IMGUI_API void PushFont(ImFont* font);
IMGUI_API void PopFont(); IMGUI_API void PopFont();
IMGUI_API void PushAllowKeyboardFocus(bool v); // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets.
IMGUI_API void PopAllowKeyboardFocus();
IMGUI_API void PushStyleColor(ImGuiCol idx, const ImVec4& col); IMGUI_API void PushStyleColor(ImGuiCol idx, const ImVec4& col);
IMGUI_API void PopStyleColor(int count = 1); IMGUI_API void PopStyleColor(int count = 1);
IMGUI_API void PushStyleVar(ImGuiStyleVar idx, float val); IMGUI_API void PushStyleVar(ImGuiStyleVar idx, float val);
IMGUI_API void PushStyleVar(ImGuiStyleVar idx, const ImVec2& val); IMGUI_API void PushStyleVar(ImGuiStyleVar idx, const ImVec2& val);
IMGUI_API void PopStyleVar(int count = 1); IMGUI_API void PopStyleVar(int count = 1);
// Parameters stacks (current window)
IMGUI_API void PushItemWidth(float item_width); // width of items for the common item+label case. default to ~2/3 of windows width.
IMGUI_API void PopItemWidth();
IMGUI_API float GetItemWidth();
IMGUI_API void PushAllowKeyboardFocus(bool v); // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets.
IMGUI_API void PopAllowKeyboardFocus();
IMGUI_API void PushTextWrapPos(float wrap_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space. IMGUI_API void PushTextWrapPos(float wrap_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space.
IMGUI_API void PopTextWrapPos(); IMGUI_API void PopTextWrapPos();
@ -802,7 +805,7 @@ struct ImFont
struct Glyph struct Glyph
{ {
ImWchar Codepoint; ImWchar Codepoint;
signed short XAdvance; signed short XAdvance;
signed short Width, Height; signed short Width, Height;
signed short XOffset, YOffset; signed short XOffset, YOffset;
float U0, V0, U1, V1; // Texture coordinates float U0, V0, U1, V1; // Texture coordinates