update glow effect render flags based upon new functionality

Author: mastercoms

src/game/client/c_basecombatcharacter.cpp

@@ -107,11 +107,12 @@ void C_BaseCombatCharacter::DoMuzzleFlash()
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void C_BaseCombatCharacter::GetGlowEffectColor( float *r, float *g, float *b )
+void C_BaseCombatCharacter::GetGlowEffectColor( float *r, float *g, float *b, float *a )
 {
 	*r = 0.76f;
 	*g = 0.76f;
 	*b = 0.76f;
+	*a = 1.0f;
 }
 
 void C_BaseCombatCharacter::SetClientSideGlowEnabled(bool bEnabled, int iSourceFlag)
@@ -171,10 +172,10 @@ void C_BaseCombatCharacter::UpdateGlowEffect( void )
 	// create a new effect
 	if ( m_bGlowEnabled || m_bClientSideGlowEnabled )
 	{
-		float r, g, b;
-		GetGlowEffectColor( &r, &g, &b );
+		float r, g, b, a = 1.0f;
+		GetGlowEffectColor( &r, &g, &b, &a );
 
-		m_pGlowEffect = new CGlowObject( this, Vector( r, g, b ), 1.0, true );
+		m_pGlowEffect = new CGlowObject( this, Vector( r, g, b ), a, true );
 	}
 }
 

src/game/client/c_basecombatcharacter.h

@@ -100,7 +100,7 @@ class C_BaseCombatCharacter : public C_BaseFlex
 
 #ifdef GLOWS_ENABLE
 	CGlowObject			*GetGlowObject( void ){ return m_pGlowEffect; }
-	virtual void		GetGlowEffectColor( float *r, float *g, float *b );
+	virtual void		GetGlowEffectColor( float *r, float *g, float *b, float *a );
 //	void				EnableGlowEffect( float r, float g, float b );
 
 	void				SetClientSideGlowEnabled( bool bEnabled, int iSourceFlag = CLIENTSIDE_GLOW_ANONYMOUS );
@@ -116,6 +116,14 @@ class C_BaseCombatCharacter : public C_BaseFlex
 #ifdef GLOWS_ENABLE	
 	virtual void		UpdateGlowEffect( void );
 	virtual void		DestroyGlowEffect( void );
+	int                 GetGlowSources( void ) const { return m_iClientSideGlowSources; }
+	void                SetGlowRenderFlags( bool bRenderWhenOccluded, bool bRenderWhenUnoccluded )
+	{
+		if ( m_pGlowEffect )
+		{
+			m_pGlowEffect->SetRenderFlags( bRenderWhenOccluded, bRenderWhenUnoccluded );
+		}
+	}
 #endif // GLOWS_ENABLE
 
 	int			m_bloodColor;			// color of blood particles

src/game/client/tf/c_baseobject.cpp

@@ -848,17 +848,19 @@ void C_BaseObject::DisplayHintTo( C_BasePlayer *pPlayer )
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void C_BaseObject::GetGlowEffectColor( float *r, float *g, float *b )
+void C_BaseObject::GetGlowEffectColor( float *r, float *g, float *b, float *a )
 {
 	if ( TFGameRules() )
 	{
 		TFGameRules()->GetTeamGlowColor( GetTeamNumber(), *r, *g, *b );
+		*a = 1.0f;
 	}
 	else
 	{
 		*r = 0.76f;
 		*g = 0.76f;
 		*b = 0.76f;
+		*a = 1.0f;
 	}
 }
 

src/game/client/tf/c_baseobject.h

@@ -229,7 +229,7 @@ class C_BaseObject : public C_BaseCombatCharacter, public IHasBuildPoints, publi
 public:
 	virtual void		DisplayHintTo( C_BasePlayer *pPlayer );
 
-	virtual void		GetGlowEffectColor( float *r, float *g, float *b );
+	virtual void		GetGlowEffectColor( float *r, float *g, float *b, float *a );
 
 	bool				IsMapPlaced( void ){ return m_bWasMapPlaced; }
 

src/game/client/tf/c_entity_currencypack.cpp

@@ -57,7 +57,7 @@ void C_CurrencyPack::UpdateGlowEffect( void )
 		DestroyGlowEffect();
 	}
 
-	// create a new effect if we have a cart
+	// create a new effect if we have some money
 	if ( m_bShouldGlowForLocalPlayer )
 	{
 		Vector color = m_bDistributed ? Vector( 150, 0, 0 ) : Vector( 0, 150, 0 );

src/game/client/tf/c_tf_player.cpp

@@ -11876,22 +11876,31 @@ void C_TFPlayer::UpdateGlowEffect( void )
 
 	BaseClass::UpdateGlowEffect();
 
+	if ( ( GetGlowSources() & CLIENTSIDE_GLOW_HEALER ) || ( GetGlowSources() & CLIENTSIDE_GLOW_SAVEME ) )
+	{
+		SetGlowRenderFlags( true, true );
+	}
+	else
+	{
+		SetGlowRenderFlags( true, false );
+	}
+
 	// create a new effect if we have a coach
 	if ( m_hCoach && m_hCoach->IsLocalPlayer() && m_hCoach->m_bIsCoaching )
 	{
-		float r, g, b;
-		GetGlowEffectColor( &r, &g, &b );
+		float r, g, b, a = 1.0f;
+		GetGlowEffectColor( &r, &g, &b, &a );
 
-		m_pStudentGlowEffect = new CGlowObject( this, Vector( r, g, b ), 1.0, true );
+		m_pStudentGlowEffect = new CGlowObject( this, Vector( r, g, b ), a, true, true );
 	}
 
 	// create a power up effect if needed
 	if ( ShouldShowPowerupGlowEffect() )
 	{
-		float r, g, b;
-		GetPowerupGlowEffectColor( &r, &g, &b );
+		float r, g, b, a = 1.0f;
+		GetPowerupGlowEffectColor( &r, &g, &b, &a );
 
-		m_pPowerupGlowEffect = new CGlowObject( this, Vector( r, g, b ), 1.0, true );
+		m_pPowerupGlowEffect = new CGlowObject( this, Vector( r, g, b ), a, true, true );
 	}
 }
 
