add some quality cvars to menus

mastercoms · mastercoms · commit 0f36ee8665c3 · 2020-10-17T18:37:08.000-04:00
diff --git a/engine/audio/private/snd_dsp.cpp b/engine/audio/private/snd_dsp.cpp
@@ -5922,7 +5922,7 @@ int idsp_speaker;
 int idsp_spatial;
 int idsp_automatic;
 
-ConVar dsp_off		("dsp_off", "0", FCVAR_ALLOWED_IN_COMPETITIVE );						// set to 1 to disable all dsp processing
+ConVar dsp_off		("dsp_off", "0", FCVAR_ARCHIVE );						// set to 1 to disable all dsp processing
 ConVar dsp_slow_cpu ("dsp_slow_cpu", "0", FCVAR_ARCHIVE|FCVAR_DEMO );	// set to 1 if cpu bound - ie: does not process dsp_room fx
 ConVar snd_profile	("snd_profile", "0", FCVAR_DEMO );					// 1 - profile dsp, 2 - mix, 3 - load sound, 4 - all sound
 ConVar dsp_volume	("dsp_volume", "1.0", FCVAR_ARCHIVE|FCVAR_DEMO );	// 0.0 - 2.0; master dsp volume control
diff --git a/game/client/particlemgr.cpp b/game/client/particlemgr.cpp
@@ -1693,7 +1693,7 @@ bool CParticleMgr::RetireParticleCollections( CParticleSystemDefinition* pDef,
 }
 
 // Next, see if there are new particle systems that need early retirement
