vendor: update imgui, new netgraph

Author: blattersturm

code/components/debug-net/include/imguivariouscontrols.h

@@ -16,7 +16,9 @@
 #include <mmsystem.h>
 
 #include <ConsoleHost.h>
+
 #include <imgui.h>
+#include <imguivariouscontrols.h>
 
 const int g_netOverlayOffsetX = -30;
 const int g_netOverlayOffsetY = -60;
@@ -124,7 +126,7 @@ class NetOverlayMetricSink : public INetMetricSink
 		}
 	}
 
-	CRGBA GetColorIndex(int i);
+	ImColor GetColorIndex(int i);
 
 	void UpdateMetrics();
 
@@ -146,20 +148,42 @@ NetOverlayMetricSink::NetOverlayMetricSink()
 
 	static ConVar<bool> conVar("netgraph", ConVar_Archive, false, &m_enabled);
 
-	OnPostFrontendRender.Connect([=] ()
+	ConHost::OnShouldDrawGui.Connect([this](bool* should)
 	{
-		// update metrics
-		UpdateMetrics();
+		*should = *should || m_enabled;
+	});
 
-		// if enabled, render
-		if (m_enabled)
+	ConHost::OnDrawGui.Connect([this]()
+	{
+		if (!m_enabled)
 		{
-			// draw the base metrics
-			DrawBaseMetrics();
+			return;
+		}
 
+		auto& io = ImGui::GetIO();
+
+		ImGui::SetNextWindowBgAlpha(0.0f);
+		ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x + g_netOverlayOffsetX, io.DisplaySize.y + g_netOverlayOffsetY), ImGuiCond_Once, ImVec2(1.0f, 1.0f));
+		ImGui::SetNextWindowSize(ImVec2(g_netOverlayWidth, g_netOverlayHeight));
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+
+		if (ImGui::Begin("NetGraph", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize))
+		{
 			// draw the graph
 			DrawGraph();
+
+			// draw the base metrics
+			DrawBaseMetrics();
 		}
+
+		ImGui::PopStyleVar();
+		ImGui::End();
+	});
+
+	OnPostFrontendRender.Connect([=] ()
+	{
+		// update metrics
+		UpdateMetrics();
 	}, 50);
 
 	static ConVar<bool> commandVar("net_showCommands", ConVar_Archive, false, &m_enabledCommands);
@@ -379,50 +403,46 @@ void NetOverlayMetricSink::UpdateMetrics()
 
 void NetOverlayMetricSink::DrawGraph()
 {
-	// calculate maximum height for this data subset
-	float maxHeight = 0;
-
-	for (int i = 0; i < _countof(m_metrics); i++)
+	static const char* names[NET_PACKET_SUB_MAX] =
 	{
-		auto metric = m_metrics[i];
-		auto totalSize = metric.GetTotalSize();
-
-		if (totalSize > maxHeight)
-		{
-			maxHeight = totalSize;
-		}
-	}
-
-	// calculate per-sample size
-	int perSampleSize = (g_netOverlayWidth / g_netOverlaySampleCount);
+		"Routed Messages",
+		"Reliables",
+		"Misc"
+	};
 
-	for (int i = 0; i < _countof(m_metrics) - 1; i++) // the last entry is transient, so ignore that
+	static const ImColor colors[NET_PACKET_SUB_MAX] =
 	{
-		auto metric = m_metrics[i];
+		GetColorIndex(0),
+		GetColorIndex(1),
+		GetColorIndex(2)
+	};
 
-		// base X/Y for this metric
-		int x = GetOverlayLeft() + (perSampleSize * i);
-		int y = GetOverlayTop() + (g_netOverlayHeight - 100);
+	struct DataContext
+	{
+		NetPacketMetrics* metrics;
+		NetPacketSubComponent index;
+	};
 
-		for (int j = 0; j < NET_PACKET_SUB_MAX; j++)
-		{
-			// get Y for this submetric
-			float y1 = ceilf(y - ((metric.GetElementSize((NetPacketSubComponent)j) / maxHeight) * (g_netOverlayHeight - 100)));
-			float y2 = y;
+	auto data0 = DataContext{ m_metrics, NET_PACKET_SUB_ROUTED_MESSAGES };
+	auto data1 = DataContext{ m_metrics, NET_PACKET_SUB_RELIABLES };
+	auto data2 = DataContext{ m_metrics, NET_PACKET_SUB_MISC };
 
-			// set a rectangle
-			CRect rect(x, y1, x + perSampleSize, y2);
-			CRGBA color = GetColorIndex(j);
+	const void* datas[NET_PACKET_SUB_MAX] =
+	{
+		&data0,
+		&data1,
+		&data2
+	};
 
-			TheFonts->DrawRectangle(rect, color);
+	ImGui::PlotMultiLines("Net Bw", NET_PACKET_SUB_MAX, names, colors, [](const void* cxt, int idx) -> float
+	{
+		auto dataContext = (DataContext*)cxt;
 
-			// the next one starts where this one left off
-			y = y1;
-		}
-	}
+		return dataContext->metrics[idx].GetElementSize(dataContext->index);
+	}, datas, _countof(m_metrics) - 1, FLT_MAX, FLT_MAX, ImVec2(g_netOverlayWidth, g_netOverlayHeight - 100));
 }
 
-CRGBA NetOverlayMetricSink::GetColorIndex(int index)
+ImColor NetOverlayMetricSink::GetColorIndex(int index)
 {
 	static CRGBA colorTable[] = {
 		CRGBA(0x00, 0x00, 0xAA),
@@ -439,7 +459,9 @@ CRGBA NetOverlayMetricSink::GetColorIndex(int index)
 		CRGBA(0xFF, 0xFF, 0x55)
 	};
 
-	return colorTable[index % _countof(colorTable)];
+	auto thisColor = colorTable[index % _countof(colorTable)];
+
+	return ImColor{ thisColor.red, thisColor.green, thisColor.blue, thisColor.alpha };
 }
 
 void NetOverlayMetricSink::DrawBaseMetrics()
@@ -459,7 +481,9 @@ void NetOverlayMetricSink::DrawBaseMetrics()
 	int outRoutePackets = m_lastOutRoutePackets;
 
 	// drawing
-	TheFonts->DrawText(va(L"ping: %dms\nin: %d/s\nout: %d/s\nrt: %d/%d/s", ping, inPackets, outPackets, inRoutePackets, outRoutePackets), rect, color, 22.0f, 1.0f, "Lucida Console");
+	ImGui::Columns(2);
+	ImGui::Text("%s", va("ping: %dms\nin: %d/s\nout: %d/s\nrt: %d/%d/s", ping, inPackets, outPackets, inRoutePackets, outRoutePackets));
+	ImGui::NextColumn();
 
 	//
 	// second column
@@ -475,7 +499,8 @@ void NetOverlayMetricSink::DrawBaseMetrics()
 	int inRouteDelayMax = m_inRouteDelayMax;
 
 	// drawing
-	TheFonts->DrawText(va(L"\nin: %d b/s\nout: %d b/s\nrd: %d~%dms", inBytes, outBytes, inRouteDelay, inRouteDelayMax), rect, color, 22.0f, 1.0f, "Lucida Console");
+	ImGui::Text("%s", va("\nin: %d b/s\nout: %d b/s\nrd: %d~%dms", inBytes, outBytes, inRouteDelay, inRouteDelayMax));
+	ImGui::Columns(1);
 }
 
 static InitFunction initFunction([] ()