Switch lightFactor to use u_ColorModulateColorGen

`tr.mapLightFactor` is already in `u_ColorModulateColorGen` anyway, so there's no need for the extra uniform.

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -285,12 +285,8 @@ void UpdateSurfaceDataLightMapping( uint32_t* materials, Material& material, dra
 	bool enableGridLighting = ( lightMode == lightMode_t::GRID );
 	bool enableGridDeluxeMapping = ( deluxeMode == deluxeMode_t::GRID );
 
-	// u_LightFactor
-	gl_lightMappingShaderMaterial->SetUniform_LightFactor(
-		lightMode == lightMode_t::FULLBRIGHT ? 1.0f : tr.mapLightFactor );
-
 	// u_ColorModulate
-	gl_lightMappingShaderMaterial->SetUniform_ColorModulateColorGen( rgbGen, alphaGen );
+	gl_lightMappingShaderMaterial->SetUniform_ColorModulateColorGen( rgbGen, alphaGen, false, lightMode != lightMode_t::FULLBRIGHT );
 
 	// u_Color
 	gl_lightMappingShaderMaterial->SetUniform_Color( tess.svars.color );

src/engine/renderer/gl_shader.cpp

@@ -2267,7 +2267,6 @@ GLShader_lightMapping::GLShader_lightMapping( GLShaderManager *manager ) :
 	u_ViewOrigin( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_LightFactor( this ),
 	u_Bones( this ),
 	u_VertexInterpolation( this ),
 	u_ReliefDepthScale( this ),
@@ -2336,7 +2335,6 @@ GLShader_lightMappingMaterial::GLShader_lightMappingMaterial( GLShaderManager* m
 	u_ViewOrigin( this ),
 	u_ModelMatrix( this ),
 	u_ModelViewProjectionMatrix( this ),
-	u_LightFactor( this ),
 	u_ReliefDepthScale( this ),
 	u_ReliefOffsetBias( this ),
 	u_NormalScale( this ),

src/engine/renderer/gl_shader.h

@@ -2136,21 +2136,6 @@ class GLCompileMacro_USE_PHYSICAL_MAPPING :
 	}
 };
 
-class u_LightFactor :
-	GLUniform1f
-{
-public:
-	u_LightFactor( GLShader *shader ) :
-		GLUniform1f( shader, "u_LightFactor" )
-	{
-	}
-
-	void SetUniform_LightFactor( const float lightFactor )
-	{
-		this->SetValue( lightFactor );
-	}
-};
-
 class u_ColorMap :
 	GLUniformSampler2D {
 	public:
@@ -3621,7 +3606,7 @@ class u_ColorModulateColorGen :
 	}
 
 	void SetUniform_ColorModulateColorGen( colorGen_t colorGen, alphaGen_t alphaGen, bool vertexOverbright = false,
-		const bool styleLightMap = false ) {
+		const bool useMapLightFactor = false ) {
 		uint32_t colorModulate = 0;
 		bool needAttrib = false;
 
@@ -3654,7 +3639,7 @@ class u_ColorModulateColorGen :
 				break;
 		}
 
-		if ( styleLightMap ) {
+		if ( useMapLightFactor ) {
 			ASSERT_EQ( vertexOverbright, false );
 			colorModulate |= uint32_t( tr.mapLightFactor ) << 5;
 		} else {
@@ -4013,7 +3998,6 @@ class GLShader_lightMapping :
 	public u_ViewOrigin,
 	public u_ModelMatrix,
 	public u_ModelViewProjectionMatrix,
-	public u_LightFactor,
 	public u_Bones,
 	public u_VertexInterpolation,
 	public u_ReliefDepthScale,
@@ -4065,7 +4049,6 @@ class GLShader_lightMappingMaterial :
 	public u_ViewOrigin,
 	public u_ModelMatrix,
 	public u_ModelViewProjectionMatrix,
-	public u_LightFactor,
 	public u_ReliefDepthScale,
 	public u_ReliefOffsetBias,
 	public u_NormalScale,

src/engine/renderer/glsl_source/common.glsl

@@ -2,7 +2,7 @@
 ===========================================================================
 
 Daemon BSD Source Code
-Copyright (c) 2024 Daemon Developers
+Copyright (c) 2024-2025 Daemon Developers
 All rights reserved.
 
 This file is part of the Daemon BSD Source Code (Daemon Source Code).

src/engine/renderer/glsl_source/computeLight_fp.glsl

@@ -23,8 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define COMPUTELIGHT_GLSL
 
-uniform float u_LightFactor;
-
 #if !defined(USE_BSP_SURFACE)
 	#define USE_MODEL_SURFACE
 #endif
@@ -52,13 +50,13 @@ vec4 EnvironmentalSpecularFactor( vec3 viewDir, vec3 normal )
 // lighting helper functions
 
 #if defined(USE_GRID_LIGHTING) || defined(USE_GRID_DELUXE_MAPPING)
-	void ReadLightGrid( in vec4 texel, out vec3 ambientColor, out vec3 lightColor ) {
+	void ReadLightGrid( in vec4 texel, in float lightFactor, out vec3 ambientColor, out vec3 lightColor ) {
 		float ambientScale = 2.0 * texel.a;
 		float directedScale = 2.0 - ambientScale;
 		ambientColor = ambientScale * texel.rgb;
 		lightColor = directedScale * texel.rgb;
-		ambientColor *= u_LightFactor;
-		lightColor *= u_LightFactor;
+		ambientColor *= lightFactor;
+		lightColor *= lightFactor;
 	}
 #endif
 

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* lightMapping_fp.glsl */
 
+#insert common
 #insert computeLight_fp
 #insert reliefMapping_fp
 
@@ -34,6 +35,8 @@ uniform sampler2D	u_GlowMap;
 uniform float		u_AlphaThreshold;
 uniform vec3		u_ViewOrigin;
 
+uniform uint u_ColorModulateColorGen;
+
 IN(smooth) vec3		var_Position;
 IN(smooth) vec2		var_TexCoords;
 IN(smooth) vec4		var_Color;
@@ -140,19 +143,20 @@ void main()
 		vec4 texel = texture3D(u_LightGrid2, lightGridPos);
 		vec3 lightDir = normalize(texel.xyz - (128.0 / 255.0));
 	#endif
-
+	
+	float lightFactor = ColorModulateToLightFactor( u_ColorModulateColorGen );
 	#if defined(USE_LIGHT_MAPPING)
 		// Compute light color from world space lightmap.
 		// When doing vertex lighting with full-range overbright, this reads out
 		// 1<<overbrightBits and serves for the overbright shift for vertex colors.
 		vec3 lightColor = texture2D(u_LightMap, var_TexLight).rgb;
-		lightColor *= u_LightFactor;
+		lightColor *= lightFactor;
 
 		color.rgb = vec3(0.0);
 	#else
 		// Compute light color from lightgrid.
 		vec3 ambientColor, lightColor;
-		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), ambientColor, lightColor);
+		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), lightFactor, ambientColor, lightColor);
 
 		color.rgb = ambientColor * r_AmbientScale * diffuse.rgb;
 	#endif

