fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2025-02-17 01:22:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enabled entity glowing. Need to extend the functionality a bit to make it worthwhile. Make sure to update your basemod to get the materials needed.

Browse source
This commit is contained in:
hlstriker 2013-11-07 16:41:43 +00:00 committed by squeek
parent a7c5340a51
commit ffa5643e48
6 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mp/src/game/client/c_team_train_watcher.cpp
View file

@ -82,6 +82,8 @@ void C_TeamTrainWatcher::UpdateGlowEffect( void )
DestroyGlowEffect(); DestroyGlowEffect();
} }
// FF --> hlstriker: Commented
/*
// create a new effect if we have a cart // create a new effect if we have a cart
if ( m_hGlowEnt ) if ( m_hGlowEnt )
{ {
@ -89,6 +91,8 @@ void C_TeamTrainWatcher::UpdateGlowEffect( void )
TeamplayRoundBasedRules()->GetTeamGlowColor( GetTeamNumber(), r, g, b ); TeamplayRoundBasedRules()->GetTeamGlowColor( GetTeamNumber(), r, g, b );
m_pGlowEffect = new CGlowObject( m_hGlowEnt, Vector( r, g, b ), 1.0, true ); m_pGlowEffect = new CGlowObject( m_hGlowEnt, Vector( r, g, b ), 1.0, true );
} }
*/
// <--
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
mp/src/game/client/client_ff.vpc
View file

@ -19,7 +19,7 @@ $Configuration
$Compiler $Compiler
{ {
$AdditionalIncludeDirectories "$BASE;.\ff;$SRCDIR\game\shared\ff;$THIRDPARTYDIR\lua;$THIRDPARTYDIR" $AdditionalIncludeDirectories "$BASE;.\ff;$SRCDIR\game\shared\ff;$THIRDPARTYDIR\lua;$THIRDPARTYDIR"
$PreprocessorDefinitions "$BASE;FF;FF_CLIENT_DLL;SOURCE_2013" $PreprocessorDefinitions "$BASE;FF;FF_CLIENT_DLL;SOURCE_2013;GLOWS_ENABLE"
} }
} }

2
mp/src/game/client/clientmode_shared.cpp
View file

@ -745,6 +745,8 @@ int ClientModeShared::HudElementKeyInput( int down, ButtonCode_t keynum, const c
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool ClientModeShared::DoPostScreenSpaceEffects( const CViewSetup *pSetup ) bool ClientModeShared::DoPostScreenSpaceEffects( const CViewSetup *pSetup )
{ {
g_GlowObjectManager.RenderGlowEffects( pSetup, 0 /*GetSplitScreenPlayerSlot()*/ ); // FF --> hlstriker: Added
#if defined( REPLAY_ENABLED ) #if defined( REPLAY_ENABLED )
if ( engine->IsPlayingDemo() ) if ( engine->IsPlayingDemo() )
{ {

6
mp/src/game/client/viewrender.cpp
View file

@ -806,6 +806,12 @@ CLIENTEFFECT_REGISTER_BEGIN( PrecachePostProcessingEffects )
CLIENTEFFECT_MATERIAL( "dev/pyro_post" ) CLIENTEFFECT_MATERIAL( "dev/pyro_post" )
#endif #endif
// FF --> hlstriker: Added.
#ifdef GLOWS_ENABLE
CLIENTEFFECT_MATERIAL( "dev/glow_color" )
CLIENTEFFECT_MATERIAL( "dev/halo_add_to_screen" )
#endif
// FF <--
CLIENTEFFECT_REGISTER_END_CONDITIONAL( engine->GetDXSupportLevel() >= 90 ) CLIENTEFFECT_REGISTER_END_CONDITIONAL( engine->GetDXSupportLevel() >= 90 )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
mp/src/game/server/ff/ff_sv_player.cpp
View file

@ -27,6 +27,7 @@
#include "ilagcompensationmanager.h" #include "ilagcompensationmanager.h"
#include "ff_sh_team_manager.h" #include "ff_sh_team_manager.h"
// Don't alias here // Don't alias here
#if defined( CFF_SH_Player ) #if defined( CFF_SH_Player )
#undef CFF_SH_Player #undef CFF_SH_Player
@ -418,6 +419,8 @@ void CFF_SV_Player::SetPlayerTeamModel( void )
SetupPlayerSoundsByModel( szModelName ); SetupPlayerSoundsByModel( szModelName );
m_flNextModelChangeTime = gpGlobals->curtime + MODEL_CHANGE_INTERVAL; m_flNextModelChangeTime = gpGlobals->curtime + MODEL_CHANGE_INTERVAL;
AddGlowEffect();
} }
void CFF_SV_Player::SetPlayerModel( void ) void CFF_SV_Player::SetPlayerModel( void )

3
mp/src/game/server/server_ff.vpc
View file

@ -18,7 +18,7 @@ $Configuration
$Compiler $Compiler
{ {
$AdditionalIncludeDirectories "$BASE;.\ff;.\ff\other;.\ff\entities;$SRCDIR\game\shared\ff;$SRCDIR\game\shared\ff\other;$THIRDPARTYDIR\lua;$THIRDPARTYDIR" $AdditionalIncludeDirectories "$BASE;.\ff;.\ff\other;.\ff\entities;$SRCDIR\game\shared\ff;$SRCDIR\game\shared\ff\other;$THIRDPARTYDIR\lua;$THIRDPARTYDIR"
$PreprocessorDefinitions "$BASE;FF;FF_DLL" $PreprocessorDefinitions "$BASE;FF;FF_DLL;GLOWS_ENABLE"
} }
} }
@ -47,6 +47,7 @@ $Project "Server (FF)"
$File "ff\entities\ff_sv_point_ff_teamcheck.h" $File "ff\entities\ff_sv_point_ff_teamcheck.h"
$File "ff\entities\ff_sv_teamcheck_target.h" $File "ff\entities\ff_sv_teamcheck_target.h"
$File "ff\entities\ff_sv_teamcheck_target.cpp" $File "ff\entities\ff_sv_teamcheck_target.cpp"
$File "ff\entities\ff_sv_point_ff_message.cpp"
} }
$Folder "Other" $Folder "Other"
{ {