vfx tweeks

Author: ywgATustcbbs

src/game/client/swarm/c_asw_marine.cpp

@@ -109,8 +109,9 @@ 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
-const float TRACE_FADE_TIME = 60.0f; // how long to keep the trace positions for
+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);
 #endif
 
 #define FLASHLIGHT_DISTANCE		1000

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

@@ -44,7 +44,8 @@ extern ConVar asw_draw_hud;
 
 #ifdef CLIENT_DLL
 extern std::vector<bool> g_bShouldTracePlayer;
-extern const float TRACE_FADE_TIME;
+extern float TRACE_FADE_TIME;
+extern ConVar cl_trace_player_opacity;
 #endif
 
 //-----------------------------------------------------------------------------
@@ -312,20 +313,29 @@ void CASWHudEmotes::PaintTraces()
 
 void CASWHudEmotes::PaintTracesFor(C_ASW_Marine* pMarine)
 {
+	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
 	for (auto iter = pMarine->m_lstTracePlayerMovementList.begin(); iter != pMarine->m_lstTracePlayerMovementList.end(); ++iter)
 	{
-		float fTime = (*iter).m_flTraceTime;
+		float fTraceRatio = (*iter).m_flTraceTime/TRACE_FADE_TIME;
 		Vector vecPosition = (*iter).m_vecPosition;
 
-		if (fTime <= 0)
+		if (fTraceRatio <= 0)
 		{
 			continue; // no trace to draw
 		}
 
 		// draw a circle at the position of the trace in world space
 		// and fade it out over time
-		float fAlpha = pow(((fTime / 3.0) - (int)(fTime / 3.0)),4);
-		fAlpha = clamp(fAlpha, 0.0f, 1.0f);
+		float fAlpha = (fTraceRatio + fTimeRatio) - (int)(fTraceRatio + fTimeRatio);
+		if (fAlpha > 1.0/3.0 || fAlpha <= 0.01)
+		{
+			continue;
+		}
+		else
+		{
+			fAlpha = pow(3.0 * fAlpha, 2.2);
+		}
 		int iTexture = m_nSmileTexture;
 
 		Vector screenPos;
@@ -338,15 +348,15 @@ void CASWHudEmotes::PaintTracesFor(C_ASW_Marine* pMarine)
 			if (iTexture != -1)
 			{
 				// 计算大小，随时间略微变化
-				float fSize = 0.9f + 0.1f * fAlpha;
+				float fSize = 0.5f + 0.1f * fAlpha;
 
 				// 应用屏幕高度比例和自定义缩放
 				float fScale = (ScreenHeight() / 768.0f);
 				float HalfW = 16.0f * fScale * fSize;
 				float HalfH = 16.0f * fScale * fSize;
 
 				// 设置颜色和纹理
-				surface()->DrawSetColor(Color(255, 255, 255, fAlpha * 255.0f));
+				surface()->DrawSetColor(Color(255, 255, 255, fAlpha * fOpacity * 255.0f));
 				surface()->DrawSetTexture(iTexture);
 
 				// 绘制纹理多边形

src/game/shared/swarm/rd_lobby_utils.cpp

@@ -583,44 +583,6 @@ CON_COMMAND( rd_lobby_debug_filter_distance, "1: close, 2: default, 3: far, 4: w
 	}
 }
 
-CON_COMMAND(rd_lobby_suggest_trace_player, "notify server to send a trace player suggestion to all clients.")
-{
-	if (args.ArgC() < 2)
-	{
-		Msg("Usage: rd_lobby_suggest_trace_player <playerIndex>\n");
-		return;
-	}
-
-	int iPlayerIndex = atoi(args[1]);
-	if (iPlayerIndex < 1 || iPlayerIndex > gpGlobals->maxClients)
-	{
-		Msg("Invalid playerIndex\n");
-		return;
-	}
-
-	CBasePlayer* pPlayer = UTIL_PlayerByIndex(iPlayerIndex);
-	if (!pPlayer)
-	{
-		Msg("Can't find a player with index <%d>.\n", iPlayerIndex);
-		return;
-	}
-	// Send the message to all players
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
-	{
-		CBasePlayer* pRecipient = UTIL_PlayerByIndex(i);
-		if (!pRecipient)
-			continue;
-		if (pRecipient == pPlayer)
-		{
-			ClientPrint(pRecipient, HUD_PRINTTALK, "asw_trace_me_msg_to_self");
-		}
-		else
-		{
-			ClientPrint(pRecipient, HUD_PRINTTALK, "asw_trace_me_msg_to_others", pPlayer->GetPlayerName());
-		}
-	}
-}
-
 CReactiveDropServerListHelper::CReactiveDropServerListHelper( const char *szDebugName )
 {
 	m_pszDebugName = szDebugName;
@@ -832,3 +794,43 @@ bool CReactiveDropServerList::IsHoIAFServerIP( uint32_t ip )
 	return HoIAF()->IsRankedServerIP( ip );
 }
 #endif
+
+#ifndef CLIENT_DLL
+CON_COMMAND(rd_lobby_suggest_trace_player, "notify server to send a trace player suggestion to all clients.")
+{
+	if (args.ArgC() < 2)
+	{
+		Msg("Usage: rd_lobby_suggest_trace_player <playerIndex>\n");
+		return;
+	}
+
+	int iPlayerIndex = atoi(args[1]);
+	if (iPlayerIndex < 1 || iPlayerIndex > gpGlobals->maxClients)
+	{
+		Msg("Invalid playerIndex\n");
+		return;
+	}
+
+	CBasePlayer* pPlayer = UTIL_PlayerByIndex(iPlayerIndex);
+	if (!pPlayer)
+	{
+		Msg("Can't find a player with index <%d>.\n", iPlayerIndex);
+		return;
+	}
+	// Send the message to all players
+	for (int i = 1; i <= gpGlobals->maxClients; i++)
+	{
+		CBasePlayer* pRecipient = UTIL_PlayerByIndex(i);
+		if (!pRecipient)
+			continue;
+		if (pRecipient == pPlayer)
+		{
+			ClientPrint(pRecipient, HUD_PRINTTALK, "asw_trace_me_msg_to_self");
+		}
+		else
+		{
+			ClientPrint(pRecipient, HUD_PRINTTALK, "asw_trace_me_msg_to_others", pPlayer->GetPlayerName());
+		}
+	}
+}
+#endif