Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-30 18:34:34 +01:00
Code Releases Wiki Activity

Simplified ImDrawList system (samples are 20 lines shorter) + merged title bar draw bar.

Browse Source
This commit is contained in:
ocornut 2014-08-13 11:34:08 +01:00
parent 57ac561ecb
commit ddc7f8b0b0
4 changed files with 78 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
examples/directx9_example/main.cpp
View File

@ -86,37 +86,16 @@ static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_c
int vtx_offset = 0; int vtx_offset = 0;
for (int n = 0; n < cmd_lists_count; n++) for (int n = 0; n < cmd_lists_count; n++)
{ {
// Setup stack of clipping rectangles
int clip_rect_buf_offset = 0;
ImVector<ImVec4> clip_rect_stack;
clip_rect_stack.push_back(ImVec4(-9999,-9999,+9999,+9999));
// Render command list // Render command list
const ImDrawList* cmd_list = cmd_lists[n]; const ImDrawList* cmd_list = cmd_lists[n];
const ImDrawCmd* pcmd_end = cmd_list->commands.end(); const ImDrawCmd* pcmd_end = cmd_list->commands.end();
for (const ImDrawCmd* pcmd = cmd_list->commands.begin(); pcmd != pcmd_end; pcmd++) for (const ImDrawCmd* pcmd = cmd_list->commands.begin(); pcmd != pcmd_end; pcmd++)
{ {
switch (pcmd->cmd_type) const RECT r = { (LONG)pcmd->clip_rect.x, (LONG)pcmd->clip_rect.y, (LONG)pcmd->clip_rect.z, (LONG)pcmd->clip_rect.w };
{
case ImDrawCmdType_DrawTriangleList:
{
const ImVec4& clip_rect = clip_rect_stack.back();
const RECT r = { (LONG)clip_rect.x, (LONG)clip_rect.y, (LONG)clip_rect.z, (LONG)clip_rect.w };
g_pd3dDevice->SetScissorRect(&r); g_pd3dDevice->SetScissorRect(&r);
g_pd3dDevice->DrawPrimitive(D3DPT_TRIANGLELIST, vtx_offset, pcmd->vtx_count/3); g_pd3dDevice->DrawPrimitive(D3DPT_TRIANGLELIST, vtx_offset, pcmd->vtx_count/3);
vtx_offset += pcmd->vtx_count; vtx_offset += pcmd->vtx_count;
} }
break;
case ImDrawCmdType_PushClipRect:
clip_rect_stack.push_back(cmd_list->clip_rect_buffer[clip_rect_buf_offset++]);
break;
case ImDrawCmdType_PopClipRect:
clip_rect_stack.pop_back();
break;
}
}
} }
} }

21
examples/opengl_example/main.cpp
View File

@ -68,32 +68,13 @@ static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_c
int vtx_offset = 0; int vtx_offset = 0;
for (int n = 0; n < cmd_lists_count; n++) for (int n = 0; n < cmd_lists_count; n++)
{ {
// Setup stack of clipping rectangles
int clip_rect_buf_offset = 0;
ImVector<ImVec4> clip_rect_stack;
clip_rect_stack.push_back(ImVec4(-9999,-9999,+9999,+9999));
// Render command list
const ImDrawList* cmd_list = cmd_lists[n]; const ImDrawList* cmd_list = cmd_lists[n];
const ImDrawCmd* pcmd_end = cmd_list->commands.end(); const ImDrawCmd* pcmd_end = cmd_list->commands.end();
for (const ImDrawCmd* pcmd = cmd_list->commands.begin(); pcmd != pcmd_end; pcmd++) for (const ImDrawCmd* pcmd = cmd_list->commands.begin(); pcmd != pcmd_end; pcmd++)
{ {
switch (pcmd->cmd_type) glUniform4fv(uniClipRect, 1, (float*)&pcmd->clip_rect);
{
case ImDrawCmdType_DrawTriangleList:
glUniform4fv(uniClipRect, 1, (float*)&clip_rect_stack.back());
glDrawArrays(GL_TRIANGLES, vtx_offset, pcmd->vtx_count); glDrawArrays(GL_TRIANGLES, vtx_offset, pcmd->vtx_count);
vtx_offset += pcmd->vtx_count; vtx_offset += pcmd->vtx_count;
break;
case ImDrawCmdType_PushClipRect:
clip_rect_stack.push_back(cmd_list->clip_rect_buffer[clip_rect_buf_offset++]);
break;
case ImDrawCmdType_PopClipRect:
clip_rect_stack.pop_back();
break;
}
} }
} }

