gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-10-09 23:57:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'sergeyn-pr_branch2'

Browse Source
This commit is contained in:
Evan Pezent 2020-05-14 07:11:52 -05:00
parent d853971668 17dba653a9
commit 83885f4d8b
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
implot.cpp
View File

@ -2090,39 +2090,34 @@ inline void RenderLineStrip(Transformer transformer, ImDrawList& DrawList, Gette
if (i_start >= count ) i_start -= count; if (i_start >= count ) i_start -= count;
int i_end = offset + count; int i_end = offset + count;
if (i_end >= count) i_end -= count; if (i_end >= count) i_end -= count;
const int segments = count - 1;
ImVec2 p1 = transformer(getter(offset));
if (HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_AntiAliased)) {
for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) {
ImVec2 p2 = transformer(getter(i1));
const int segments = count - 1; if (!cull || gp.BB_Grid.Overlaps(ImRect(ImMin(p1,p2), ImMax(p1,p2))))
ImVec2 p1 = transformer(getter(offset)); RenderLineAA(DrawList, p1, p2, line_weight, col_line);
bool test1 = !cull || gp.BB_Grid.Contains(p1); p1 = p2;
if (HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_AntiAliased)) { }
for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) }
{ else {
ImVec2 p2 = transformer(getter(i1)); const ImVec2 uv = DrawList._Data->TexUvWhitePixel;
bool test2 = !cull || gp.BB_Grid.Contains(p2); DrawList.PrimReserve(segments * 6, segments * 4);
if (test1 | test2) int segments_culled = 0;
RenderLineAA(DrawList, p1, p2, line_weight, col_line); for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) {
p1 = p2; ImVec2 p2 = transformer(getter(i1));
test1 = test2;
} if (!cull || gp.BB_Grid.Overlaps(ImRect(ImMin(p1, p2), ImMax(p1, p2))))
} RenderLine(DrawList, p1, p2, line_weight, col_line, uv);
else { else
const ImVec2 uv = DrawList._Data->TexUvWhitePixel; segments_culled++;
DrawList.PrimReserve(segments * 6, segments * 4); p1 = p2;
int segments_culled = 0; }
for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) if (segments_culled > 0)
{ DrawList.PrimUnreserve(segments_culled * 6, segments_culled * 4);
ImVec2 p2 = transformer(getter(i1)); }
bool test2 = !cull || gp.BB_Grid.Contains(p2);
if (test1 | test2)
RenderLine(DrawList, p1, p2, line_weight, col_line, uv);
else
segments_culled++;
p1 = p2;
test1 = test2;
}
if (segments_culled > 0)
DrawList.PrimUnreserve(segments_culled * 6, segments_culled * 4);
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2572,15 +2567,15 @@ inline void PlotDigitalEx(const char* label_id, Getter getter, int count, int of
if (gp.Style.Colors[ImPlotCol_Line].w != -1) if (gp.Style.Colors[ImPlotCol_Line].w != -1)
item->Color = gp.Style.Colors[ImPlotCol_Line]; item->Color = gp.Style.Colors[ImPlotCol_Line];
// find data extents // find data extents
if (gp.FitThisFrame) { if (gp.FitThisFrame) {
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
ImVec2 p = getter(i); ImVec2 p = getter(i);
FitPoint(p); FitPoint(ImVec2(p.x, 0));
} }
} }
ImGui::PushClipRect(gp.BB_Grid.Min, gp.BB_Grid.Max, true); ImGui::PushClipRect(gp.BB_Grid.Min, gp.BB_Grid.Max, true);
bool cull = HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_CullData); bool cull = HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_CullData);