Add volleyball with custom ball rendering from tclient

Author: qxdFox

src/engine/shared/config_variables_entity.h

@@ -36,7 +36,7 @@ MACRO_CONFIG_INT(TcRenderGhostAsCircle, ec_render_ghost_as_circle, 0, 0, 1, CFGF
 // Outline Variables
 MACRO_CONFIG_INT(ClOutline, ec_outline, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outlines")
 MACRO_CONFIG_INT(ClOutlineEntities, ec_outline_in_entities, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Only show outlines in entities")
-MACRO_CONFIG_INT(ClOutlineFreeze, ec_outline_freeze, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around freeze and deep")
+MACRO_CONFIG_INT(ClOutlineFreeze, ec_outline_freeze, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around freeze and deep")
 MACRO_CONFIG_INT(ClOutlineUnfreeze, ec_outline_unfreeze, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around unfreeze and undeep")
 MACRO_CONFIG_INT(ClOutlineSolid, ec_outline_solid, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around hook and unhook")
 MACRO_CONFIG_INT(ClOutlineTele, ec_outline_tele, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Draws outline around teleporters")
@@ -370,10 +370,10 @@ MACRO_CONFIG_INT(TcBgDrawWidth, ec_bg_draw_width, 5, 1, 50, CFGFLAG_CLIENT | CFG
 MACRO_CONFIG_INT(TcBgDrawFadeTime, ec_bg_draw_fade_time, 0, 0, 600, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Time until strokes disappear (0 = never)")
 MACRO_CONFIG_INT(TcBgDrawMaxItems, ec_bg_draw_max_items, 128, 0, 2048, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Maximum number of strokes")
 MACRO_CONFIG_COL(TcBgDrawColor, ec_bg_draw_color, 11893936, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Color of background draw strokes")
-MACRO_CONFIG_INT(TcBgDrawAutoSaveLoad, ec_bg_draw_auto_save_load, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Automatically save and load background drawings")
+MACRO_CONFIG_INT(TcBgDrawAutoSaveLoad, ec_bg_draw_auto_save_load, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Automatically save and load background drawings")
 
 // Timer
-MACRO_CONFIG_INT(TcShowLocalTimeSeconds, tc_show_local_time_seconds, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show local time in seconds")
+MACRO_CONFIG_INT(TcShowLocalTimeSeconds, tc_show_local_time_seconds, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show local time in seconds")
 
 // Weapon in Freeze
 MACRO_CONFIG_INT(ClRenderWeaponsInFreeze, ec_render_weapons_in_freeze, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Renders players' weapons while frozen")
@@ -383,6 +383,11 @@ MACRO_CONFIG_INT(ClMapOverview, ec_map_overview, 0, 0, 1, CFGFLAG_CLIENT | CFGFL
 MACRO_CONFIG_INT(ClMapOverviewSpectatingOnly, ec_map_overview_spectating_only, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable map overview only when spectating")
 MACRO_CONFIG_INT(ClMapOverviewOpacity, ec_map_overview_opacity, 15, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Opacity of the map overview")
 
+// Volleyball
+MACRO_CONFIG_INT(EcVolleyBallBetterBall, ec_volleyball_better_ball, 1, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Make frozen players in volleyball look more like volleyballs (0 = disabled, 1 = in volleyball maps, 2 = always)")
+MACRO_CONFIG_STR(EcVolleyBallBetterBallSkin, ec_volleyball_better_ball_skin, 24, "beachball", CFGFLAG_CLIENT | CFGFLAG_SAVE | CFGFLAG_INSENSITIVE, "Player skin to use for better volleyball ball")
+MACRO_CONFIG_INT(EcVolleyBallSpinSpeed, ec_volleyball_spin_speed, 50, 0, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How fast the volleyball spins")
+
 // Custom variables from my server for the editor
 // You can use these if you get my server from https://github.com/FoxNet-DDNet/FoxNet
 

src/game/client/components/entity/entity.cpp

@@ -393,6 +393,22 @@ void CEClient::NotifyOnMove()
 	m_LastPos = LocalPos;
 }
 
+void CEClient::UpdateVolleyball()
+{
+	bool IsVolleyBall = false;
+	if(g_Config.m_EcVolleyBallBetterBall > 0 && g_Config.m_EcVolleyBallBetterBallSkin[0] != '\0')
+	{
+		if(g_Config.m_EcVolleyBallBetterBall > 1)
+			IsVolleyBall = true;
+		else
+			IsVolleyBall = str_startswith_nocase(Client()->GetCurrentMap(), "volleyball");
+	};
+	for(auto &Client : GameClient()->m_aClients)
+	{
+		Client.m_IsVolleyBall = IsVolleyBall && Client.m_DeepFrozen;
+	}
+}
+
 void CEClient::UpdateRainbow()
 {
 	static bool m_RainbowWasOn = false;
@@ -499,6 +515,7 @@ void CEClient::OnInit()
 void CEClient::OnNewSnapshot()
 {
 	NotifyOnMove();
+	UpdateVolleyball();
 }
 
 void CEClient::OnStateChange(int NewState, int OldState)

src/game/client/components/entity/entity.h

@@ -75,6 +75,7 @@ class CEClient : public CComponent
 	// Movement Notification if tabbed out
 	vec2 m_LastPos = vec2(0, 0);
 	void NotifyOnMove();
+	void UpdateVolleyball();
 
 	// Rainbow
 	void UpdateRainbow();

src/game/client/components/nameplates.cpp

@@ -1149,6 +1149,9 @@ void CNamePlates::OnRender()
 		// Only render name plates for active characters
 		if(GameClient()->m_Snap.m_aCharacters[i].m_Active)
 		{
+			if(GameClient()->m_aClients[i].m_IsVolleyBall)
+				continue;
+
 			const vec2 RenderPos = GameClient()->m_aClients[i].m_RenderPos;
 			RenderNamePlateGame(RenderPos, pInfo, 1.0f);
 		}

src/game/client/components/players.cpp

@@ -163,6 +163,10 @@ void CPlayers::RenderHookCollLine(
 	const CNetObj_Character *pPlayerChar,
 	int ClientId)
 {
+	// TClient
+	if(ClientId >= 0 && GameClient()->m_aClients[ClientId].m_IsVolleyBall)
+		return;
+
 	CNetObj_Character Prev;
 	CNetObj_Character Player;
 	Prev = *pPrevChar;
@@ -590,6 +594,44 @@ void CPlayers::RenderPlayer(
 
 	GameClient()->m_Flow.Add(Position, Vel * 100.0f, 10.0f);
 
+	// TClient
+	if(ClientId >= 0 && GameClient()->m_aClients[ClientId].m_IsVolleyBall)
+	{
+		// Update
+		const float Delta = Client()->IntraGameTickSincePrev(g_Config.m_ClDummy);
+		auto &ClientData = GameClient()->m_aClients[ClientId];
+
+		vec2 TempVel = Vel;
+		TempVel.x *= 0.65f;
+		TempVel.y *= 0.25f;
+
+		ClientData.m_VolleyBallAngle += length(TempVel * Delta * g_Config.m_EcVolleyBallSpinSpeed * 0.00001);
+		if(ClientData.m_VolleyBallAngle < 0.0f)
+			ClientData.m_VolleyBallAngle += 2.0f * pi;
+		else if(ClientData.m_VolleyBallAngle > 2.0f * pi)
+			ClientData.m_VolleyBallAngle -= 2.0f * pi;
+		// Render
+		const CSkin *pSkin = GameClient()->m_Skins.Find(g_Config.m_EcVolleyBallBetterBallSkin);
+		if(!pSkin)
+			return;
+		const float Size = pRenderInfo->m_Size * 1.2f;
+		Graphics()->TextureSet(pSkin->m_OriginalSkin.m_BodyOutline);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(ColorRGBA(1.0f, 1.0f, 1.0f, Alpha));
+		IEngineGraphics::CQuadItem QuadOutline{Position.x, Position.y, Size, Size};
+		Graphics()->QuadsSetRotation(ClientData.m_VolleyBallAngle);
+		Graphics()->QuadsDraw(&QuadOutline, 1);
+		Graphics()->QuadsEnd();
+		Graphics()->TextureSet(pSkin->m_OriginalSkin.m_Body);
+		Graphics()->QuadsBegin();
+		Graphics()->SetColor(ColorRGBA(1.0f, 1.0f, 1.0f, Alpha));
+		Graphics()->QuadsSetRotation(ClientData.m_VolleyBallAngle);
+		IEngineGraphics::CQuadItem Quad{Position.x, Position.y, Size, Size};
+		Graphics()->QuadsDraw(&Quad, 1);
+		Graphics()->QuadsEnd();
+		return;
+	}
+
 	RenderInfo.m_GotAirJump = Player.m_Jumped & 2 ? false : true;
 
 	RenderInfo.m_FeetFlipped = false;

src/game/client/gameclient.h

@@ -554,10 +554,9 @@ class CGameClient : public IGameClient
 		vec2 m_ImprovedPredPos = vec2(0, 0);
 		vec2 m_PrevImprovedPredPos = vec2(0, 0);
 		bool m_ValidAntipingSmooth = false;
-		// vec2 m_DebugVector = vec2(0, 0);
-		// vec2 m_DebugVector2 = vec2(0, 0);
-		// vec2 m_DebugVector3 = vec2(0, 0);
 		float m_Uncertainty = 0.0f;
+		float m_VolleyBallAngle = 0.0f;
+		bool m_IsVolleyBall = false;
 
 		std::shared_ptr<CManagedTeeRenderInfo> m_pSkinInfo = nullptr; // this is what the server reports
 		CTeeRenderInfo m_RenderInfo; // this is what we use