src/engine/renderer/glsl_source/liquid_fp.glsl

@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* liquid_fp.glsl */
 
+#insert common
 #insert computeLight_fp
 #insert reliefMapping_fp
 
@@ -30,7 +31,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 uniform sampler2D	u_CurrentMap;
 uniform sampler2D	u_PortalMap;
 uniform sampler2D	u_DepthMap;
+
 uniform vec3		u_ViewOrigin;
+
+uniform uint u_ColorModulateColorGen;
+
 uniform float		u_FogDensity;
 uniform vec3		u_FogColor;
 uniform float		u_RefractionIndex;
@@ -131,7 +136,8 @@ void	main()
 	// compute light color from light grid
 	vec3 ambientColor, lightColor;
 	#if defined(USE_GRID_LIGHTING) || defined(USE_GRID_DELUXE_MAPPING)
-		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), ambientColor, lightColor);
+		float lightFactor = ColorModulateToLightFactor( u_ColorModulateColorGen );
+		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), lightFactor, ambientColor, lightColor);
 	#else // !( defined(USE_GRID_LIGHTING) && defined(USE_GRID_DELUXE_MAPPING) )
 		ambientColor = vec3( 0.0, 0.0, 0.0 );
 		lightColor = vec3( 0.0, 0.0, 0.0 );

src/engine/renderer/tr_shade.cpp

@@ -1059,12 +1059,8 @@ void Render_lightMapping( shaderStage_t *pStage )
 	// u_DeformGen
 	gl_lightMappingShader->SetUniform_Time( backEnd.refdef.floatTime - backEnd.currentEntity->e.shaderTime );
 
-	// u_LightFactor
-	gl_lightMappingShader->SetUniform_LightFactor(
-		lightMode == lightMode_t::FULLBRIGHT ? 1.0f : tr.mapLightFactor );
-
 	// u_ColorModulate
-	gl_lightMappingShader->SetUniform_ColorModulateColorGen( rgbGen, alphaGen );
+	gl_lightMappingShader->SetUniform_ColorModulateColorGen( rgbGen, alphaGen, false, lightMode != lightMode_t::FULLBRIGHT );
 
 	// u_Color
 	gl_lightMappingShader->SetUniform_Color( tess.svars.color );