Implement ValveSoftware#1500

Author: Bitl

game/quiver/info_changelog.txt

@@ -67,6 +67,7 @@ Added the following Source SDK Pull Requests:
 	- #1496: Fix for collection checklists incorrectly marking some items as 'owned'
 	- #1497: Add custom text handling for vote failed messages
 	- #1498: Updated armory controls to mimic December 2021 Workshop dialog QOL update
+	- #1500: Added support for team-colored tinting to invis proxy
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/shared/tf/tf_viewmodel.cpp

@@ -138,6 +138,7 @@ ConVar viewmodel_offset_z("viewmodel_offset_z", "0", FCVAR_CLIENTDLL | FCVAR_ARC
 ConVar viewmodel_offset_pitch("viewmodel_offset_pitch", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
 ConVar viewmodel_offset_yaw("viewmodel_offset_yaw", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
 ConVar viewmodel_offset_roll("viewmodel_offset_roll", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+ConVar tf_viewmodel_cloak_tint("tf_viewmodel_cloak_tint", "0", FCVAR_ARCHIVE, "Allow viewmodels to be tinted while cloaked.");
 #else
 ConVar tf_viewmodels_offset_override("tf_viewmodels_offset_override", "", FCVAR_CHEAT, "If set, this will override the position of all viewmodels. Usage 'x y z'");
 #endif
@@ -636,9 +637,42 @@ EXPOSE_INTERFACE( CViewModelInvisProxy, IMaterialProxy, "vm_invis" IMATERIAL_PRO
 class CInvisProxy : public CBaseInvisMaterialProxy
 {
 public:
+#ifdef BDSBASE
+	CInvisProxy(void);
+	virtual bool Init(IMaterial* pMaterial, KeyValues* pKeyValues) OVERRIDE;
+#endif
 	virtual void OnBind( C_BaseEntity *pC_BaseEntity ) OVERRIDE;
+#ifdef BDSBASE
+private:
+	IMaterialVar* m_pCloakColorTint;
+#endif
 };
 
+#ifdef BDSBASE
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+CInvisProxy::CInvisProxy(void)
+{
+	m_pCloakColorTint = NULL;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Get pointer to the color value
+// Input  : *pMaterial - 
+//-----------------------------------------------------------------------------
+bool CInvisProxy::Init(IMaterial* pMaterial, KeyValues* pKeyValues)
+{
+	// Need to get the material var
+	bool bInvis = CBaseInvisMaterialProxy::Init(pMaterial, pKeyValues);
+
+	bool bTint;
+	m_pCloakColorTint = pMaterial->FindVar("$cloakColorTint", &bTint);
+
+	return (bInvis && bTint);
+}
+#endif
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
@@ -651,11 +685,30 @@ void CInvisProxy::OnBind( C_BaseEntity *pC_BaseEntity )
 
 	CTFPlayer *pPlayer = NULL;
 
+#ifdef BDSBASE
+	static Vector cloakTintRed = Vector(1.0f, 0.5f, 0.4f);
+	static Vector cloakTintBlue = Vector(0.4f, 0.5f, 1.0f);
+#endif
+
 	// Check if we have a move parent and if it's a player
 	C_BaseEntity *pMoveParent = pEnt->GetMoveParent();
 	if ( pMoveParent && pMoveParent->IsPlayer() )
 	{
 		pPlayer = ToTFPlayer( pMoveParent );
+#ifdef BDSBASE
+		// Anything relating to players always tint
+		switch (pPlayer->GetTeamNumber())
+		{
+		case TF_TEAM_RED:
+			m_pCloakColorTint->SetVecValue(cloakTintRed.Base(), 3);
+			break;
+
+		case TF_TEAM_BLUE:
+		default:
+			m_pCloakColorTint->SetVecValue(cloakTintBlue.Base(), 3);
+			break;
+		}
+#endif
 	}
 
 	// If it's not a player then check for viewmodel.
@@ -667,6 +720,29 @@ void CInvisProxy::OnBind( C_BaseEntity *pC_BaseEntity )
 		if ( pVM )
 		{
 			pPlayer = ToTFPlayer( pVM->GetOwner() );
+#ifdef BDSBASE
+			// Viewmodels do not tint unless otherwise specified
+			bool bViewmodelTint = tf_viewmodel_cloak_tint.GetBool();
+
+			if (!bViewmodelTint)
+			{
+				m_pCloakColorTint->SetVecValue(1.0f, 1.0f, 1.0f);
+			}
+			else
+			{
+				switch (pPlayer->GetTeamNumber())
+				{
+				case TF_TEAM_RED:
+					m_pCloakColorTint->SetVecValue(cloakTintRed.Base(), 3);
+					break;
+
+				case TF_TEAM_BLUE:
+				default:
+					m_pCloakColorTint->SetVecValue(cloakTintBlue.Base(), 3);
+					break;
+				}
+			}
+#endif
 		}
 	}