Use different colors for different player traces

Author: ywgATustcbbs

src/game/client/swarm/c_asw_marine.cpp

@@ -108,10 +108,96 @@ extern ConVar rd_team_color_enemy;
 extern float g_fMarinePoisonDuration;
 
 #ifdef CLIENT_DLL
-std::vector<bool> g_bShouldTracePlayer = std::vector<bool>(MAX_PLAYERS, false); // whether we have a trace position for this player
+Color g_TraceColorArray[8] =
+{
+	Color(0, 0, 0, 255),		// black (unused)
+	Color(255, 255, 255, 255),	// white
+	Color(255, 255,   0, 255),	// yellow
+	Color(0, 255, 0, 255),		// green
+	Color(255, 0, 0, 255),		// red
+	Color(0, 0, 255, 255),		// blue
+	Color(255, 0, 255, 255),	// pink
+	Color(0, 255, 255, 255),	// cyan	
+};
+std::vector<int> g_nTracePlayer2Color = std::vector<int>(MAX_PLAYERS, 0);
+std::vector<int> g_nTraceColor2Player = std::vector<int>(8, 0);
 float TRACE_FADE_TIME = 60.0f; // how long to keep the trace positions for
 ConVar cl_trace_player_max_targets("cl_trace_player_max_targets", "3", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Maximum number of players to trace positions for in the client.", true, 1.0f, true, 7.0f);
-ConVar cl_trace_player_opacity("cl_trace_player_opacity", "0.5", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Opacity of the player trace positions in the client. 0.0 means fully transparent, 1.0 means fully opaque.", true, 0.0f, true, 1.0f);
+ConVar cl_trace_player_opacity("cl_trace_player_opacity", "1", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Opacity of the player trace positions in the client. 0.0 means fully transparent, 1.0 means fully opaque.", true, 0.0f, true, 1.0f);
+//ConVar cl_trace_player_line_thickness("cl_trace_player_line_thickness", "30", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Thickness of the player trace.", true, 1.0f, true, 100.0f);
+//ConVar cl_trace_player_border_thickness("cl_trace_player_border_thickness", "5", FCVAR_ARCHIVE | FCVAR_CLIENTDLL, "Thickness of the player trace border.", true, 1.0f, true, 10.0f);
+
+void RemoveInvalidTracePlayersAndColors()
+{
+	for (int i = 1; i <= 7; i++)
+	{
+		// if this color's playerIndex is not a valid player, or if the color index is greater than the max targets, reset it 
+		if (g_nTraceColor2Player[i] <= 0 || g_nTraceColor2Player[i] >= MAX_PLAYERS || !UTIL_PlayerByIndex(g_nTraceColor2Player[i]) || i > cl_trace_player_max_targets.GetInt())
+		{
+			g_nTraceColor2Player[i] = 0;
+		}
+	}
+	for (int i = 1; i < MAX_PLAYERS; i++)
+	{
+		// if this playerIndex is not a valid player, or if the player's colorIndex is greater than the max targets, reset it
+		if (!UTIL_PlayerByIndex(i) || g_nTracePlayer2Color[i] <= 0 || g_nTracePlayer2Color[i] > cl_trace_player_max_targets.GetInt())
+		{
+			g_nTracePlayer2Color[i] = 0;
+		}
+
+	}
+	// cross-check the color -> player mapping, remove any record if not match
+	for (int i = 1; i <= cl_trace_player_max_targets.GetInt(); i++)
+	{
+		if (g_nTracePlayer2Color[g_nTraceColor2Player[i]] != i)
+		{
+			g_nTraceColor2Player[i] = 0;
+		}
+	}
+	// cross-check the player -> color mapping, remove any record if not match
+	for (int i = 1; i < MAX_PLAYERS; i++)
+	{
+		if (g_nTraceColor2Player[g_nTracePlayer2Color[i]] != i)
+		{
+			g_nTracePlayer2Color[i] = 0;
+		}
+	}
+}
+
+void ToggleTraceColor(int playerIndex)
+{
+	RemoveInvalidTracePlayersAndColors();
+	if ( playerIndex < 0 || playerIndex >= MAX_PLAYERS )
+		return;
+	int nColorIndex = g_nTracePlayer2Color[playerIndex];
+	if ( nColorIndex != 0 )
+	{
+		g_nTracePlayer2Color[playerIndex] == 0;
+		g_nTraceColor2Player[nColorIndex] = 0;
+	}
+	else
+	{
+		// find an available color index
+		bool hasAvailableColor = false;
+		for ( int i = 1; i <= cl_trace_player_max_targets.GetInt(); i++ )
+		{
+			if ( g_nTraceColor2Player[i] == 0 )
+			{
+				g_nTracePlayer2Color[playerIndex] = i;
+				g_nTraceColor2Player[i] = playerIndex;
+				hasAvailableColor = true;
+				break;
+			}
+		}
+		if(!hasAvailableColor)
+		{
+			// no available color, so replace the last one
+			g_nTracePlayer2Color[g_nTraceColor2Player[cl_trace_player_max_targets.GetInt()]] = 0;
+			g_nTraceColor2Player[cl_trace_player_max_targets.GetInt()] = playerIndex;
+			g_nTracePlayer2Color[playerIndex] = cl_trace_player_max_targets.GetInt();
+		}
+	}
+}
 #endif
 
 #define FLASHLIGHT_DISTANCE		1000

src/game/client/swarm/vgui/asw_hud_emotes.cpp

@@ -45,9 +45,16 @@ using namespace vgui;
 extern ConVar asw_draw_hud;
 
 #ifdef CLIENT_DLL
-extern std::vector<bool> g_bShouldTracePlayer;
 extern float TRACE_FADE_TIME;
 extern ConVar cl_trace_player_opacity;
+extern ConVar cl_trace_player_max_targets;
+//extern ConVar cl_trace_player_line_thickness;
+//extern ConVar cl_trace_player_border_thickness;
+extern Color g_TraceColorArray[8];
+extern std::vector<int> g_nTracePlayer2Color;
+extern std::vector<int> g_nTraceColor2Player;
+extern void RemoveInvalidTracePlayersAndColors();
+extern void ToggleTraceColor(int playerIndex);
 #endif
 
 //-----------------------------------------------------------------------------
@@ -69,7 +76,7 @@ class CASWHudEmotes : public CASW_HudElement, public vgui::Panel
 	virtual bool ShouldDraw( void ) { return asw_draw_hud.GetBool() && CASW_HudElement::ShouldDraw(); }
 
 	virtual void PaintTraces();
-	virtual void PaintTracesFor(C_ASW_Marine* pMarine);
+	virtual void PaintTracesFor(C_ASW_Marine* pMarine, Color color);
 
 	CPanelAnimationVarAliasType( int, m_nMedicTexture, "MedicEmoteTexture", "vgui/swarm/Emotes/EmoteMedic", "textureid" );
 	CPanelAnimationVarAliasType( int, m_nAmmoTexture, "AmmoEmoteTexture", "vgui/swarm/Emotes/EmoteAmmo", "textureid" );
@@ -296,6 +303,7 @@ void CASWHudEmotes::PaintEmote( C_BaseEntity *pEnt, float fTime, int iTexture, f
 
 void CASWHudEmotes::PaintTraces()
 {
+	RemoveInvalidTracePlayersAndColors();
 	C_ASW_Game_Resource* pGameResource = ASWGameResource();
 	if (!pGameResource)
 		return;
@@ -307,22 +315,22 @@ void CASWHudEmotes::PaintTraces()
 			continue;
 
 		C_ASW_Marine* marine = pMR->GetMarineEntity();
-		if (!pMR->IsInhabited() || !marine || !g_bShouldTracePlayer[pMR->GetCommanderIndex()])
+		if (!pMR->IsInhabited() || !marine || g_nTracePlayer2Color[pMR->GetCommanderIndex()] == 0)
 			continue;
 
-		PaintTracesFor(marine);
+		PaintTracesFor(marine, g_TraceColorArray[g_nTracePlayer2Color[pMR->GetCommanderIndex()]]);
 	}
 }
 
-void CASWHudEmotes::PaintTracesFor(C_ASW_Marine* pMarine)
+void CASWHudEmotes::PaintTracesFor(C_ASW_Marine* pMarine, Color color)
 {
 	// Not sure if the engine is single threaded or not, meanwhile, the list is accessed form other places. Therefore, lock m_TraceLock, just in case we are accessing the list from multiple threads, preventing concurrent modification of m_lstTracePlayerMovementList. Can safely remove the lock if the engine is gauranteed to be single threaded.
 	std::lock_guard<std::mutex> lock(pMarine->m_TraceLock);
 
 	float fTimeRatio = 1.0 - gpGlobals->curtime / 3.0 + (int)(gpGlobals->curtime / 3.0); // current time
-	float fOpacity = cl_trace_player_opacity.GetFloat(); // default opacity for traces
+	color[3] = 255 * pow(cl_trace_player_opacity.GetFloat(), 2.2);
 	int omx, omy;
-	float fAlpha, fTraceRatio, xPos, yPos;
+	float xPos, yPos;
 	float fScale = (ScreenHeight() / 768.0f);
 	float HalfW = 16.0f * fScale;
 	float HalfH = 16.0f * fScale;
@@ -332,41 +340,42 @@ void CASWHudEmotes::PaintTracesFor(C_ASW_Marine* pMarine)
 
 	ASWInput()->ASW_GetCameraLocation(C_ASW_Player::GetLocalASWPlayer(), vecCameraFocus, cameraAngle, omx, omy, false);
 
+	// draw trace lines
+	surface()->DrawSetColor(color);
+	for (int i = 0; i < pMarine->m_vecTraceInterpolated.size() - 2; i++)
+	{
+		Vector vecPosition = pMarine->m_vecTraceInterpolated[i].m_vecPosition;
+		Vector vecPositionNext = pMarine->m_vecTraceInterpolated[i + 1].m_vecPosition;
+
+		if (!debugoverlay->ScreenPosition(vecPosition, screenPos) && !debugoverlay->ScreenPosition(vecPositionNext, screenPosNext))
+		{
+			surface()->DrawLine(screenPos[0], screenPos[1], screenPosNext[0], screenPosNext[1]);
+		}
+	}
+
 	// draw trace direction icons
+	surface()->DrawSetColor(color);
+	surface()->DrawSetTexture(m_nTraceTexture);
 	for (auto iter = pMarine->m_vecTraceInterpolated.begin(); iter != pMarine->m_vecTraceInterpolated.end(); ++iter)
 	{
 		if (iter->m_flTimestamp < 0.0f || iter->m_flTimestamp + 1.0f > gpGlobals->curtime)
 		{
 			continue;
 		}
-		float fTraceRatio = iter->m_flTraceTime / TRACE_FADE_TIME;
 		Vector vecPosition = iter->m_vecPosition;
 
-		if (fTraceRatio <= 0)
+		if (iter->m_flTraceTime <= 0)
 		{
 			continue; // no trace to draw
 		}
 
-		fAlpha = (fTraceRatio + fTimeRatio) - (int)(fTraceRatio + fTimeRatio);
-		if (fAlpha > 1.0 / 3.0 || fAlpha <= 0.01)
-		{
-			//continue;
-		}
-		else
-		{
-			fAlpha = pow(3.0 * fAlpha, 2.2);
-		}
-
 		if (!debugoverlay->ScreenPosition(vecPosition, screenPos))
 		{
 			xPos = screenPos[0];
 			yPos = screenPos[1];
 
 			if (m_nTraceTexture != -1)
 			{
-				surface()->DrawSetColor(Color(255, 255, 255, 255.0f));
-				surface()->DrawSetTexture(m_nTraceTexture);
-
 				QAngle angFacing(0, -iter->m_flAngleDegree + cameraAngle.y - 90, 0);
 
 				Vector vecCornerTL(-HalfW, -HalfH, 0);
@@ -397,17 +406,4 @@ void CASWHudEmotes::PaintTracesFor(C_ASW_Marine* pMarine)
 			}
 		}
 	}
-
-	// draw trace lines
-	for (int i = 0; i < pMarine->m_vecTraceInterpolated.size() - 2; i++)
-	{
-		Vector vecPosition = pMarine->m_vecTraceInterpolated[i].m_vecPosition;
-		Vector vecPositionNext = pMarine->m_vecTraceInterpolated[i + 1].m_vecPosition;
-
-		if (!debugoverlay->ScreenPosition(vecPosition, screenPos) && !debugoverlay->ScreenPosition(vecPositionNext, screenPosNext))
-		{
-			surface()->DrawSetColor(Color(255, 255, 255, 255.0f));
-			surface()->DrawLine(screenPos[0], screenPos[1], screenPosNext[0], screenPosNext[1]);
-		}
-	}
 }

src/game/client/swarm/vgui/nb_lobby_row.cpp

@@ -26,9 +26,14 @@
 #include "tier0/memdbgon.h"
 
 extern ConVar rd_legacy_ui;
+
 #ifdef CLIENT_DLL
-extern std::vector<bool> g_bShouldTracePlayer;
+extern Color g_TraceColorArray[8];
+extern std::vector<int> g_nTracePlayer2Color;
+extern std::vector<int> g_nTraceColor2Player;
 extern ConVar cl_trace_player_max_targets;
+extern void RemoveInvalidTracePlayersAndColors();
+extern void ToggleTraceColor(int playerIndex);
 #endif
 
 using namespace BaseModUI;
@@ -455,6 +460,7 @@ void CNB_Lobby_Row::UpdateDetails()
 	}
 
 	if (m_pTracePlayerButton) {
+		RemoveInvalidTracePlayersAndColors();
 		// In online games, show the button only for other players (not local player, not bot, and occupied slot)
 		if (!Briefing()
 			|| Briefing()->IsOfflineGame()
@@ -634,6 +640,6 @@ void CNB_Lobby_Row::OnTracePlayerPressed()
 		return; // Invalid player index
 	}
 	// flip the trace state for this player
-	g_bShouldTracePlayer[playerIndex] = !g_bShouldTracePlayer[playerIndex];
-	m_pTracePlayerButton->SetImage(CBitmapButton::BUTTON_ENABLED, g_bShouldTracePlayer[playerIndex] ? "vgui/briefing/trace_player_icon_on" : "vgui/briefing/trace_player_icon_off", color32{ 255, 255, 255, 255 });
+	ToggleTraceColor(playerIndex);
+	m_pTracePlayerButton->SetImage(CBitmapButton::BUTTON_ENABLED, (g_nTracePlayer2Color[playerIndex] == 0) ? "vgui/briefing/trace_player_icon_on" : "vgui/briefing/trace_player_icon_off", color32{ 255, 255, 255, 255 });
 }