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

imDrawList: PathArcTo() returns when passed zero radius.

Browse Source
This commit is contained in:
omar 2017-08-28 16:02:25 +08:00
parent e1d81f4dc5
commit 808d631e35
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
imgui_draw.cpp
View File

@ -694,27 +694,26 @@ void ImDrawList::PathArcToFast(const ImVec2& centre, float radius, int a_min_of_
circle_vtx_builds = true; circle_vtx_builds = true;
} }
if (a_min_of_12 > a_max_of_12) if (radius == 0.0f || a_min_of_12 > a_max_of_12)
return;
if (radius == 0.0f)
{ {
_Path.push_back(centre); _Path.push_back(centre);
return;
} }
else _Path.reserve(_Path.Size + (a_max_of_12 - a_min_of_12 + 1));
for (int a = a_min_of_12; a <= a_max_of_12; a++)
{ {
_Path.reserve(_Path.Size + (a_max_of_12 - a_min_of_12 + 1)); const ImVec2& c = circle_vtx[a % circle_vtx_count];
for (int a = a_min_of_12; a <= a_max_of_12; a++) _Path.push_back(ImVec2(centre.x + c.x * radius, centre.y + c.y * radius));
{
const ImVec2& c = circle_vtx[a % circle_vtx_count];
_Path.push_back(ImVec2(centre.x + c.x * radius, centre.y + c.y * radius));
}
} }
} }
void ImDrawList::PathArcTo(const ImVec2& centre, float radius, float amin, float amax, int num_segments) void ImDrawList::PathArcTo(const ImVec2& centre, float radius, float amin, float amax, int num_segments)
{ {
if (radius == 0.0f) if (radius == 0.0f)
{
_Path.push_back(centre); _Path.push_back(centre);
return;
}
_Path.reserve(_Path.Size + (num_segments + 1)); _Path.reserve(_Path.Size + (num_segments + 1));
for (int i = 0; i <= num_segments; i++) for (int i = 0; i <= num_segments; i++)
{ {
@ -786,9 +785,9 @@ void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, int
if (rounding <= 0.0f || rounding_corners == 0) if (rounding <= 0.0f || rounding_corners == 0)
{ {
PathLineTo(a); PathLineTo(a);
PathLineTo(ImVec2(b.x,a.y)); PathLineTo(ImVec2(b.x, a.y));
PathLineTo(b); PathLineTo(b);
PathLineTo(ImVec2(a.x,b.y)); PathLineTo(ImVec2(a.x, b.y));
} }
else else
{ {