@@ -11920,26 +11929,30 @@ void C_TFPlayer::UpdateGlowColor( void )
 	CGlowObject* pGlowObject = GetGlowObject();
 	if ( pGlowObject )
 	{
-		float r, g, b;
-		GetGlowEffectColor( &r, &g, &b );
+		float r, g, b, a = 1.0f;
+		GetGlowEffectColor( &r, &g, &b, &a );
 
 		pGlowObject->SetColor( Vector( r, g, b ) );
+		pGlowObject->SetAlpha( a );
 	}
 
 	if ( m_pPowerupGlowEffect )
 	{
-		float r, g, b;
-		GetPowerupGlowEffectColor( &r, &g, &b );
+		float r, g, b, a = 1.0f;
+		GetPowerupGlowEffectColor( &r, &g, &b, &a );
 
 		m_pPowerupGlowEffect->SetColor( Vector( r, g, b ) );
+		m_pPowerupGlowEffect->SetAlpha( a );
 	}
 }
 
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void C_TFPlayer::GetGlowEffectColor( float *r, float *g, float *b )
+void C_TFPlayer::GetGlowEffectColor( float *r, float *g, float *b, float *a )
 {
+	*a = 1.0f;
+
 #ifdef TF_CREEP_MODE
 	if ( TFGameRules() && TFGameRules()->IsCreepWaveMode() )
 	{
@@ -12070,7 +12083,7 @@ bool C_TFPlayer::ShouldShowPowerupGlowEffect()
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void C_TFPlayer::GetPowerupGlowEffectColor( float *r, float *g, float *b )
+void C_TFPlayer::GetPowerupGlowEffectColor( float *r, float *g, float *b, float *a )
 {
 	C_TFPlayer *pLocalPlayer = GetLocalTFPlayer();
 	// no need to add extra logics here. we already know that other players are glowing from SUPERNOVA
@@ -12079,10 +12092,11 @@ void C_TFPlayer::GetPowerupGlowEffectColor( float *r, float *g, float *b )
 		*r = 255;
 		*g = 255;
 		*b = 0;
+		*a = 1.0f;
 	}
 	else
 	{
-		GetGlowEffectColor( r, g, b );
+		GetGlowEffectColor( r, g, b, a );
 	}
 }
 

src/game/client/tf/c_tf_player.h

@@ -339,7 +339,7 @@ class C_TFPlayer : public C_BasePlayer, public IHasAttributes, public IInventory
 	void			SetTauntCameraTargets( float back, float up );
 
 	// TF-specific color values for GlowEffect
-	virtual void	GetGlowEffectColor( float *r, float *g, float *b );
+	virtual void	GetGlowEffectColor( float *r, float *g, float *b, float *a );
 	void UpdateGlowColor( void );
 
 	virtual const Vector&	GetRenderOrigin( void );
@@ -545,7 +545,7 @@ class C_TFPlayer : public C_BasePlayer, public IHasAttributes, public IInventory
 	bool ComputeCompetitiveVisibility(void);
 
 	bool ShouldShowPowerupGlowEffect();
-	void GetPowerupGlowEffectColor( float *r, float *g, float *b );
+	void GetPowerupGlowEffectColor( float *r, float *g, float *b, float *a );
 
 	void HandleTaunting( void );
 	void TauntCamInterpolation( void );

src/game/client/tf/player_vs_environment/c_tf_tank_boss.cpp

@@ -17,8 +17,9 @@ C_TFTankBoss::C_TFTankBoss()
 {
 }
 
-void C_TFTankBoss::GetGlowEffectColor( float *r, float *g, float *b )
+void C_TFTankBoss::GetGlowEffectColor( float *r, float *g, float *b, float *a )
 {
 	TeamplayRoundBasedRules()->GetTeamGlowColor( GetTeamNumber(), *r, *g, *b );
+	*a = 1.0f;
 }
 

src/game/client/tf/player_vs_environment/c_tf_tank_boss.h

@@ -13,7 +13,7 @@ class C_TFTankBoss : public C_TFBaseBoss
 
 	C_TFTankBoss();
 
-	virtual void GetGlowEffectColor( float *r, float *g, float *b );
+	virtual void GetGlowEffectColor( float *r, float *g, float *b, float *a );
 
 	// ITFMvMBossProgressUser
 	virtual const char* GetBossProgressImageName() const OVERRIDE { return "tank"; }

src/game/shared/tf/tf_dropped_weapon.cpp

@@ -453,7 +453,7 @@ void CTFDroppedWeapon::UpdateGlowEffect( void )
 	if ( m_bShouldGlowForLocalPlayer )
 	{
 		Vector color = Vector( 0.745f, 0.773f, 0.157f );
-		m_pGlowEffect = new CGlowObject( this, color, 1.0, true );
+		m_pGlowEffect = new CGlowObject( this, color, 1.0, true, true );
 	}
 }