Add support for top vignette in postprocess_controller

Author: Blixibon

sp/src/game/client/viewpostprocess.cpp

@@ -1301,6 +1301,10 @@ class CEnginePostMaterialProxy : public CEntityMaterialProxy
 	IMaterialVar *m_pMaterialParam_VignetteEnd;
 	IMaterialVar *m_pMaterialParam_VignetteBlurEnable;
 	IMaterialVar *m_pMaterialParam_VignetteBlurStrength;
+#ifdef MAPBASE
+	IMaterialVar *m_pMaterialParam_VignetteEnable;
+	IMaterialVar *m_pMaterialParam_VignetteStrength;
+#endif
 	IMaterialVar *m_pMaterialParam_FadeToBlackStrength;
 	IMaterialVar *m_pMaterialParam_DepthBlurFocalDistance;
 	IMaterialVar *m_pMaterialParam_DepthBlurStrength;
@@ -1353,6 +1357,10 @@ CEnginePostMaterialProxy::CEnginePostMaterialProxy()
 	m_pMaterialParam_VignetteEnd				= NULL;
 	m_pMaterialParam_VignetteBlurEnable			= NULL;
 	m_pMaterialParam_VignetteBlurStrength		= NULL;
+#ifdef MAPBASE
+	m_pMaterialParam_VignetteEnable				= NULL;
+	m_pMaterialParam_VignetteStrength			= NULL;
+#endif
 	m_pMaterialParam_FadeToBlackStrength		= NULL;
 	m_pMaterialParam_DepthBlurFocalDistance		= NULL;
 	m_pMaterialParam_DepthBlurStrength			= NULL;
@@ -1388,6 +1396,10 @@ bool CEnginePostMaterialProxy::Init( IMaterial *pMaterial, KeyValues *pKeyValues
 	m_pMaterialParam_VignetteEnd = pMaterial->FindVar( "$localContrastVignetteEnd", &bFoundVar, false );
 	m_pMaterialParam_VignetteBlurEnable = pMaterial->FindVar( "$blurredVignetteEnable", &bFoundVar, false );
 	m_pMaterialParam_VignetteBlurStrength = pMaterial->FindVar( "$blurredVignetteScale", &bFoundVar, false );
+#ifdef MAPBASE
+	m_pMaterialParam_VignetteEnable = pMaterial->FindVar( "$vignetteEnable", &bFoundVar, false );
+	m_pMaterialParam_VignetteStrength = pMaterial->FindVar( "$vignetteStrength", &bFoundVar, false );
+#endif
 	m_pMaterialParam_FadeToBlackStrength = pMaterial->FindVar( "$fadeToBlackScale", &bFoundVar, false );
 	m_pMaterialParam_DepthBlurFocalDistance = pMaterial->FindVar( "$depthBlurFocalDistance", &bFoundVar, false );
 	m_pMaterialParam_DepthBlurStrength = pMaterial->FindVar( "$depthBlurStrength", &bFoundVar, false );
@@ -1437,6 +1449,14 @@ void CEnginePostMaterialProxy::OnBind( C_BaseEntity *pEnt )
 	if ( m_pMaterialParam_VignetteBlurStrength )
 		m_pMaterialParam_VignetteBlurStrength->SetFloatValue( s_LocalPostProcessParameters.m_flParameters[ PPPN_VIGNETTE_BLUR_STRENGTH ] );
 
+#ifdef MAPBASE
+	if ( m_pMaterialParam_VignetteEnable )
+		m_pMaterialParam_VignetteEnable->SetIntValue( s_LocalPostProcessParameters.m_flParameters[ PPPN_TOP_VIGNETTE_STRENGTH ] > 0.0f ? 1 : 0 );
+	
+	if (m_pMaterialParam_VignetteStrength)
+		m_pMaterialParam_VignetteStrength->SetFloatValue( s_LocalPostProcessParameters.m_flParameters[ PPPN_TOP_VIGNETTE_STRENGTH ] );
+#endif
+
 	if ( m_pMaterialParam_FadeToBlackStrength )
 		m_pMaterialParam_FadeToBlackStrength->SetFloatValue( s_LocalPostProcessParameters.m_flParameters[ PPPN_FADE_TO_BLACK_STRENGTH ] );
 

sp/src/game/server/postprocesscontroller.cpp

@@ -42,6 +42,9 @@ BEGIN_DATADESC( CPostProcessController )
 	DEFINE_KEYFIELD( m_flPostProcessParameters[ PPPN_DEPTH_BLUR_STRENGTH ], FIELD_FLOAT, "depthblurstrength" ),
 	DEFINE_KEYFIELD( m_flPostProcessParameters[ PPPN_SCREEN_BLUR_STRENGTH ], FIELD_FLOAT, "screenblurstrength" ),
 	DEFINE_KEYFIELD( m_flPostProcessParameters[ PPPN_FILM_GRAIN_STRENGTH ], FIELD_FLOAT, "filmgrainstrength" ),
+#ifdef MAPBASE
+	DEFINE_KEYFIELD( m_flPostProcessParameters[ PPPN_TOP_VIGNETTE_STRENGTH ], FIELD_FLOAT, "topvignettestrength" ),
+#endif
 
 	// Inputs
 	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetFadeTime", InputSetFadeTime ),
@@ -55,6 +58,9 @@ BEGIN_DATADESC( CPostProcessController )
 	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetDepthBlurStrength", InputSetDepthBlurStrength ),
 	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetScreenBlurStrength", InputSetScreenBlurStrength ),
 	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetFilmGrainStrength", InputSetFilmGrainStrength ),
+#ifdef MAPBASE
+	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetTopVignetteStrength", InputSetTopVignetteStrength ),
+#endif
 END_DATADESC()
 
 IMPLEMENT_SERVERCLASS_ST( CPostProcessController, DT_PostProcessController )
@@ -139,6 +145,13 @@ void CPostProcessController::InputSetFilmGrainStrength( inputdata_t &inputdata )
 	m_flPostProcessParameters.Set( PPPN_FILM_GRAIN_STRENGTH, inputdata.value.Float() );
 }
 
