renderer: implement mapCompleteOverBright in GLSL

Author: illwieckz

src/engine/renderer/gl_shader.cpp

@@ -1573,6 +1573,7 @@ void GLShader_generic2D::SetShaderProgramUniforms( shaderProgram_t *shaderProgra
 
 GLShader_generic::GLShader_generic( GLShaderManager *manager ) :
 	GLShader( "generic", ATTR_POSITION | ATTR_TEXCOORD | ATTR_QTANGENT, manager ),
+	u_LightFactor( this ),
 	u_TextureMatrix( this ),
 	u_ViewOrigin( this ),
 	u_ViewUp( this ),
@@ -1610,6 +1611,7 @@ void GLShader_generic::SetShaderProgramUniforms( shaderProgram_t *shaderProgram
 GLShader_lightMapping::GLShader_lightMapping( GLShaderManager *manager ) :
 	GLShader( "lightMapping",
 	ATTR_POSITION | ATTR_TEXCOORD | ATTR_QTANGENT | ATTR_COLOR, manager ),
+	u_LightFactors( this ),
 	u_TextureMatrix( this ),
 	u_SpecularExponent( this ),
 	u_ColorModulate( this ),

src/engine/renderer/gl_shader.h

@@ -1425,6 +1425,36 @@ class GLCompileMacro_USE_ALPHA_TESTING :
 	}
 };
 
+class u_LightFactor :
+	GLUniform1i
+{
+public:
+	u_LightFactor( GLShader *shader ) :
+		GLUniform1i( shader, "u_LightFactor" )
+	{
+	}
+
+	void SetUniform_LightFactor( const int lightFactor )
+	{
+		this->SetValue( lightFactor );
+	}
+};
+
+class u_LightFactors :
+	GLUniform2i
+{
+public:
+	u_LightFactors( GLShader *shader ) :
+		GLUniform2i( shader, "u_LightFactors" )
+	{
+	}
+
+	void SetUniform_LightFactors( const ivec2_t lightFactors )
+	{
+		this->SetValue( lightFactors );
+	}
+};
+
 class u_TextureMatrix :
 	GLUniformMatrix4f
 {
@@ -2359,6 +2389,7 @@ class GLShader_generic2D :
 
 class GLShader_generic :
 	public GLShader,
+	public u_LightFactor,
 	public u_TextureMatrix,
 	public u_ViewOrigin,
 	public u_ViewUp,
@@ -2388,6 +2419,7 @@ class GLShader_generic :
 
 class GLShader_lightMapping :
 	public GLShader,
+	public u_LightFactors,
 	public u_TextureMatrix,
 	public u_SpecularExponent,
 	public u_ColorModulate,

src/engine/renderer/glsl_source/generic_fp.glsl

@@ -23,6 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /* generic_fp.glsl */
 
 uniform sampler2D	u_ColorMap;
+
+#if !defined(GENERIC_2D) && defined(USE_TCGEN_LIGHTMAP)
+uniform int u_LightFactor;
+#endif
+
 uniform float		u_AlphaThreshold;
 
 IN(smooth) vec2		var_TexCoords;
@@ -47,6 +52,10 @@ void	main()
 	}
 #endif
 
+#if !defined(GENERIC_2D) && defined(USE_TCGEN_LIGHTMAP)
+	color.rgb *= u_LightFactor;
+#endif
+
 #if defined(USE_DEPTH_FADE) || defined(USE_VERTEX_SPRITE)
 	float depth = texture2D(u_DepthMap, gl_FragCoord.xy / r_FBufSize).x;
 	float fadeDepth = 0.5 * var_FadeDepth.x / var_FadeDepth.y + 0.5;

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -26,6 +26,8 @@ uniform sampler2D	u_DiffuseMap;
 uniform sampler2D	u_MaterialMap;
 uniform sampler2D	u_GlowMap;
 
+uniform ivec2 u_LightFactors;
+#define u_LightFactor u_LightFactors[0]
 uniform float		u_AlphaThreshold;
 uniform vec3		u_ViewOrigin;
 
@@ -110,8 +112,8 @@ void main()
 		vec3 lightDir = normalize(2.0 * deluxe.xyz - 1.0);
 	#elif defined(USE_GRID_DELUXE_MAPPING)
 		// Compute light direction in world space from light grid.
-		vec4 texel = texture3D(u_LightGrid2, lightGridPos);
-		vec3 lightDir = normalize(texel.xyz - (128.0 / 255.0));
+		vec4 texelDir = texture3D(u_LightGrid2, lightGridPos);
+		vec3 lightDir = normalize(texelDir.xyz - (128.0 / 255.0));
 	#endif
 
 	#if defined(USE_LIGHT_MAPPING)
@@ -121,8 +123,12 @@ void main()
 		color.rgb = vec3(0.0);
 	#else
 		// Compute light color from lightgrid.
+		vec4 texelColor = texture3D(u_LightGrid1, lightGridPos);
+
+		texelColor.rgb *= u_LightFactor;
+
 		vec3 ambientColor, lightColor;
-		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), ambientColor, lightColor);
+		ReadLightGrid(texelColor, ambientColor, lightColor);
 
 		color.rgb = ambientColor * r_AmbientScale * diffuse.rgb;
 	#endif
@@ -153,6 +159,10 @@ void main()
 		lightColor /= clamp(dot(normalize(var_Normal), lightDir), 0.3, 1.0);
 	#endif
 
+	#if defined(USE_LIGHT_MAPPING)
+		lightColor.rgb *= u_LightFactor;
+	#endif
+
 	// Blend static light.
 	#if defined(USE_DELUXE_MAPPING) || defined(USE_GRID_DELUXE_MAPPING)
 		computeDeluxeLight(lightDir, normal, viewDir, lightColor, diffuse, material, color);

src/engine/renderer/glsl_source/lightMapping_vp.glsl

@@ -38,6 +38,9 @@ uniform mat4		u_TextureMatrix;
 
 uniform mat4		u_ModelViewProjectionMatrix;
 
+uniform ivec2 u_LightFactors;
+#define u_VertexLightFactor u_LightFactors[1]
+
 uniform float		u_Time;
 
 uniform vec4		u_ColorModulate;
@@ -66,6 +69,8 @@ void main()
 
 	VertexFetch(position, LB, color, texCoord, lmCoord);
 
+	color.rgb *= u_VertexLightFactor;
+
 	color = color * u_ColorModulate + u_Color;
 
 	DeformVertex(position, LB.normal, texCoord, color, u_Time);

src/engine/renderer/shaders.cpp

@@ -13,6 +13,7 @@
 #include "blurY_vp.glsl.h"
 #include "cameraEffects_fp.glsl.h"
 #include "cameraEffects_vp.glsl.h"
+#include "colorSpace_vp.glsl.h"
 #include "computeLight_fp.glsl.h"
 #include "contrast_fp.glsl.h"
 #include "contrast_vp.glsl.h"