-static ConVar cl_particle_retire_cost( "cl_particle_retire_cost", "0", FCVAR_ALLOWED_IN_COMPETITIVE );
+static ConVar cl_particle_retire_cost( "cl_particle_retire_cost", "-10", FCVAR_ALLOWED_IN_COMPETITIVE );
 
 bool CParticleMgr::EarlyRetireParticleSystems( int nCount, ParticleSimListEntry_t *ppEffects )
 {
@@ -1749,7 +1749,18 @@ bool CParticleMgr::EarlyRetireParticleSystems( int nCount, ParticleSimListEntry_
 	{
 		CParticleSystemDefinition* pDef = ppDefs[i];
 		int nActualCount = ComputeParticleDefScreenArea( nCount, pInfo, &flScreenArea, pDef, *pViewSetup, worldToScreen, flFocalDist );
-		if ( flScreenArea > flMaxScreenArea )
+		bool bShouldRetire;
+		// If negative, then max screen area acts as a cap rather than a floor
+		// This is to accomodate particle "LOD" instead of the old way of retiring high fill particles
+		if ( flMaxScreenArea >= 0 )
+		{
+			bShouldRetire = flScreenArea > flMaxScreenArea;
+		}
+		else
+		{
+		    bShouldRetire = flScreenArea < -flMaxScreenArea;
+		}
+		if ( bShouldRetire )
 		{
 			if ( RetireParticleCollections( pDef, nActualCount, pInfo, flScreenArea, flMaxScreenArea ) )
 			{
diff --git a/gameui/OptionsSubAudio.cpp b/gameui/OptionsSubAudio.cpp
@@ -32,6 +32,7 @@ enum SoundQuality_e
 	SOUNDQUALITY_LOW,
 	SOUNDQUALITY_MEDIUM,
 	SOUNDQUALITY_HIGH,
+	SOUNDQUALITY_ULTRA
 };
 
 //-----------------------------------------------------------------------------
@@ -48,6 +49,7 @@ COptionsSubAudio::COptionsSubAudio(vgui::Panel *parent) : PropertyPage(parent, N
 	m_pCloseCaptionCombo->AddItem( "#GameUI_Subtitles", NULL );
 
 	m_pSoundQualityCombo = new ComboBox( this, "SoundQuality", 6, false );
+	m_pSoundQualityCombo->AddItem( "#GameUI_Ultra", new KeyValues("SoundQuality", "quality", SOUNDQUALITY_ULTRA) );
 	m_pSoundQualityCombo->AddItem( "#GameUI_High", new KeyValues("SoundQuality", "quality", SOUNDQUALITY_HIGH) );
 	m_pSoundQualityCombo->AddItem( "#GameUI_Medium", new KeyValues("SoundQuality", "quality", SOUNDQUALITY_MEDIUM) );
 	m_pSoundQualityCombo->AddItem( "#GameUI_Low", new KeyValues("SoundQuality", "quality", SOUNDQUALITY_LOW) );
@@ -134,14 +136,19 @@ void COptionsSubAudio::OnResetData()
 	// sound quality is made up from several cvars
 	ConVarRef Snd_PitchQuality("Snd_PitchQuality");
 	ConVarRef dsp_slow_cpu("dsp_slow_cpu");
+	ConVarRef dsp_off("dsp_off");
 	int quality = SOUNDQUALITY_LOW;
+	if (dsp_off.GetBool() == false)
+	{
+	    quality = SOUNDQUALITY_MEDIUM;
+	}
 	if (dsp_slow_cpu.GetBool() == false)
 	{
-		quality = SOUNDQUALITY_MEDIUM;
+		quality = SOUNDQUALITY_HIGH;
 	}
 	if (Snd_PitchQuality.GetBool())
 	{
-		quality = SOUNDQUALITY_HIGH;
+		quality = SOUNDQUALITY_ULTRA;
 	}
 	// find the item in the list and activate it
 	{for (int itemID = 0; itemID < m_pSoundQualityCombo->GetItemCount(); itemID++)
@@ -259,20 +266,24 @@ void COptionsSubAudio::OnApplyChanges()
 	// quality
 	ConVarRef Snd_PitchQuality( "Snd_PitchQuality" );
 	ConVarRef dsp_slow_cpu( "dsp_slow_cpu" );
+	ConVarRef dsp_off("dsp_off");
 	int quality = m_pSoundQualityCombo->GetActiveItemUserData()->GetInt( "quality" );
 	switch ( quality )
 	{
 	case SOUNDQUALITY_LOW:
+		dsp_off.SetValue(true);
 		dsp_slow_cpu.SetValue(true);
 		Snd_PitchQuality.SetValue(false);
 		break;
 	case SOUNDQUALITY_MEDIUM:
+		dsp_off.SetValue(false);
 		dsp_slow_cpu.SetValue(false);
 		Snd_PitchQuality.SetValue(false);
 		break;
 	default:
 		Assert("Undefined sound quality setting.");
 	case SOUNDQUALITY_HIGH:
+		dsp_off.SetValue(false);
 		dsp_slow_cpu.SetValue(false);
 		Snd_PitchQuality.SetValue(true);
 		break;
diff --git a/gameui/OptionsSubVideo.cpp b/gameui/OptionsSubVideo.cpp
@@ -417,6 +417,7 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
 
 		m_pShaderDetail = new ComboBox( this, "ShaderDetail", 6, false );
 		m_pShaderDetail->AddItem("#gameui_low", NULL);
+		m_pShaderDetail->AddItem("#gameui_medium", NULL);
 		m_pShaderDetail->AddItem("#gameui_high", NULL);
 
 		m_pColorCorrection = new ComboBox( this, "ColorCorrection", 2, false );
@@ -637,7 +638,7 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
 		else
 			SetComboItemAsRecommended( m_pShadowDetail, 0 );	// Blobbies
 
-		SetComboItemAsRecommended( m_pShaderDetail, nReduceFillRate ? 0 : 1 );
+		SetComboItemAsRecommended( m_pShaderDetail, nReduceFillRate ? 1 : 2 );
 		
 #ifndef _X360
 		if ( nWaterUseRealtimeReflection )
@@ -750,7 +751,10 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
 			ApplyChangesToConVar( "r_flashlightdepthtexture", 1 );			// Turn on shadow depth textures
 		}
 
-		ApplyChangesToConVar( "mat_reducefillrate", ( m_pShaderDetail->GetActiveItem() > 0 ) ? 0 : 1 );
+		ApplyChangesToConVar( "mat_reducefillrate", ( m_pShaderDetail->GetActiveItem() > 1 ) ? 0 : 1 );
+		ApplyChangesToConVar( "mat_phong", ( m_pShaderDetail->GetActiveItem() < 1 ) ? 0 : 1 );
+		ApplyChangesToConVar( "r_force_fastpath", ( m_pShaderDetail->GetActiveItem() > 0 ) ? 0 : 1 );
+		ApplyChangesToConVar( "r_skybox_lowend", ( m_pShaderDetail->GetActiveItem() > 0 ) ? 0 : 1 );
 
 		switch ( m_pWaterDetail->GetActiveItem() )
 		{
@@ -808,6 +812,9 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
 #endif
 		ConVarRef r_waterforcereflectentities( "r_waterforcereflectentities" );
 		ConVarRef mat_reducefillrate("mat_reducefillrate" );
+		ConVarRef mat_phong("mat_phong");
+		ConVarRef r_force_fastpath("r_force_fastpath");
+		ConVarRef r_skybox_lowend("r_skybox_lowend");
 		ConVarRef mat_hdr_level( "mat_hdr_level" );
 		ConVarRef mat_colorcorrection( "mat_colorcorrection" );
 		ConVarRef mat_motion_blur_enabled( "mat_motion_blur_enabled" );
@@ -832,7 +839,22 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
 			m_pShadowDetail->ActivateItem( 0 );
 		}
 
-		m_pShaderDetail->ActivateItem( mat_reducefillrate.GetBool() ? 0 : 1 );
+		
+		if (mat_reducefillrate.GetBool())
+		{
+			if (mat_phong.GetBool() && r_force_fastpath.GetBool() && r_skybox_lowend.GetBool())
+			{
+			    m_pShaderDetail->ActivateItem( 0 );
+			}
+			else
+			{
+			    m_pShaderDetail->ActivateItem( 1 );
+			}
+		}
+		else
+		{
+		    m_pShaderDetail->ActivateItem( 2 );
+		}
 		m_pHDR->ActivateItem(clamp(mat_hdr_level.GetInt(), 0, 2));
 
 		switch (mat_forceaniso.GetInt())
diff --git a/materialsystem/cmaterialsystem.cpp b/materialsystem/cmaterialsystem.cpp
@@ -1756,7 +1756,7 @@ static ConVar mat_showmiplevels(	"mat_showmiplevels", "0", FCVAR_CHEAT, "color-c
 
 static ConVar mat_specular(			"mat_specular", "1", FCVAR_ALLOWED_IN_COMPETITIVE, "Enable/Disable specularity for perf testing.  Will cause a material reload upon change." );
 static ConVar mat_bumpmap(			"mat_bumpmap", "1", FCVAR_ALLOWED_IN_COMPETITIVE );
-static ConVar mat_phong(			"mat_phong", "1" );
+static ConVar mat_phong(			"mat_phong", "1", FCVAR_ARCHIVE, "", false, 0, false, 0, true, 1, true, 1, NULL);
 static ConVar mat_parallaxmap(		"mat_parallaxmap", "0", FCVAR_HIDDEN | FCVAR_ALLOWED_IN_COMPETITIVE );
 static ConVar mat_reducefillrate(	"mat_reducefillrate", "0", FCVAR_ALLOWED_IN_COMPETITIVE );
 
diff --git a/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.cpp b/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.cpp
@@ -21,7 +21,7 @@ ConVar mat_disable_fancy_blending( "mat_disable_fancy_blending", "0" );
 ConVar mat_fullbright( "mat_fullbright","0", FCVAR_CHEAT );
 ConVar my_mat_fullbright( "mat_fullbright","0", FCVAR_CHEAT );
 extern ConVar r_flashlight_version2;
-static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_NONE);
+static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_ARCHIVE, "", false, 0, false, 0, true, 0, true, 0, NULL);
 
 class CLightmappedGeneric_DX9_Context : public CBasePerMaterialContextData
 {
diff --git a/materialsystem/stdshaders/skin_dx9_helper.cpp b/materialsystem/stdshaders/skin_dx9_helper.cpp
@@ -24,7 +24,7 @@
 static ConVar mat_fullbright( "mat_fullbright", "0", FCVAR_CHEAT );
 static ConVar r_lightwarpidentity( "r_lightwarpidentity", "0", FCVAR_CHEAT );
 static ConVar r_rimlight( "r_rimlight", "1", FCVAR_NONE );
-static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_NONE);
+static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_ARCHIVE, "", false, 0, false, 0, true, 0, true, 0, NULL);
 
 // Textures may be bound to the following samplers:
 //	SHADER_SAMPLER0	 Base (Albedo) / Gloss in alpha
diff --git a/materialsystem/stdshaders/worldtwotextureblend.cpp b/materialsystem/stdshaders/worldtwotextureblend.cpp
@@ -18,7 +18,7 @@
 #include "tier0/memdbgon.h"
 
 extern ConVar r_flashlight_version2;
-static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_NONE);
+static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_ARCHIVE, "", false, 0, false, 0, true, 0, true, 0, NULL);
 
 // FIXME: Need to make a dx9 version so that "CENTROID" works.
 BEGIN_VS_SHADER( WorldTwoTextureBlend, 

Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,7 @@ bool CParticleMgr::RetireParticleCollections( CParticleSystemDefinition* pDef,`
`1693`	`1693`	`}`
`1694`	`1694`
`1695`	`1695`	`// Next, see if there are new particle systems that need early retirement`
`1696`		`-static ConVar cl_particle_retire_cost( "cl_particle_retire_cost", "0", FCVAR_ALLOWED_IN_COMPETITIVE );`
	`1696`	`+static ConVar cl_particle_retire_cost( "cl_particle_retire_cost", "-10", FCVAR_ALLOWED_IN_COMPETITIVE );`
`1697`	`1697`
`1698`	`1698`	`bool CParticleMgr::EarlyRetireParticleSystems( int nCount, ParticleSimListEntry_t *ppEffects )`
`1699`	`1699`	`{`
`@@ -1749,7 +1749,18 @@ bool CParticleMgr::EarlyRetireParticleSystems( int nCount, ParticleSimListEntry_`
`1749`	`1749`	`{`
`1750`	`1750`	`CParticleSystemDefinition* pDef = ppDefs[i];`
`1751`	`1751`	`int nActualCount = ComputeParticleDefScreenArea( nCount, pInfo, &flScreenArea, pDef, *pViewSetup, worldToScreen, flFocalDist );`
`1752`		`- if ( flScreenArea > flMaxScreenArea )`
	`1752`	`+ bool bShouldRetire;`
	`1753`	`+ // If negative, then max screen area acts as a cap rather than a floor`
	`1754`	`+ // This is to accomodate particle "LOD" instead of the old way of retiring high fill particles`
	`1755`	`+ if ( flMaxScreenArea >= 0 )`
	`1756`	`+ {`
	`1757`	`+ bShouldRetire = flScreenArea > flMaxScreenArea;`
	`1758`	`+ }`
	`1759`	`+ else`
	`1760`	`+ {`
	`1761`	`+ bShouldRetire = flScreenArea < -flMaxScreenArea;`
	`1762`	`+ }`
	`1763`	`+ if ( bShouldRetire )`
`1753`	`1764`	`{`
`1754`	`1765`	`if ( RetireParticleCollections( pDef, nActualCount, pInfo, flScreenArea, flMaxScreenArea ) )`
`1755`	`1766`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ ConVar mat_disable_fancy_blending( "mat_disable_fancy_blending", "0" );`
`21`	`21`	`ConVar mat_fullbright( "mat_fullbright","0", FCVAR_CHEAT );`
`22`	`22`	`ConVar my_mat_fullbright( "mat_fullbright","0", FCVAR_CHEAT );`
`23`	`23`	`extern ConVar r_flashlight_version2;`
`24`		`-static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_NONE);`
	`24`	`+static ConVar r_force_fastpath("r_force_fastpath", "0", FCVAR_ARCHIVE, "", false, 0, false, 0, true, 0, true, 0, NULL);`
`25`	`25`
`26`	`26`	`class CLightmappedGeneric_DX9_Context : public CBasePerMaterialContextData`
`27`	`27`	`{`