Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-23 12:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

AA branch: fixed circles.

Browse Source
This commit is contained in:
ocornut 2015-04-09 21:51:33 +01:00
parent 14ddb81f7a
commit 431e391ccd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
imgui.cpp
View File

@ -8,7 +8,6 @@
// TODO // TODO
// - settle on where to the 0.5f offset for lines // - settle on where to the 0.5f offset for lines
// - checkbox, slider grabs are not centered properly if you enable border (relate to point above) // - checkbox, slider grabs are not centered properly if you enable border (relate to point above)
// - fix circles
// - thick lines? recently been added to the ImDrawList API as a convenience. // - thick lines? recently been added to the ImDrawList API as a convenience.
/* /*
@ -7911,6 +7910,7 @@ void ImDrawList::ArcToFast(const ImVec2& centre, float radius, int amin, int ama
} }
else else
{ {
path.reserve(path.size() + (amax - amin + 1));
for (int a = amin; a <= amax; a++) for (int a = amin; a <= amax; a++)
path.push_back(centre + circle_vtx[a % circle_vtx_count] * radius); path.push_back(centre + circle_vtx[a % circle_vtx_count] * radius);
} }
@ -7922,6 +7922,7 @@ void ImDrawList::ArcTo(const ImVec2& centre, float radius, float amin, float ama
{ {
path.push_back(centre); path.push_back(centre);
} }
path.reserve(path.size() + (num_segments + 1));
for (int i = 0; i <= num_segments; i++) for (int i = 0; i <= num_segments; i++)
{ {
const float a = amin + ((float)i / (float)num_segments) * (amax - amin); const float a = amin + ((float)i / (float)num_segments) * (amax - amin);
@ -8009,7 +8010,9 @@ void ImDrawList::AddCircle(const ImVec2& centre, float radius, ImU32 col, int nu
{ {
if ((col >> 24) == 0) if ((col >> 24) == 0)
return; return;
ArcTo(centre, radius, 0.0f, PI*2, num_segments);
const float a_max = PI*2.0f * ((float)num_segments - 1.0f) / (float)num_segments;
ArcTo(centre, radius, 0.0f, a_max, num_segments);
Stroke(col, true); Stroke(col, true);
} }
@ -8017,7 +8020,9 @@ void ImDrawList::AddCircleFilled(const ImVec2& centre, float radius, ImU32 col,
{ {
if ((col >> 24) == 0) if ((col >> 24) == 0)
return; return;
ArcTo(centre, radius, 0.0f, PI*2, num_segments);
const float a_max = PI*2.0f * ((float)num_segments - 1.0f) / (float)num_segments;
ArcTo(centre, radius, 0.0f, a_max, num_segments);
Fill(col); Fill(col);
} }