mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ImDrawList: bits of renaming.

This commit is contained in:
ocornut 2015-04-09 21:00:45 +01:00
parent 4fa3eee84e
commit 500a8a0e02
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
imgui.cpp
View File

@ -7804,9 +7804,9 @@ void ImDrawList::AddArcFast(const ImVec2& center, float radius, ImU32 col, int a
for (int a0 = a_min; a0 < a_max; a0++) for (int a0 = a_min; a0 < a_max; a0++)
{ {
int a1 = (a0 + 1 == SAMPLES) ? 0 : a0 + 1; int a1 = (a0 + 1 == SAMPLES) ? 0 : a0 + 1;
AddVtx(center + circle_vtx[a0] * radius, uv, col); PrimVtx(center + circle_vtx[a0] * radius, uv, col);
AddVtx(center + circle_vtx[a1] * radius, uv, col); PrimVtx(center + circle_vtx[a1] * radius, uv, col);
AddVtx(center + third_point_offset, uv, col); PrimVtx(center + third_point_offset, uv, col);
} }
} }
else else
@ -7925,9 +7925,9 @@ void ImDrawList::AddCircleFilled(const ImVec2& centre, float radius, ImU32 col,
for (int i = 0; i < num_segments; i++) for (int i = 0; i < num_segments; i++)
{ {
const float a1 = (i + 1) == num_segments ? 0.0f : a0 + a_step; const float a1 = (i + 1) == num_segments ? 0.0f : a0 + a_step;
AddVtx(centre + ImVec2(cosf(a0), sinf(a0))*radius, uv, col); PrimVtx(centre + ImVec2(cosf(a0), sinf(a0))*radius, uv, col);
AddVtx(centre + ImVec2(cosf(a1), sinf(a1))*radius, uv, col); PrimVtx(centre + ImVec2(cosf(a1), sinf(a1))*radius, uv, col);
AddVtx(centre, uv, col); PrimVtx(centre, uv, col);
a0 = a1; a0 = a1;
} }
} }

2
imgui.h
View File

@ -930,7 +930,7 @@ struct ImDrawList
IMGUI_API void PrimLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f); IMGUI_API void PrimLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f);
IMGUI_API void UpdateClipRect(); IMGUI_API void UpdateClipRect();
IMGUI_API void UpdateTextureID(); IMGUI_API void UpdateTextureID();
inline IMGUI_API void AddVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col) { vtx_write->pos = pos; vtx_write->uv = uv; vtx_write->col = col; vtx_write++; } IMGUI_API void PrimVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col) { vtx_write->pos = pos; vtx_write->uv = uv; vtx_write->col = col; vtx_write++; }
}; };
// Load and rasterize multiple TTF fonts into a same texture. // Load and rasterize multiple TTF fonts into a same texture.