+#ifdef MAPBASE
+void CPostProcessController::InputSetTopVignetteStrength( inputdata_t &inputdata )
+{
+	m_flPostProcessParameters.Set( PPPN_TOP_VIGNETTE_STRENGTH, inputdata.value.Float() );
+}
+#endif
+
 //-----------------------------------------------------------------------------
 // Purpose: Clear out the PostProcess controller.
 //-----------------------------------------------------------------------------

sp/src/game/server/postprocesscontroller.h

@@ -33,6 +33,9 @@ class CPostProcessController : public CBaseEntity
 	void InputSetDepthBlurStrength(inputdata_t &data);
 	void InputSetScreenBlurStrength(inputdata_t &data);
 	void InputSetFilmGrainStrength(inputdata_t &data);
+#ifdef MAPBASE
+	void InputSetTopVignetteStrength(inputdata_t &data);
+#endif
 
 	void InputTurnOn(inputdata_t &data);
 	void InputTurnOff(inputdata_t &data);

sp/src/game/shared/postprocess_shared.h

@@ -24,6 +24,9 @@ enum PostProcessParameterNames_t
 	PPPN_DEPTH_BLUR_STRENGTH,
 	PPPN_SCREEN_BLUR_STRENGTH,
 	PPPN_FILM_GRAIN_STRENGTH,
+#ifdef MAPBASE
+	PPPN_TOP_VIGNETTE_STRENGTH,
+#endif
 
 	POST_PROCESS_PARAMETER_COUNT
 };

sp/src/materialsystem/stdshaders/SDK_engine_post_ps20b.fxc

@@ -75,6 +75,7 @@ float4	g_vLocalContrastVignetteParams	: register( c9 );
 #define g_flLocalContrastVignetteStart	g_vLocalContrastVignetteParams.x
 #define g_flLocalContrastVignetteEnd	g_vLocalContrastVignetteParams.y
 #define g_flLocalContrastEdgeStrength	g_vLocalContrastVignetteParams.z
+#define g_flVignetteStrength			g_vLocalContrastVignetteParams.w
 
 float	g_flFadeToBlackStrength			: register( c10 );
 
@@ -401,6 +402,8 @@ float4 main( PS_INPUT i ) : COLOR
 		// This tex2D solves the 3 lines of math above
 		flVignette = tex2D( VignetteSampler, vUv.xy ).r; // Red is for the PC
 		flVignette = saturate( flVignette * 0.55 + 0.46 );
+		
+		flVignette = lerp( 1.0, flVignette, g_flVignetteStrength );
 
 		outColor.rgb *= flVignette;
 	}

sp/src/materialsystem/stdshaders/engine_post_dx9.cpp

@@ -89,6 +89,9 @@ BEGIN_VS_SHADER_FLAGS( SDK_Engine_Post_dx9, "Engine post-processing effects (sof
 		SHADER_PARAM( COLORCORRECTIONMASK,		SHADER_PARAM_TYPE_TEXTURE, "_rt_ColCorrectMask", "" )
 		SHADER_PARAM( COLCORRECT_EXCLUDEMASK,	SHADER_PARAM_TYPE_INTEGER, "0", "" )
 		SHADER_PARAM( COLCORRECT_EXCLUDEEXPONENT,	SHADER_PARAM_TYPE_FLOAT, "1.0", "" )
+
+		// Vignette strength
+		SHADER_PARAM( VIGNETTESTRENGTH,			SHADER_PARAM_TYPE_FLOAT,	"1",				"" )
 #endif
 	END_SHADER_PARAMS
 
@@ -242,6 +245,12 @@ BEGIN_VS_SHADER_FLAGS( SDK_Engine_Post_dx9, "Engine post-processing effects (sof
 		{
 			params[ DESATURATION ]->SetFloatValue( 0.0f );
 		}
+#ifdef MAPBASE
+		if ( !params[ VIGNETTESTRENGTH ]->IsDefined() )
+		{
+			params[ VIGNETTESTRENGTH ]->SetFloatValue( 1.0f );
+		}
+#endif
 
 		SET_FLAGS2( MATERIAL_VAR2_NEEDS_FULL_FRAME_BUFFER_TEXTURE );
 	}
@@ -604,6 +613,9 @@ BEGIN_VS_SHADER_FLAGS( SDK_Engine_Post_dx9, "Engine post-processing effects (sof
 				{
 					vPsConst[2] = mat_local_contrast_edge_scale_override.GetFloat();
 				}
+#ifdef MAPBASE
+				vPsConst[3] = params[ VIGNETTESTRENGTH ]->GetFloatValue();
+#endif
 				pShaderAPI->SetPixelShaderConstant( 9, vPsConst, 1 );
 			}