From 7679a5a9387217e72ce6e64393d41b56a4817473 Mon Sep 17 00:00:00 2001 From: mitchellhansen Date: Mon, 26 Feb 2018 23:12:00 -0800 Subject: [PATCH] modifying multilines to fit what I want it to do --- include/imgui/imgui-multilines.hpp | 390 +++++++++++++++-------------- include/util.hpp | 22 +- 2 files changed, 224 insertions(+), 188 deletions(-) diff --git a/include/imgui/imgui-multilines.hpp b/include/imgui/imgui-multilines.hpp index 7e5e993..cb92723 100644 --- a/include/imgui/imgui-multilines.hpp +++ b/include/imgui/imgui-multilines.hpp @@ -1,187 +1,203 @@ -// -//#pragma once -//#include "imgui.h" -//#include "imgui_internal.h" -// -// -// -//namespace ImGui { -// -// static ImU32 InvertColorU32(ImU32 in) -// { -// ImVec4 in4 = ColorConvertU32ToFloat4(in); -// in4.x = 1.f - in4.x; -// in4.y = 1.f - in4.y; -// in4.z = 1.f - in4.z; -// return GetColorU32(in4); -// } -// -// static void PlotMultiEx( -// ImGuiPlotType plot_type, -// const char* label, -// int num_datas, -// const char** names, -// const ImColor* colors, -// float(*getter)(const void* data, int idx), -// const void * const * datas, -// int values_count, -// float scale_min, -// float scale_max, -// ImVec2 graph_size) -// { -// const int values_offset = 0; -// -// ImGuiWindow* window = GetCurrentWindow(); -// if (window->SkipItems) -// return; -// -// ImGuiContext& g = *GImGui; -// const ImGuiStyle& style = g.Style; -// -// const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true); -// if (graph_size.x == 0.0f) -// graph_size.x = CalcItemWidth(); -// if (graph_size.y == 0.0f) -// graph_size.y = label_size.y + (style.FramePadding.y * 2); -// -// const ImRect frame_bb();//window->DC.CursorPos, window->DC.CursorPos + ImVec2(graph_size.x, graph_size.y)); -// const ImRect inner_bb();//frame_bb.Min + style.FramePadding, frame_bb.Max - style.FramePadding); -// const ImRect total_bb();//frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0)); -// ItemSize(total_bb, style.FramePadding.y); -// if (!ItemAdd(total_bb, NULL)) -// return; -// -// // Determine scale from values if not specified -// if (scale_min == FLT_MAX || scale_max == FLT_MAX) -// { -// float v_min = FLT_MAX; -// float v_max = -FLT_MAX; -// for (int data_idx = 0; data_idx < num_datas; ++data_idx) -// { -// for (int i = 0; i < values_count; i++) -// { -// const float v = getter(datas[data_idx], i); -// v_min = ImMin(v_min, v); -// v_max = ImMax(v_max, v); -// } -// } -// if (scale_min == FLT_MAX) -// scale_min = v_min; -// if (scale_max == FLT_MAX) -// scale_max = v_max; -// } -// -// RenderFrame(frame_bb.Min, frame_bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); -// -// int res_w = ImMin((int) graph_size.x, values_count) + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0); -// int item_count = values_count + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0); -// -// // Tooltip on hover -// int v_hovered = -1; -// if (IsHovered(inner_bb, 0)) -// { -// const float t = ImClamp((g.IO.MousePos.x - inner_bb.Min.x) / (inner_bb.Max.x - inner_bb.Min.x), 0.0f, 0.9999f); -// const int v_idx = (int) (t * item_count); -// IM_ASSERT(v_idx >= 0 && v_idx < values_count); -// -// // std::string toolTip; -// ImGui::BeginTooltip(); -// const int idx0 = (v_idx + values_offset) % values_count; -// if (plot_type == ImGuiPlotType_Lines) -// { -// const int idx1 = (v_idx + 1 + values_offset) % values_count; -// Text("%8d %8d | Name", v_idx, v_idx+1); -// for (int dataIdx = 0; dataIdx < num_datas; ++dataIdx) -// { -// const float v0 = getter(datas[dataIdx], idx0); -// const float v1 = getter(datas[dataIdx], idx1); -// TextColored(colors[dataIdx], "%8.4g %8.4g | %s", v0, v1, names[dataIdx]); -// } -// } -// else if (plot_type == ImGuiPlotType_Histogram) -// { -// for (int dataIdx = 0; dataIdx < num_datas; ++dataIdx) -// { -// const float v0 = getter(datas[dataIdx], idx0); -// TextColored(colors[dataIdx], "%d: %8.4g | %s", v_idx, v0, names[dataIdx]); -// } -// } -// ImGui::EndTooltip(); -// v_hovered = v_idx; -// } -// -// for (int data_idx = 0; data_idx < num_datas; ++data_idx) -// { -// const float t_step = 1.0f / (float) res_w; -// -// float v0 = getter(datas[data_idx], (0 + values_offset) % values_count); -// float t0 = 0.0f; -// ImVec2 tp0 = ImVec2(t0, 1.0f - ImSaturate((v0 - scale_min) / (scale_max - scale_min))); // Point in the normalized space of our target rectangle -// -// const ImU32 col_base = colors[data_idx]; -// const ImU32 col_hovered = InvertColorU32(colors[data_idx]); -// -// //const ImU32 col_base = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLines : ImGuiCol_PlotHistogram); -// //const ImU32 col_hovered = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLinesHovered : ImGuiCol_PlotHistogramHovered); -// -// for (int n = 0; n < res_w; n++) -// { -// const float t1 = t0 + t_step; -// const int v1_idx = (int) (t0 * item_count + 0.5f); -// IM_ASSERT(v1_idx >= 0 && v1_idx < values_count); -// const float v1 = getter(datas[data_idx], (v1_idx + values_offset + 1) % values_count); -// const ImVec2 tp1 = ImVec2(t1, 1.0f - ImSaturate((v1 - scale_min) / (scale_max - scale_min))); -// -// // NB: Draw calls are merged together by the DrawList system. Still, we should render our batch are lower level to save a bit of CPU. -// ImVec2 pos0 = ImLerp(inner_bb.Min, inner_bb.Max, tp0); -// ImVec2 pos1 = ImLerp(inner_bb.Min, inner_bb.Max, (plot_type == ImGuiPlotType_Lines) ? tp1 : ImVec2(tp1.x, 1.0f)); -// if (plot_type == ImGuiPlotType_Lines) -// { -// window->DrawList->AddLine(pos0, pos1, v_hovered == v1_idx ? col_hovered : col_base); -// } -// else if (plot_type == ImGuiPlotType_Histogram) -// { -// if (pos1.x >= pos0.x + 2.0f) -// pos1.x -= 1.0f; -// window->DrawList->AddRectFilled(pos0, pos1, v_hovered == v1_idx ? col_hovered : col_base); -// } -// -// t0 = t1; -// tp0 = tp1; -// } -// } -// -// RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label); -//} -// -//void PlotMultiLines( -// const char* label, -// int num_datas, -// const char** names, -// const ImColor* colors, -// float(*getter)(const void* data, int idx), -// const void * const * datas, -// int values_count, -// float scale_min, -// float scale_max, -// ImVec2 graph_size) -//{ -// PlotMultiEx(ImGuiPlotType_Lines, label, num_datas, names, colors, getter, datas, values_count, scale_min, scale_max, graph_size); -//} -// -//void PlotMultiHistograms( -// const char* label, -// int num_hists, -// const char** names, -// const ImColor* colors, -// float(*getter)(const void* data, int idx), -// const void * const * datas, -// int values_count, -// float scale_min, -// float scale_max, -// ImVec2 graph_size) -//{ -// PlotMultiEx(ImGuiPlotType_Histogram, label, num_hists, names, colors, getter, datas, values_count, scale_min, scale_max, graph_size); -//} -// -//} // namespace ImGui \ No newline at end of file + +#pragma once +#include "imgui.h" +#include "imgui_internal.h" + + + +namespace ImGui { + + static ImU32 InvertColorU32(ImU32 in) + { + ImVec4 in4 = ColorConvertU32ToFloat4(in); + in4.x = 1.f - in4.x; + in4.y = 1.f - in4.y; + in4.z = 1.f - in4.z; + return GetColorU32(in4); + } + + static ImVec2 add(const ImVec2& a, const ImVec2& b){ + return ImVec2(a.x+b.x, a.y+b.y); + } + static ImVec2 subtract(const ImVec2& a, const ImVec2& b){ + return ImVec2(a.x-b.x, a.y-b.y); + } + static void PlotMultiEx( + ImGuiPlotType plot_type, + const char* label, + int num_datas, + const char** names, + const ImColor* colors, + float(*getter)(const void* data, int idx), + const void * const * datas, + int values_count, + float scale_min, + float scale_max, + ImVec2 graph_size){ + + const int values_offset = 0; + + ImGuiWindow* window = GetCurrentWindow(); + if (window->SkipItems) + return; + + ImGuiContext& g = *GImGui; + const ImGuiStyle& style = g.Style; + + const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true); + if (graph_size.x == 0.0f) + graph_size.x = CalcItemWidth(); + if (graph_size.y == 0.0f) + graph_size.y = label_size.y + (style.FramePadding.y * 2); + + + + const ImRect frame_bb(window->DC.CursorPos, add(window->DC.CursorPos, graph_size)); + const ImRect inner_bb(add(frame_bb.Min,style.FramePadding), subtract(frame_bb.Max , style.FramePadding)); + ImVec2 thing = ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0); + const ImRect total_bb(frame_bb.Min, add(frame_bb.Max , thing)); + + + // const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(graph_size.x, graph_size.y)); + // const ImRect inner_bb(frame_bb.Min + style.FramePadding, frame_bb.Max - style.FramePadding); + // const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0)); + + + ItemSize(total_bb, style.FramePadding.y); + // if (!ItemAdd(total_bb, NULL)) + // return; + + // Determine scale from values if not specified + if (scale_min == FLT_MAX || scale_max == FLT_MAX) + { + float v_min = FLT_MAX; + float v_max = -FLT_MAX; + for (int data_idx = 0; data_idx < num_datas; ++data_idx) + { + for (int i = 0; i < values_count; i++) + { + const float v = getter(datas[data_idx], i); + v_min = ImMin(v_min, v); + v_max = ImMax(v_max, v); + } + } + if (scale_min == FLT_MAX) + scale_min = v_min; + if (scale_max == FLT_MAX) + scale_max = v_max; + } + + RenderFrame(frame_bb.Min, frame_bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); + + int res_w = ImMin((int) graph_size.x, values_count) + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0); + int item_count = values_count + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0); + + // Tooltip on hover + // int v_hovered = -1; + // if (IsHovered(inner_bb, 0)) + // { + // const float t = ImClamp((g.IO.MousePos.x - inner_bb.Min.x) / (inner_bb.Max.x - inner_bb.Min.x), 0.0f, 0.9999f); + // const int v_idx = (int) (t * item_count); + // IM_ASSERT(v_idx >= 0 && v_idx < values_count); + // + // // std::string toolTip; + // ImGui::BeginTooltip(); + // const int idx0 = (v_idx + values_offset) % values_count; + // if (plot_type == ImGuiPlotType_Lines) + // { + // const int idx1 = (v_idx + 1 + values_offset) % values_count; + // Text("%8d %8d | Name", v_idx, v_idx+1); + // for (int dataIdx = 0; dataIdx < num_datas; ++dataIdx) + // { + // const float v0 = getter(datas[dataIdx], idx0); + // const float v1 = getter(datas[dataIdx], idx1); + // TextColored(colors[dataIdx], "%8.4g %8.4g | %s", v0, v1, names[dataIdx]); + // } + // } + // else if (plot_type == ImGuiPlotType_Histogram) + // { + // for (int dataIdx = 0; dataIdx < num_datas; ++dataIdx) + // { + // const float v0 = getter(datas[dataIdx], idx0); + // TextColored(colors[dataIdx], "%d: %8.4g | %s", v_idx, v0, names[dataIdx]); + // } + // } + // ImGui::EndTooltip(); + // v_hovered = v_idx; + // } + + for (int data_idx = 0; data_idx < num_datas; ++data_idx) + { + const float t_step = 1.0f / (float) res_w; + + float v0 = getter(datas[data_idx], (0 + values_offset) % values_count); + float t0 = 0.0f; + ImVec2 tp0 = ImVec2(t0, 1.0f - ImSaturate((v0 - scale_min) / (scale_max - scale_min))); // Point in the normalized space of our target rectangle + + const ImU32 col_base = colors[data_idx]; + const ImU32 col_hovered = InvertColorU32(colors[data_idx]); + + //const ImU32 col_base = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLines : ImGuiCol_PlotHistogram); + //const ImU32 col_hovered = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLinesHovered : ImGuiCol_PlotHistogramHovered); + + for (int n = 0; n < res_w; n++) + { + const float t1 = t0 + t_step; + const int v1_idx = (int) (t0 * item_count + 0.5f); + IM_ASSERT(v1_idx >= 0 && v1_idx < values_count); + const float v1 = getter(datas[data_idx], (v1_idx + values_offset + 1) % values_count); + const ImVec2 tp1 = ImVec2(t1, 1.0f - ImSaturate((v1 - scale_min) / (scale_max - scale_min))); + + // NB: Draw calls are merged together by the DrawList system. Still, we should render our batch are lower level to save a bit of CPU. + ImVec2 pos0 = ImLerp(inner_bb.Min, inner_bb.Max, tp0); + ImVec2 pos1 = ImLerp(inner_bb.Min, inner_bb.Max, (plot_type == ImGuiPlotType_Lines) ? tp1 : ImVec2(tp1.x, 1.0f)); + if (plot_type == ImGuiPlotType_Lines) + { + window->DrawList->AddLine(pos0, pos1, col_base); + } + else if (plot_type == ImGuiPlotType_Histogram) + { + if (pos1.x >= pos0.x + 2.0f) + pos1.x -= 1.0f; + window->DrawList->AddRectFilled(pos0, pos1, col_base); + } + + t0 = t1; + tp0 = tp1; + } + } + + RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label); + } + + inline void PlotMultiLines( + const char* label, + int num_datas, + const char** names, + const ImColor* colors, + float(*getter)(const void* data, int idx), + const void * const * datas, + int values_count, + float scale_min, + float scale_max, + ImVec2 graph_size) + { + PlotMultiEx(ImGuiPlotType_Lines, label, num_datas, names, colors, getter, datas, values_count, scale_min, scale_max, graph_size); + } + + inline void PlotMultiHistograms( + const char* label, + int num_hists, + const char** names, + const ImColor* colors, + float(*getter)(const void* data, int idx), + const void * const * datas, + int values_count, + float scale_min, + float scale_max, + ImVec2 graph_size) + { + PlotMultiEx(ImGuiPlotType_Histogram, label, num_hists, names, colors, getter, datas, values_count, scale_min, scale_max, graph_size); + } + +} // namespace ImGui \ No newline at end of file diff --git a/include/util.hpp b/include/util.hpp index 7a6ef81..098eeb4 100644 --- a/include/util.hpp +++ b/include/util.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "Vector4.hpp" const double PI = 3.141592653589793238463; @@ -40,6 +41,10 @@ public: instant_fps = delta_time; } + static float edit(const void* data, int idx){ + //*(int*)data = idx; + return *(int*)(data+sizeof(int)*idx); + }; void draw() { if (arr_pos == 1000) @@ -49,7 +54,21 @@ public: arr_pos++; ImGui::Begin("Performance"); - ImVec2 wh = ImGui::GetContentRegionAvail(); + //ImVec2 wh = ImGui::GetContentRegionAvail(); + ImVec2 wh(100, 200); + + int a[3] = {1, 2, 7}; + int b[3] = {5, 3, 1}; + int c[3] = {8, 1, 4}; + const void* to_data[3] = {&a, &b, &c}; + const char* to_names[3] = {"a", "b", "z"}; + ImGuiPlotType plottype = ImGuiPlotType_Lines; + ImColor color = ImColor(255, 255, 255); + ImGui::PlotMultiLines( + "label", 3, to_names, &color, &edit, + to_data, 3, 0.0f, 10.0f, ImVec2(300, 300)); + + ImGui::PlotLines("FPS", fps_array, 1000, 0, std::to_string(1.0 / fps_average).c_str(), 0.0f, 150.0f, wh); @@ -287,3 +306,4 @@ inline bool IsLeaf(const uint64_t descriptor) { return false; } +