From 09ef003a81a44cdad2750daee8b32e8c324b3bc0 Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Sun, 7 Jun 2020 13:13:11 -0500 Subject: [PATCH] clean up primitive rendering work, test new offset/stride and improve demo --- implot.cpp | 177 +++++++++++++++++++++++------------------------- implot_demo.cpp | 41 ++++++++--- 2 files changed, 117 insertions(+), 101 deletions(-) diff --git a/implot.cpp b/implot.cpp index ee26a89..5567c1a 100644 --- a/implot.cpp +++ b/implot.cpp @@ -514,7 +514,6 @@ inline void FitPoint(const ImPlotPoint& p) { inline void UpdateTransformCache() { // get pixels for transforms - for (int i = 0; i < MAX_Y_AXES; i++) { gp.PixelRange[i] = ImRect(HasFlag(gp.CurrentPlot->XAxis.Flags, ImPlotAxisFlags_Invert) ? gp.BB_Plot.Max.x : gp.BB_Plot.Min.x, HasFlag(gp.CurrentPlot->YAxis[i].Flags, ImPlotAxisFlags_Invert) ? gp.BB_Plot.Min.y : gp.BB_Plot.Max.y, @@ -577,60 +576,58 @@ ImVec2 PlotToPixels(const ImPlotPoint& plt, int y_axis) { // Transformer functors struct TransformerLinLin { - TransformerLinLin(int y_axis_in) : y_axis(y_axis_in) {} + TransformerLinLin(int y_axis) : YAxis(y_axis) {} inline ImVec2 operator()(const ImPlotPoint& plt) { return (*this)(plt.x, plt.y); } inline ImVec2 operator()(double x, double y) { - return ImVec2( (float)(gp.PixelRange[y_axis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), - (float)(gp.PixelRange[y_axis].Min.y + gp.My[y_axis] * (y - gp.CurrentPlot->YAxis[y_axis].Range.Min)) ); + return ImVec2( (float)(gp.PixelRange[YAxis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), + (float)(gp.PixelRange[YAxis].Min.y + gp.My[YAxis] * (y - gp.CurrentPlot->YAxis[YAxis].Range.Min)) ); } - int y_axis; + int YAxis; }; struct TransformerLogLin { - TransformerLogLin(int y_axis_in) : y_axis(y_axis_in) {} + TransformerLogLin(int y_axis) : YAxis(y_axis) {} inline ImVec2 operator()(const ImPlotPoint& plt) { return (*this)(plt.x, plt.y); } inline ImVec2 operator()(double x, double y) { double t = ImLog10(x / gp.CurrentPlot->XAxis.Range.Min) / gp.LogDenX; x = ImLerp(gp.CurrentPlot->XAxis.Range.Min, gp.CurrentPlot->XAxis.Range.Max, (float)t); - return ImVec2( (float)(gp.PixelRange[y_axis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), - (float)(gp.PixelRange[y_axis].Min.y + gp.My[y_axis] * (y - gp.CurrentPlot->YAxis[y_axis].Range.Min)) ); + return ImVec2( (float)(gp.PixelRange[YAxis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), + (float)(gp.PixelRange[YAxis].Min.y + gp.My[YAxis] * (y - gp.CurrentPlot->YAxis[YAxis].Range.Min)) ); } - int y_axis; + int YAxis; }; struct TransformerLinLog { - TransformerLinLog(int y_axis_in) : y_axis(y_axis_in) {} + TransformerLinLog(int y_axis) : YAxis(y_axis) {} inline ImVec2 operator()(const ImPlotPoint& plt) { return (*this)(plt.x, plt.y); } inline ImVec2 operator()(double x, double y) { - double t = ImLog10(y / gp.CurrentPlot->YAxis[y_axis].Range.Min) / gp.LogDenY[y_axis]; - y = ImLerp(gp.CurrentPlot->YAxis[y_axis].Range.Min, gp.CurrentPlot->YAxis[y_axis].Range.Max, (float)t); - return ImVec2( (float)(gp.PixelRange[y_axis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), - (float)(gp.PixelRange[y_axis].Min.y + gp.My[y_axis] * (y - gp.CurrentPlot->YAxis[y_axis].Range.Min)) ); + double t = ImLog10(y / gp.CurrentPlot->YAxis[YAxis].Range.Min) / gp.LogDenY[YAxis]; + y = ImLerp(gp.CurrentPlot->YAxis[YAxis].Range.Min, gp.CurrentPlot->YAxis[YAxis].Range.Max, (float)t); + return ImVec2( (float)(gp.PixelRange[YAxis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), + (float)(gp.PixelRange[YAxis].Min.y + gp.My[YAxis] * (y - gp.CurrentPlot->YAxis[YAxis].Range.Min)) ); } - int y_axis; + int YAxis; }; struct TransformerLogLog { - TransformerLogLog(int y_axis_in) : y_axis(y_axis_in) { - - } + TransformerLogLog(int y_axis) : YAxis(y_axis) {} inline ImVec2 operator()(const ImPlotPoint& plt) { return (*this)(plt.x, plt.y); } inline ImVec2 operator()(double x, double y) { double t = ImLog10(x / gp.CurrentPlot->XAxis.Range.Min) / gp.LogDenX; x = ImLerp(gp.CurrentPlot->XAxis.Range.Min, gp.CurrentPlot->XAxis.Range.Max, (float)t); - t = ImLog10(y / gp.CurrentPlot->YAxis[y_axis].Range.Min) / gp.LogDenY[y_axis]; - y = ImLerp(gp.CurrentPlot->YAxis[y_axis].Range.Min, gp.CurrentPlot->YAxis[y_axis].Range.Max, (float)t); - return ImVec2( (float)(gp.PixelRange[y_axis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), - (float)(gp.PixelRange[y_axis].Min.y + gp.My[y_axis] * (y - gp.CurrentPlot->YAxis[y_axis].Range.Min)) ); + t = ImLog10(y / gp.CurrentPlot->YAxis[YAxis].Range.Min) / gp.LogDenY[YAxis]; + y = ImLerp(gp.CurrentPlot->YAxis[YAxis].Range.Min, gp.CurrentPlot->YAxis[YAxis].Range.Max, (float)t); + return ImVec2( (float)(gp.PixelRange[YAxis].Min.x + gp.Mx * (x - gp.CurrentPlot->XAxis.Range.Min)), + (float)(gp.PixelRange[YAxis].Min.y + gp.My[YAxis] * (y - gp.CurrentPlot->YAxis[YAxis].Range.Min)) ); } - int y_axis; + int YAxis; }; //----------------------------------------------------------------------------- @@ -731,6 +728,19 @@ inline void AddDefaultTicks(const ImPlotRange& range, int nMajor, int nMinor, bo } } +inline void AddCustomTicks(const double* values, const char** labels, int n, ImVector& ticks, ImGuiTextBuffer& buffer) { + for (int i = 0; i < n; ++i) { + ImPlotTick tick(values[i],false); + tick.TextOffset = buffer.size(); + if (labels != NULL) { + buffer.append(labels[i], labels[i] + strlen(labels[i]) + 1); + tick.Size = ImGui::CalcTextSize(labels[i]); + tick.Labeled = true; + } + ticks.push_back(tick); + } +} + inline void LabelTicks(ImVector &ticks, bool scientific, ImGuiTextBuffer& buffer) { char temp[32]; for (int t = 0; t < ticks.Size; t++) { @@ -748,19 +758,6 @@ inline void LabelTicks(ImVector &ticks, bool scientific, ImGuiTextBu } } -inline void AddCustomTicks(const double* values, const char** labels, int n, ImVector& ticks, ImGuiTextBuffer& buffer) { - for (int i = 0; i < n; ++i) { - ImPlotTick tick(values[i],false); - tick.TextOffset = buffer.size(); - if (labels != NULL) { - buffer.append(labels[i], labels[i] + strlen(labels[i]) + 1); - tick.Size = ImGui::CalcTextSize(labels[i]); - tick.Labeled = true; - } - ticks.push_back(tick); - } -} - inline float MaxTickLabelWidth(ImVector& ticks) { float w = 0; for (int i = 0; i < ticks.Size; ++i) @@ -2356,10 +2353,10 @@ inline int PosMod(int l, int r) { return (l % r + r) % r; } -template -inline T StrideIndex(const T* data, int idx, int stride) { - return *(const T*)(const void*)((const unsigned char*)data + (size_t)idx * stride); -} +// template +// inline T StrideIndex(const T* data, int idx, int stride) { +// return *(const T*)(const void*)((const unsigned char*)data + (size_t)idx * stride); +// } template inline T OffsetAndStride(const T* data, int idx, int count, int offset, int stride) { @@ -2641,21 +2638,21 @@ void PlotScatter(const char* label_id, ImPlotPoint (*getter)(void* data, int idx template struct GetterBarV { - const T* Ys; T XShift; int Stride; - GetterBarV(const T* ys, T xshift, int stride) { Ys = ys; XShift = xshift; Stride = stride; } - inline ImPlotPoint operator()(int idx) { return ImPlotPoint((T)idx + XShift, StrideIndex(Ys, idx, Stride)); } + const T* Ys; T XShift; int Count; int Offset; int Stride; + GetterBarV(const T* ys, T xshift, int count, int offset, int stride) { Ys = ys; XShift = xshift; Count = count; Offset = offset; Stride = stride; } + inline ImPlotPoint operator()(int idx) { return ImPlotPoint((T)idx + XShift, OffsetAndStride(Ys, idx, Count, Offset, Stride)); } }; template struct GetterBarH { - const T* Xs; T YShift; int Stride; - GetterBarH(const T* xs, T yshift, int stride) { Xs = xs; YShift = yshift; Stride = stride; } - inline ImPlotPoint operator()(int idx) { return ImPlotPoint(StrideIndex(Xs, idx, Stride), (T)idx + YShift); } + const T* Xs; T YShift; int Count; int Offset; int Stride; + GetterBarH(const T* xs, T yshift, int count, int offset, int stride) { Xs = xs; YShift = yshift; Count = count; Offset = offset; Stride = stride; } + inline ImPlotPoint operator()(int idx) { return ImPlotPoint(OffsetAndStride(Xs, idx, Count, Offset, Stride), (T)idx + YShift); } }; template -void PlotBarsEx(const char* label_id, Getter getter, int count, TWidth width, int offset) { +void PlotBarsEx(const char* label_id, Getter getter, TWidth width) { IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "PlotBars() needs to be called between BeginPlot() and EndPlot()!"); @@ -2683,17 +2680,15 @@ void PlotBarsEx(const char* label_id, Getter getter, int count, TWidth width, in // find data extents if (gp.FitThisFrame) { - for (int i = 0; i < count; ++i) { + for (int i = 0; i < getter.Count; ++i) { ImPlotPoint p = getter(i); FitPoint(ImPlotPoint(p.x - half_width, p.y)); FitPoint(ImPlotPoint(p.x + half_width, 0)); } } - int idx = offset; - for (int i = 0; i < count; ++i) { - ImPlotPoint p = getter(idx); - idx = (idx + 1) % count; + for (int i = 0; i < getter.Count; ++i) { + ImPlotPoint p = getter(i); if (p.y == 0) continue; ImVec2 a = PlotToPixels(p.x - half_width, p.y); @@ -2710,26 +2705,26 @@ void PlotBarsEx(const char* label_id, Getter getter, int count, TWidth width, in // float void PlotBars(const char* label_id, const float* values, int count, float width, float shift, int offset, int stride) { - GetterBarV getter(values,shift,stride); - PlotBarsEx(label_id, getter, count, width, offset); + GetterBarV getter(values,shift,count,offset,stride); + PlotBarsEx(label_id, getter, width); } void PlotBars(const char* label_id, const float* xs, const float* ys, int count, float width, int offset, int stride) { GetterXsYs getter(xs,ys,count,offset,stride); - PlotBarsEx(label_id, getter, count, width, offset); + PlotBarsEx(label_id, getter, width); } //----------------------------------------------------------------------------- // double void PlotBars(const char* label_id, const double* values, int count, double width, double shift, int offset, int stride) { - GetterBarV getter(values,shift,stride); - PlotBarsEx(label_id, getter, count, width, offset); + GetterBarV getter(values,shift,count,offset,stride); + PlotBarsEx(label_id, getter, width); } void PlotBars(const char* label_id, const double* xs, const double* ys, int count, double width, int offset, int stride) { GetterXsYs getter(xs,ys,count,offset,stride); - PlotBarsEx(label_id, getter, count, width, offset); + PlotBarsEx(label_id, getter, width); } //----------------------------------------------------------------------------- @@ -2737,7 +2732,7 @@ void PlotBars(const char* label_id, const double* xs, const double* ys, int coun void PlotBars(const char* label_id, ImPlotPoint (*getter_func)(void* data, int idx), void* data, int count, double width, int offset) { GetterFuncPtrImPlotPoint getter(getter_func, data, count, offset); - PlotBarsEx(label_id, getter, count, width, offset); + PlotBarsEx(label_id, getter, width); } //----------------------------------------------------------------------------- @@ -2747,7 +2742,7 @@ void PlotBars(const char* label_id, ImPlotPoint (*getter_func)(void* data, int i // TODO: Migrate to RenderPrimitives template -void PlotBarsHEx(const char* label_id, Getter getter, int count, THeight height, int offset) { +void PlotBarsHEx(const char* label_id, Getter getter, THeight height) { IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "PlotBarsH() needs to be called between BeginPlot() and EndPlot()!"); @@ -2775,17 +2770,15 @@ void PlotBarsHEx(const char* label_id, Getter getter, int count, THeight height, // find data extents if (gp.FitThisFrame) { - for (int i = 0; i < count; ++i) { + for (int i = 0; i < getter.Count; ++i) { ImPlotPoint p = getter(i); FitPoint(ImPlotPoint(0, p.y - half_height)); FitPoint(ImPlotPoint(p.x, p.y + half_height)); } } - int idx = offset; - for (int i = 0; i < count; ++i) { - ImPlotPoint p = getter(idx); - idx = (idx + 1) % count; + for (int i = 0; i < getter.Count; ++i) { + ImPlotPoint p = getter(i); if (p.x == 0) continue; ImVec2 a = PlotToPixels(0, p.y - half_height); @@ -2802,26 +2795,26 @@ void PlotBarsHEx(const char* label_id, Getter getter, int count, THeight height, // float void PlotBarsH(const char* label_id, const float* values, int count, float height, float shift, int offset, int stride) { - GetterBarH getter(values,shift,stride); - PlotBarsHEx(label_id, getter, count, height, offset); + GetterBarH getter(values,shift,count,offset,stride); + PlotBarsHEx(label_id, getter, height); } void PlotBarsH(const char* label_id, const float* xs, const float* ys, int count, float height, int offset, int stride) { GetterXsYs getter(xs,ys,count,offset,stride); - PlotBarsHEx(label_id, getter, count, height, offset); + PlotBarsHEx(label_id, getter, height); } //----------------------------------------------------------------------------- // double void PlotBarsH(const char* label_id, const double* values, int count, double height, double shift, int offset, int stride) { - GetterBarH getter(values,shift,stride); - PlotBarsHEx(label_id, getter, count, height, offset); + GetterBarH getter(values,shift,count,offset,stride); + PlotBarsHEx(label_id, getter, height); } void PlotBarsH(const char* label_id, const double* xs, const double* ys, int count, double height, int offset, int stride) { GetterXsYs getter(xs,ys,count,offset,stride); - PlotBarsHEx(label_id, getter, count, height, offset); + PlotBarsHEx(label_id, getter, height); } //----------------------------------------------------------------------------- @@ -2829,7 +2822,7 @@ void PlotBarsH(const char* label_id, const double* xs, const double* ys, int cou void PlotBarsH(const char* label_id, ImPlotPoint (*getter_func)(void* data, int idx), void* data, int count, double height, int offset) { GetterFuncPtrImPlotPoint getter(getter_func, data, count, offset); - PlotBarsHEx(label_id, getter, count, height, offset); + PlotBarsHEx(label_id, getter, height); } //----------------------------------------------------------------------------- @@ -2845,20 +2838,20 @@ struct ImPlotPointError { template struct GetterError { - const T* Xs; const T* Ys; const T* Neg; const T* Pos; int Stride; - GetterError(const T* xs, const T* ys, const T* neg, const T* pos, int stride) { - Xs = xs; Ys = ys; Neg = neg; Pos = pos; Stride = stride; + const T* Xs; const T* Ys; const T* Neg; const T* Pos; int Count; int Offset; int Stride; + GetterError(const T* xs, const T* ys, const T* neg, const T* pos, int count, int offset, int stride) { + Xs = xs; Ys = ys; Neg = neg; Pos = pos; Count = count; Offset = offset; Stride = stride; } ImPlotPointError operator()(int idx) { - return ImPlotPointError(StrideIndex(Xs, idx, Stride), - StrideIndex(Ys, idx, Stride), - StrideIndex(Neg, idx, Stride), - StrideIndex(Pos, idx, Stride)); + return ImPlotPointError(OffsetAndStride(Xs, idx, Count, Offset, Stride), + OffsetAndStride(Ys, idx, Count, Offset, Stride), + OffsetAndStride(Neg, idx, Count, Offset, Stride), + OffsetAndStride(Pos, idx, Count, Offset, Stride)); } }; template -void PlotErrorBarsEx(const char* label_id, Getter getter, int count, int offset) { +void PlotErrorBarsEx(const char* label_id, Getter getter) { IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "PlotErrorBars() needs to be called between BeginPlot() and EndPlot()!"); ImGuiID id = ImGui::GetID(label_id); @@ -2877,17 +2870,15 @@ void PlotErrorBarsEx(const char* label_id, Getter getter, int count, int offset) // find data extents if (gp.FitThisFrame) { - for (int i = 0; i < count; ++i) { + for (int i = 0; i < getter.Count; ++i) { ImPlotPointError e = getter(i); FitPoint(ImPlotPoint(e.x , e.y - e.neg)); FitPoint(ImPlotPoint(e.x , e.y + e.pos )); } } - int idx = offset; - for (int i = 0; i < count; ++i) { - ImPlotPointError e = getter(idx); - idx = (idx + 1) % count; + for (int i = 0; i < getter.Count; ++i) { + ImPlotPointError e = getter(i); ImVec2 p1 = PlotToPixels(e.x, e.y - e.neg); ImVec2 p2 = PlotToPixels(e.x, e.y + e.pos); DrawList.AddLine(p1,p2,col, gp.Style.ErrorBarWeight); @@ -2903,26 +2894,26 @@ void PlotErrorBarsEx(const char* label_id, Getter getter, int count, int offset) // float void PlotErrorBars(const char* label_id, const float* xs, const float* ys, const float* err, int count, int offset, int stride) { - GetterError getter(xs, ys, err, err, stride); - PlotErrorBarsEx(label_id, getter, count, offset); + GetterError getter(xs, ys, err, err, count, offset, stride); + PlotErrorBarsEx(label_id, getter); } void PlotErrorBars(const char* label_id, const float* xs, const float* ys, const float* neg, const float* pos, int count, int offset, int stride) { - GetterError getter(xs, ys, neg, pos, stride); - PlotErrorBarsEx(label_id, getter, count, offset); + GetterError getter(xs, ys, neg, pos, count, offset, stride); + PlotErrorBarsEx(label_id, getter); } //----------------------------------------------------------------------------- // double void PlotErrorBars(const char* label_id, const double* xs, const double* ys, const double* err, int count, int offset, int stride) { - GetterError getter(xs, ys, err, err, stride); - PlotErrorBarsEx(label_id, getter, count, offset); + GetterError getter(xs, ys, err, err, count, offset, stride); + PlotErrorBarsEx(label_id, getter); } void PlotErrorBars(const char* label_id, const double* xs, const double* ys, const double* neg, const double* pos, int count, int offset, int stride) { - GetterError getter(xs, ys, neg, pos, stride); - PlotErrorBarsEx(label_id, getter, count, offset); + GetterError getter(xs, ys, neg, pos, count, offset, stride); + PlotErrorBarsEx(label_id, getter); } //----------------------------------------------------------------------------- diff --git a/implot_demo.cpp b/implot_demo.cpp index 3231854..4256b5e 100644 --- a/implot_demo.cpp +++ b/implot_demo.cpp @@ -160,6 +160,12 @@ void ShowDemoWindow(bool* p_open) { ImGui::Unindent(); ImGui::BulletText("Double right click to open the plot context menu."); ImGui::BulletText("Click legend label icons to show/hide plot items."); + ImGui::BulletText("IMPORTANT: By default, anti-aliased lines are turned OFF."); + ImGui::Indent(); + ImGui::BulletText("Software AA can be enabled per plot with ImPlotFlags_AntiAliased."); + ImGui::BulletText("AA for demo plots can be enabled from the plot's context menu."); + ImGui::BulletText("If allowable, you are better off using hardware AA (e.g. MSAA)."); + ImGui::Unindent(); #ifdef IMPLOT_DEMO_USE_DOUBLE ImGui::BulletText("The demo data precision is: double"); #else @@ -831,18 +837,37 @@ void ShowDemoWindow(bool* p_open) { } } //------------------------------------------------------------------------- - if (ImGui::CollapsingHeader("Offset Data")) { - t_float xs[50], ys[50]; - for (int i = 0; i < 50; ++i) { - xs[i] = 0.5f + 0.4f * Cos(i/50.f * 6.28f); - ys[i] = 0.5f + 0.4f * Sin(i/50.f * 6.28f); + if (ImGui::CollapsingHeader("Offset and Stride")) { + static const int k_circles = 11; + static const int k_points_per = 50; + static const int k_size = 2 * k_points_per * k_circles; + static t_float interleaved_data[k_size]; + for (int p = 0; p < k_points_per; ++p) { + for (int c = 0; c < k_circles; ++c) { + t_float r = (t_float)c / (k_circles - 1) * 0.2f + 0.2f; + interleaved_data[p*2*k_circles + 2*c + 0] = 0.5f + r * Cos((t_float)p/k_points_per * 6.28f); + interleaved_data[p*2*k_circles + 2*c + 1] = 0.5f + r * Sin((t_float)p/k_points_per * 6.28f); + } } static int offset = 0; - ImGui::SliderInt("Offset", &offset, -100, 100); - if (ImPlot::BeginPlot("##offset")) { - ImPlot::PlotLine("circle", xs, ys, 50, offset); + ImGui::BulletText("Offsetting is useful for realtime plots (see above) and circular buffers."); + ImGui::BulletText("Striding is useful for interleaved data (e.g. audio) or plotting structs."); + ImGui::BulletText("Here, all circle data is stored in a single interleaved buffer:"); + ImGui::BulletText("[c0.x0 c0.y0 ... cn.x0 cn.y0 c0.x1 c0.y1 ... cn.x1 cn.y1 ... cn.xm cn.ym]"); + ImGui::BulletText("The offset value indicates which circle point index is considered the first."); + ImGui::BulletText("Offsets can be negative and/or larger than the actual data count."); + ImGui::SliderInt("Offset", &offset, -2*k_points_per, 2*k_points_per); + if (ImPlot::BeginPlot("##strideoffset")) { + ImPlot::SetColormap(ImPlotColormap_Jet); + char buff[16]; + for (int c = 0; c < k_circles; ++c) { + sprintf(buff, "Circle %d", c); + ImPlot::PlotLine(buff, &interleaved_data[c*2 + 0], &interleaved_data[c*2 + 1], k_points_per, offset, 2*k_circles*sizeof(t_float)); + } ImPlot::EndPlot(); + ImPlot::SetColormap(ImPlotColormap_Default); } + // offset++; uncomment for animation! } //------------------------------------------------------------------------- if (ImGui::CollapsingHeader("Custom Ticks")) {