Change r_forceAmbient to a new-style cvar

DaemonEngine · Jan 20, 2025 · beccd92 · beccd92
1 parent 67325dc
commit beccd92
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/engine/renderer/tr_bsp.cpp b/src/engine/renderer/tr_bsp.cpp
@@ -4124,10 +4124,10 @@ void R_LoadLightGrid( lump_t *l )
 		tmpDirected[ 2 ] = in->directed[ 2 ];
 		tmpDirected[ 3 ] = 255;
 
-		if ( tmpAmbient[0] < r_forceAmbient->value &&
-			tmpAmbient[1] < r_forceAmbient->value &&
-			tmpAmbient[2] < r_forceAmbient->value ) {
-			VectorSet( tmpAmbient, r_forceAmbient->value, r_forceAmbient->value, r_forceAmbient->value );
+		if ( tmpAmbient[0] < r_forceAmbient.Get() &&
+			tmpAmbient[1] < r_forceAmbient.Get() &&
+			tmpAmbient[2] < r_forceAmbient.Get() ) {
+			VectorSet( tmpAmbient, r_forceAmbient.Get(), r_forceAmbient.Get(), r_forceAmbient.Get() );
 		}
 
 		if ( tr.legacyOverBrightClamping )
@@ -4352,7 +4352,7 @@ void R_LoadEntities( lump_t *l, std::string &externalEntities )
 		// check for ambient color
 		else if ( !Q_stricmp( keyname, "_color" ) || !Q_stricmp( keyname, "ambientColor" ) )
 		{
-			if ( r_forceAmbient->value <= 0 ) {
+			if ( r_forceAmbient.Get() == 0 ) {
 				sscanf( value, "%f %f %f", &tr.ambientLight[0], &tr.ambientLight[1],
 					&tr.ambientLight[2] );
 

diff --git a/src/engine/renderer/tr_init.cpp b/src/engine/renderer/tr_init.cpp
@@ -216,7 +216,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 	cvar_t      *r_wolfFog;
 	cvar_t      *r_noFog;
 
-	cvar_t      *r_forceAmbient;
+	Cvar::Range<Cvar::Cvar<float>> r_forceAmbient( "r_forceAmbient", "Minimal light amount in lightGrid", Cvar::NONE,
+		0.125f, 0.0f, 0.3f );
 	cvar_t      *r_ambientScale;
 	cvar_t      *r_lightScale;
 	cvar_t      *r_debugSort;
@@ -1165,8 +1166,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 		r_wolfFog = Cvar_Get( "r_wolfFog", "1", CVAR_CHEAT );
 		r_noFog = Cvar_Get( "r_noFog", "0", CVAR_CHEAT );
 
-		r_forceAmbient = Cvar_Get( "r_forceAmbient", "0.125",  CVAR_LATCH );
-		AssertCvarRange( r_forceAmbient, 0.0f, 0.3f, false );
+		Cvar::Latch( r_forceAmbient );
 
 		r_smp = Cvar_Get( "r_smp", "0",  CVAR_LATCH );
 

diff --git a/src/engine/renderer/tr_light.cpp b/src/engine/renderer/tr_light.cpp
@@ -248,13 +248,13 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 
 	VectorNormalize( lightDir );
 
-	if ( ambientLight[ 0 ] < r_forceAmbient->value &&
-	     ambientLight[ 1 ] < r_forceAmbient->value &&
-	     ambientLight[ 2 ] < r_forceAmbient->value )
+	if ( ambientLight[ 0 ] < r_forceAmbient.Get() &&
+	     ambientLight[ 1 ] < r_forceAmbient.Get() &&
+	     ambientLight[ 2 ] < r_forceAmbient.Get() )
 	{
-		ambientLight[ 0 ] = r_forceAmbient->value;
-		ambientLight[ 1 ] = r_forceAmbient->value;
-		ambientLight[ 2 ] = r_forceAmbient->value;
+		ambientLight[ 0 ] = r_forceAmbient.Get();
+		ambientLight[ 1 ] = r_forceAmbient.Get();
+		ambientLight[ 2 ] = r_forceAmbient.Get();
 	}
 
 	return true;

diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h
@@ -2890,7 +2890,7 @@ enum class shaderProfilerRenderSubGroupsMode {
 	extern cvar_t *r_wolfFog;
 	extern cvar_t *r_noFog;
 
-	extern cvar_t *r_forceAmbient;
+	extern Cvar::Range<Cvar::Cvar<float>> r_forceAmbient;
 	extern cvar_t *r_ambientScale;
 	extern cvar_t *r_lightScale;