114
imgui.cpp
View File

@ -978,7 +978,11 @@ void ImGuiWindow::AddToRenderList()
ImGuiState& g = GImGui; ImGuiState& g = GImGui;
if (!DrawList->commands.empty() && !DrawList->vtx_buffer.empty()) if (!DrawList->commands.empty() && !DrawList->vtx_buffer.empty())
{
if (DrawList->commands.back().vtx_count == 0)
DrawList->commands.pop_back();
g.RenderDrawLists.push_back(DrawList); g.RenderDrawLists.push_back(DrawList);
}
for (size_t i = 0; i < DC.ChildWindows.size(); i++) for (size_t i = 0; i < DC.ChildWindows.size(); i++)
{ {
ImGuiWindow* child = DC.ChildWindows[i]; ImGuiWindow* child = DC.ChildWindows[i];
@ -1801,6 +1805,10 @@ bool Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, ImGuiWin
if (!(flags & ImGuiWindowFlags_ComboBox)) if (!(flags & ImGuiWindowFlags_ComboBox))
ImGui::PushClipRect(parent_window->ClipRectStack.back()); ImGui::PushClipRect(parent_window->ClipRectStack.back());
} }
else
{
ImGui::PushClipRect(ImVec4(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y));
}
// ID stack // ID stack
window->IDStack.resize(0); window->IDStack.resize(0);
@ -2035,12 +2043,10 @@ bool Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, ImGuiWin
// Title bar // Title bar
if (!(window->Flags & ImGuiWindowFlags_NoTitleBar)) if (!(window->Flags & ImGuiWindowFlags_NoTitleBar))
{ {
ImGui::PushClipRect(ImVec4(window->Pos.x-0.5f, window->Pos.y-0.5f, window->Pos.x+window->Size.x-1.5f, window->Pos.y+window->Size.y-1.5f), false);
RenderCollapseTriangle(window->Pos + style.FramePadding, !window->Collapsed, 1.0f, true); RenderCollapseTriangle(window->Pos + style.FramePadding, !window->Collapsed, 1.0f, true);
RenderText(window->Pos + style.FramePadding + ImVec2(window->FontSize() + style.ItemInnerSpacing.x, 0), name); RenderText(window->Pos + style.FramePadding + ImVec2(window->FontSize() + style.ItemInnerSpacing.x, 0), name);
if (open) if (open)
ImGui::CloseWindowButton(open); ImGui::CloseWindowButton(open);
ImGui::PopClipRect();
} }
} }
@ -2070,8 +2076,14 @@ void End()
ImGui::Columns(1, "#CloseColumns"); ImGui::Columns(1, "#CloseColumns");
ImGui::PopClipRect(); ImGui::PopClipRect();
if (window->Flags & ImGuiWindowFlags_ChildWindow) if (window->Flags & ImGuiWindowFlags_ChildWindow)
{
if (!(window->Flags & ImGuiWindowFlags_ComboBox)) if (!(window->Flags & ImGuiWindowFlags_ComboBox))
ImGui::PopClipRect(); ImGui::PopClipRect();
}
else
{
ImGui::PopClipRect();
}
// Select window for move/focus when we're done with all our widgets // Select window for move/focus when we're done with all our widgets
ImGuiAabb bb(window->Pos, window->Pos+window->Size); ImGuiAabb bb(window->Pos, window->Pos+window->Size);
@ -4544,58 +4556,62 @@ void ImDrawList::Clear()
{ {
commands.resize(0); commands.resize(0);
vtx_buffer.resize(0); vtx_buffer.resize(0);
clip_rect_buffer.resize(0); vtx_write = NULL;
vtx_write_ = NULL; clip_rect_stack.resize(0);
clip_rect_stack_.resize(0);
} }
void ImDrawList::PushClipRect(const ImVec4& clip_rect) void ImDrawList::PushClipRect(const ImVec4& clip_rect)
{ {
commands.push_back(ImDrawCmd(ImDrawCmdType_PushClipRect)); if (!commands.empty() && commands.back().vtx_count == 0)
clip_rect_buffer.push_back(clip_rect); {
clip_rect_stack_.push_back(clip_rect); // Reuse empty command because high-level clipping may have discarded the other vertices already
commands.back().clip_rect = clip_rect;
}
else
{
ImDrawCmd draw_cmd;
draw_cmd.vtx_count = 0;
draw_cmd.clip_rect = clip_rect;
commands.push_back(draw_cmd);
}
clip_rect_stack.push_back(clip_rect);
} }
void ImDrawList::PopClipRect() void ImDrawList::PopClipRect()
{ {
if (!commands.empty() && commands.back().cmd_type == ImDrawCmdType_PushClipRect) clip_rect_stack.pop_back();
const ImVec4 clip_rect = clip_rect_stack.empty() ? ImVec4(-9999.0f,-9999.0f, +9999.0f, +9999.0f) : clip_rect_stack.back();
if (!commands.empty() && commands.back().vtx_count == 0)
{ {
// Discard push/pop combo because high-level clipping may have discarded the other draw commands already // Reuse empty command because high-level clipping may have discarded the other vertices already
commands.pop_back(); commands.back().clip_rect = clip_rect;
clip_rect_buffer.pop_back();
} }
else else
{ {
commands.push_back(ImDrawCmd(ImDrawCmdType_PopClipRect)); ImDrawCmd draw_cmd;
draw_cmd.vtx_count = 0;
draw_cmd.clip_rect = clip_rect;
commands.push_back(draw_cmd);
} }
clip_rect_stack_.pop_back();
} }
void ImDrawList::AddCommand(ImDrawCmdType cmd_type, int vtx_count) void ImDrawList::ReserveVertices(unsigned int vtx_count)
{ {
// Maximum value that can fit in our u16 vtx_count member
const int VTX_COUNT_MAX = (1<<16);
// Merge commands if we can, turning them into less draw calls
ImDrawCmd* prev = commands.empty() ? NULL : &commands.back();
if (vtx_count > 0 && prev && prev->cmd_type == cmd_type && prev->vtx_count + vtx_count < VTX_COUNT_MAX)
prev->vtx_count += vtx_count;
else
commands.push_back(ImDrawCmd(cmd_type, vtx_count));
if (vtx_count > 0) if (vtx_count > 0)
{ {
ImDrawCmd& draw_cmd = commands.back();
draw_cmd.vtx_count += vtx_count;
vtx_buffer.resize(vtx_buffer.size() + vtx_count); vtx_buffer.resize(vtx_buffer.size() + vtx_count);
vtx_write_ = &vtx_buffer[vtx_buffer.size() - vtx_count]; vtx_write = &vtx_buffer[vtx_buffer.size() - vtx_count];
} }
} }
void ImDrawList::AddVtx(const ImVec2& pos, ImU32 col) void ImDrawList::AddVtx(const ImVec2& pos, ImU32 col)
{ {
vtx_write_->pos = pos; vtx_write->pos = pos;
vtx_write_->col = col; vtx_write->col = col;
vtx_write_->uv = IMDRAW_TEX_UV_FOR_WHITE; vtx_write->uv = IMDRAW_TEX_UV_FOR_WHITE;
vtx_write_++; vtx_write++;
} }
void ImDrawList::AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col) void ImDrawList::AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col)
@ -4617,7 +4633,7 @@ void ImDrawList::AddLine(const ImVec2& a, const ImVec2& b, ImU32 col)
if ((col >> 24) == 0) if ((col >> 24) == 0)
return; return;
AddCommand(ImDrawCmdType_DrawTriangleList, 6); ReserveVertices(6);
AddVtxLine(a, b, col); AddVtxLine(a, b, col);
} }
@ -4638,7 +4654,7 @@ void ImDrawList::AddArc(const ImVec2& center, float rad, ImU32 col, int a_min, i
if (tris) if (tris)
{ {
AddCommand(ImDrawCmdType_DrawTriangleList, (a_max-a_min) * 3); ReserveVertices((a_max-a_min) * 3);
for (int a = a_min; a < a_max; a++) for (int a = a_min; a < a_max; a++)
{ {
AddVtx(center + circle_vtx[a % ARRAYSIZE(circle_vtx)] * rad, col); AddVtx(center + circle_vtx[a % ARRAYSIZE(circle_vtx)] * rad, col);
@ -4648,7 +4664,7 @@ void ImDrawList::AddArc(const ImVec2& center, float rad, ImU32 col, int a_min, i
} }
else else
{ {
AddCommand(ImDrawCmdType_DrawTriangleList, (a_max-a_min) * 6); ReserveVertices((a_max-a_min) * 6);
for (int a = a_min; a < a_max; a++) for (int a = a_min; a < a_max; a++)
AddVtxLine(center + circle_vtx[a % ARRAYSIZE(circle_vtx)] * rad, center + circle_vtx[(a+1) % ARRAYSIZE(circle_vtx)] * rad, col); AddVtxLine(center + circle_vtx[a % ARRAYSIZE(circle_vtx)] * rad, center + circle_vtx[(a+1) % ARRAYSIZE(circle_vtx)] * rad, col);
} }
@ -4666,7 +4682,7 @@ void ImDrawList::AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float roun
if (r == 0.0f || rounding_corners == 0) if (r == 0.0f || rounding_corners == 0)
{ {
AddCommand(ImDrawCmdType_DrawTriangleList, 4*6); ReserveVertices(4*6);
AddVtxLine(ImVec2(a.x,a.y), ImVec2(b.x,a.y), col); AddVtxLine(ImVec2(a.x,a.y), ImVec2(b.x,a.y), col);
AddVtxLine(ImVec2(b.x,a.y), ImVec2(b.x,b.y), col); AddVtxLine(ImVec2(b.x,a.y), ImVec2(b.x,b.y), col);
AddVtxLine(ImVec2(b.x,b.y), ImVec2(a.x,b.y), col); AddVtxLine(ImVec2(b.x,b.y), ImVec2(a.x,b.y), col);
@ -4674,7 +4690,7 @@ void ImDrawList::AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float roun
} }
else else
{ {
AddCommand(ImDrawCmdType_DrawTriangleList, 4*6); ReserveVertices(4*6);
AddVtxLine(ImVec2(a.x + ((rounding_corners & 1)?r:0), a.y), ImVec2(b.x - ((rounding_corners & 2)?r:0), a.y), col); AddVtxLine(ImVec2(a.x + ((rounding_corners & 1)?r:0), a.y), ImVec2(b.x - ((rounding_corners & 2)?r:0), a.y), col);
AddVtxLine(ImVec2(b.x, a.y + ((rounding_corners & 2)?r:0)), ImVec2(b.x, b.y - ((rounding_corners & 4)?r:0)), col); AddVtxLine(ImVec2(b.x, a.y + ((rounding_corners & 2)?r:0)), ImVec2(b.x, b.y - ((rounding_corners & 4)?r:0)), col);
AddVtxLine(ImVec2(b.x - ((rounding_corners & 4)?r:0), b.y), ImVec2(a.x + ((rounding_corners & 8)?r:0), b.y), col); AddVtxLine(ImVec2(b.x - ((rounding_corners & 4)?r:0), b.y), ImVec2(a.x + ((rounding_corners & 8)?r:0), b.y), col);
@ -4700,7 +4716,7 @@ void ImDrawList::AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, floa
if (r == 0.0f || rounding_corners == 0) if (r == 0.0f || rounding_corners == 0)
{ {
// Use triangle so we can merge more draw calls together (at the cost of extra vertices) // Use triangle so we can merge more draw calls together (at the cost of extra vertices)
AddCommand(ImDrawCmdType_DrawTriangleList, 6); ReserveVertices(6);
AddVtx(ImVec2(a.x,a.y), col); AddVtx(ImVec2(a.x,a.y), col);
AddVtx(ImVec2(b.x,a.y), col); AddVtx(ImVec2(b.x,a.y), col);
AddVtx(ImVec2(b.x,b.y), col); AddVtx(ImVec2(b.x,b.y), col);
@ -4710,7 +4726,7 @@ void ImDrawList::AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, floa
} }
else else
{ {
AddCommand(ImDrawCmdType_DrawTriangleList, 6+6*2); ReserveVertices(6+6*2);
AddVtx(ImVec2(a.x+r,a.y), col); AddVtx(ImVec2(a.x+r,a.y), col);
AddVtx(ImVec2(b.x-r,a.y), col); AddVtx(ImVec2(b.x-r,a.y), col);
AddVtx(ImVec2(b.x-r,b.y), col); AddVtx(ImVec2(b.x-r,b.y), col);
@ -4748,7 +4764,7 @@ void ImDrawList::AddTriangleFilled(const ImVec2& a, const ImVec2& b, const ImVec
if ((col >> 24) == 0) if ((col >> 24) == 0)
return; return;
AddCommand(ImDrawCmdType_DrawTriangleList, 3); ReserveVertices(3);
AddVtx(a, col); AddVtx(a, col);
AddVtx(b, col); AddVtx(b, col);
AddVtx(c, col); AddVtx(c, col);
@ -4759,7 +4775,7 @@ void ImDrawList::AddCircle(const ImVec2& centre, float radius, ImU32 col, int nu
if ((col >> 24) == 0) if ((col >> 24) == 0)
return; return;
AddCommand(ImDrawCmdType_DrawTriangleList, num_segments*6); ReserveVertices(num_segments*6);
const float a_step = 2*PI/(float)num_segments; const float a_step = 2*PI/(float)num_segments;
float a0 = 0.0f; float a0 = 0.0f;
for (int i = 0; i < num_segments; i++) for (int i = 0; i < num_segments; i++)
@ -4775,7 +4791,7 @@ void ImDrawList::AddCircleFilled(const ImVec2& centre, float radius, ImU32 col,
if ((col >> 24) == 0) if ((col >> 24) == 0)
return; return;
AddCommand(ImDrawCmdType_DrawTriangleList, num_segments*3); ReserveVertices(num_segments*3);
const float a_step = 2*PI/(float)num_segments; const float a_step = 2*PI/(float)num_segments;
float a0 = 0.0f; float a0 = 0.0f;
for (int i = 0; i < num_segments; i++) for (int i = 0; i < num_segments; i++)
@ -4796,17 +4812,19 @@ 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);
int char_count = (int)(text_end - text_begin); // reserve vertices for worse case
int vtx_count_max = char_count * 6; const int char_count = (int)(text_end - text_begin);
size_t vtx_begin = vtx_buffer.size(); const int vtx_count_max = char_count * 6;
AddCommand(ImDrawCmdType_DrawTriangleList, vtx_count_max); const size_t vtx_begin = vtx_buffer.size();
ReserveVertices(vtx_count_max);
font->RenderText(font_size, pos, col, clip_rect_stack_.back(), text_begin, text_end, vtx_write_); font->RenderText(font_size, pos, col, clip_rect_stack.back(), text_begin, text_end, vtx_write);
vtx_buffer.resize(vtx_write_ - &vtx_buffer.front());
int vtx_count = (int)(vtx_buffer.size() - vtx_begin);
// give unused vertices
vtx_buffer.resize(vtx_write - &vtx_buffer.front());
const int vtx_count = (int)(vtx_buffer.size() - vtx_begin);
commands.back().vtx_count -= (vtx_count_max - vtx_count); commands.back().vtx_count -= (vtx_count_max - vtx_count);
vtx_write_ -= (vtx_count_max - vtx_count); vtx_write -= (vtx_count_max - vtx_count);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

20
imgui.h
View File

@ -499,19 +499,10 @@ struct ImGuiStorage
// Hold a series of drawing commands. The user provide a renderer for ImDrawList // Hold a series of drawing commands. The user provide a renderer for ImDrawList
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
enum ImDrawCmdType
{
ImDrawCmdType_DrawTriangleList,
ImDrawCmdType_PushClipRect,
ImDrawCmdType_PopClipRect,
};
// sizeof() == 4
struct ImDrawCmd struct ImDrawCmd
{ {
ImDrawCmdType cmd_type : 16; unsigned int vtx_count;
unsigned int vtx_count : 16; ImVec4 clip_rect;
ImDrawCmd(ImDrawCmdType _cmd_type = ImDrawCmdType_DrawTriangleList, unsigned int _vtx_count = 0) { cmd_type = _cmd_type; vtx_count = _vtx_count; }
}; };
#ifndef IMDRAW_TEX_UV_FOR_WHITE #ifndef IMDRAW_TEX_UV_FOR_WHITE
@ -532,16 +523,15 @@ struct ImDrawList
{ {
ImVector<ImDrawCmd> commands; ImVector<ImDrawCmd> commands;
ImVector<ImDrawVert> vtx_buffer; // each command consume ImDrawCmd::vtx_count of those ImVector<ImDrawVert> vtx_buffer; // each command consume ImDrawCmd::vtx_count of those
ImVector<ImVec4> clip_rect_buffer; // each PushClipRect command consume 1 of those ImVector<ImVec4> clip_rect_stack; // [internal] clip rect stack while building the command-list (so text command can perform clipping early on)
ImVector<ImVec4> clip_rect_stack_; // [internal] clip rect stack while building the command-list (so text command can perform clipping early on) ImDrawVert* vtx_write; // [internal] point within vtx_buffer after each add command (to avoid using the ImVector<> operators too much)
ImDrawVert* vtx_write_; // [internal] point within vtx_buffer after each add command. allow us to use less [] and .resize on the vector (often slow on windows/debug)
ImDrawList() { Clear(); } ImDrawList() { Clear(); }
void Clear(); void Clear();
void PushClipRect(const ImVec4& clip_rect); void PushClipRect(const ImVec4& clip_rect);
void PopClipRect(); void PopClipRect();
void AddCommand(ImDrawCmdType cmd_type, int vtx_count); void ReserveVertices(unsigned int vtx_count);
void AddVtx(const ImVec2& pos, ImU32 col); void AddVtx(const ImVec2& pos, ImU32 col);
void AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col); void AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col);