huge revamp to track down more bugs

Half Lambert Lighting and Wrap Around Lighting are for models

make possible to combine halflambert and wraparound

no need for avoiding lightmapping

Author: illwieckz

src/engine/renderer/gl_shader.cpp

@@ -762,6 +762,10 @@ static bool IsUnusedPermutation( const char *compileMacros )
 		{
 			if ( r_deluxeMapping->integer == 0 ) return true;
 		}
+		else if ( strcmp( token, "USE_GRID_DELUXE_MAPPING" ) == 0 )
+		{
+			if ( r_deluxeMapping->integer == 0 ) return true;
+		}
 		else if ( strcmp( token, "USE_PHYSICAL_MAPPING" ) == 0 )
 		{
 			if ( r_physicalMapping->integer == 0 ) return true;
@@ -1369,6 +1373,62 @@ bool GLCompileMacro_USE_DEPTH_FADE::HasConflictingMacros(size_t permutation, con
 	return false;
 }
 
+bool GLCompileMacro_USE_DELUXE_MAPPING::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
+{
+	for (const GLCompileMacro* macro : macros)
+	{
+		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_GRID_DELUXE_MAPPING || macro->GetType() == USE_GRID_LIGHTING))
+		{
+			//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool GLCompileMacro_USE_GRID_DELUXE_MAPPING::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
+{
+	for (const GLCompileMacro* macro : macros)
+	{
+		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_DELUXE_MAPPING || macro->GetType() == USE_BSP_SURFACE))
+		{
+			//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool GLCompileMacro_USE_GRID_LIGHTING::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
+{
+	for (const GLCompileMacro* macro : macros)
+	{
+		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_DELUXE_MAPPING))
+		{
+			//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool GLCompileMacro_USE_BSP_SURFACE::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
+{
+	for (const GLCompileMacro* macro : macros)
+	{
+		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_GRID_DELUXE_MAPPING))
+		{
+			//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
+			return true;
+		}
+	}
+
+	return false;
+}
+
 bool GLShader::GetCompileMacrosString( size_t permutation, std::string &compileMacrosOut ) const
 {
 	compileMacrosOut.clear();
@@ -1573,8 +1633,9 @@ GLShader_lightMapping::GLShader_lightMapping( GLShaderManager *manager ) :
 	GLCompileMacro_USE_BSP_SURFACE( this ),
 	GLCompileMacro_USE_VERTEX_SKINNING( this ),
 	GLCompileMacro_USE_VERTEX_ANIMATION( this ),
-	GLCompileMacro_USE_LIGHT_MAPPING( this ),
 	GLCompileMacro_USE_DELUXE_MAPPING( this ),
+	GLCompileMacro_USE_GRID_LIGHTING( this ),
+	GLCompileMacro_USE_GRID_DELUXE_MAPPING( this ),
 	GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP( this ),
 	GLCompileMacro_USE_RELIEF_MAPPING( this ),
 	GLCompileMacro_USE_REFLECTIVE_SPECULAR( this ),

src/engine/renderer/gl_shader.h

@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define USE_UNIFORM_FIREWALL 1
 
 // *INDENT-OFF*
-static const unsigned int MAX_SHADER_MACROS = 9;
+static const unsigned int MAX_SHADER_MACROS = 10;
 static const unsigned int GL_SHADER_VERSION = 4;
 
 class ShaderException : public std::runtime_error
@@ -788,8 +788,9 @@ class GLCompileMacro
 	  USE_VERTEX_SPRITE,
 	  USE_TCGEN_ENVIRONMENT,
 	  USE_TCGEN_LIGHTMAP,
-	  USE_LIGHT_MAPPING,
 	  USE_DELUXE_MAPPING,
+	  USE_GRID_LIGHTING,
+	  USE_GRID_DELUXE_MAPPING,
 	  USE_HEIGHTMAP_IN_NORMALMAP,
 	  USE_RELIEF_MAPPING,
 	  USE_REFLECTIVE_SPECULAR,
@@ -857,6 +858,8 @@ class GLCompileMacro_USE_BSP_SURFACE :
 		return "USE_BSP_SURFACE";
 	}
 
+	bool HasConflictingMacros(size_t permutation, const std::vector< GLCompileMacro * > &macros) const override;
+
 	EGLCompileMacro GetType() const override
 	{
 		return EGLCompileMacro::USE_BSP_SURFACE;
@@ -1017,26 +1020,28 @@ class GLCompileMacro_USE_TCGEN_LIGHTMAP :
 	}
 };
 
-class GLCompileMacro_USE_LIGHT_MAPPING :
+class GLCompileMacro_USE_GRID_LIGHTING :
 	GLCompileMacro
 {
 public:
-	GLCompileMacro_USE_LIGHT_MAPPING( GLShader *shader ) :
+	GLCompileMacro_USE_GRID_LIGHTING( GLShader *shader ) :
 		GLCompileMacro( shader )
 	{
 	}
 
 	const char *GetName() const override
 	{
-		return "USE_LIGHT_MAPPING";
+		return "USE_GRID_LIGHTING";
 	}
 
+	bool HasConflictingMacros(size_t permutation, const std::vector< GLCompileMacro * > &macros) const override;
+
 	EGLCompileMacro GetType() const override
 	{
-		return EGLCompileMacro::USE_LIGHT_MAPPING;
+		return EGLCompileMacro::USE_GRID_LIGHTING;
 	}
 
-	void SetLightMapping( bool enable )
+	void SetGridLighting( bool enable )
 	{
 		SetMacro( enable );
 	}
@@ -1056,6 +1061,8 @@ class GLCompileMacro_USE_DELUXE_MAPPING :
 		return "USE_DELUXE_MAPPING";
 	}
 
+	bool HasConflictingMacros(size_t permutation, const std::vector< GLCompileMacro * > &macros) const override;
+
 	EGLCompileMacro GetType() const override
 	{
 		return EGLCompileMacro::USE_DELUXE_MAPPING;
@@ -1067,6 +1074,33 @@ class GLCompileMacro_USE_DELUXE_MAPPING :
 	}
 };
 
+class GLCompileMacro_USE_GRID_DELUXE_MAPPING :
+	GLCompileMacro
+{
+public:
+	GLCompileMacro_USE_GRID_DELUXE_MAPPING( GLShader *shader ) :
+		GLCompileMacro( shader )
+	{
+	}
+
+	const char *GetName() const override
+	{
+		return "USE_GRID_DELUXE_MAPPING";
+	}
+
+	bool HasConflictingMacros(size_t permutation, const std::vector< GLCompileMacro * > &macros) const override;
+
+	EGLCompileMacro GetType() const override
+	{
+		return EGLCompileMacro::USE_GRID_DELUXE_MAPPING;
+	}
+
+	void SetGridDeluxeMapping( bool enable )
+	{
+		SetMacro( enable );
+	}
+};
+
 class GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP :
 	GLCompileMacro
 {
@@ -2271,8 +2305,9 @@ class GLShader_lightMapping :
 	public GLCompileMacro_USE_BSP_SURFACE,
 	public GLCompileMacro_USE_VERTEX_SKINNING,
 	public GLCompileMacro_USE_VERTEX_ANIMATION,
-	public GLCompileMacro_USE_LIGHT_MAPPING,
 	public GLCompileMacro_USE_DELUXE_MAPPING,
+	public GLCompileMacro_USE_GRID_LIGHTING,
+	public GLCompileMacro_USE_GRID_DELUXE_MAPPING,
 	public GLCompileMacro_USE_HEIGHTMAP_IN_NORMALMAP,
 	public GLCompileMacro_USE_RELIEF_MAPPING,
 	public GLCompileMacro_USE_REFLECTIVE_SPECULAR,

src/engine/renderer/glsl_source/computeLight_fp.glsl

@@ -21,6 +21,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // computeLight_fp.glsl - Light computing helper functions
 
+#if !defined(USE_BSP_SURFACE)
+	#define USE_MODEL_SURFACE
+#endif
+
+#if !defined(USE_GRID_LIGHTING)
+	#define USE_LIGHT_MAPPING
+#endif
+
 #if defined(USE_REFLECTIVE_SPECULAR)
 uniform samplerCube u_EnvironmentMap0;
 uniform samplerCube u_EnvironmentMap1;
@@ -76,15 +84,18 @@ void computeLight( vec3 lightDir, vec3 normal, vec3 viewDir, vec3 lightColor,
   // if no r_halfLambertLighting and no r_wrapAroundLighting.
   float NdotL = dot( normal, lightDir );
 
+#if !defined(USE_BSP_SURFACE)
 #if defined(r_halfLambertLighting)
   // http://developer.valvesoftware.com/wiki/Half_Lambert
   NdotL = NdotL * 0.5 + 0.5;
   NdotL *= NdotL;
-#elif defined(r_wrapAroundLighting)
+#endif
+#if defined(r_wrapAroundLighting)
   NdotL = clamp( NdotL + r_wrapAroundLighting, 0.0, 1.0) / clamp(1.0 + r_wrapAroundLighting, 0.0, 1.0);
 #else
   NdotL = clamp( NdotL, 0.0, 1.0 );
 #endif
+#endif // !USE_BSP_SURFACE
 
 #if defined(USE_PHYSICAL_MAPPING)
   // Daemon PBR packing defaults to ORM like glTF 2.0 defines

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -36,29 +36,16 @@ IN(smooth) vec3		var_Tangent;
 IN(smooth) vec3		var_Binormal;
 IN(smooth) vec3		var_Normal;
 
-#if defined(USE_BSP_SURFACE) && defined(USE_LIGHT_MAPPING) && !defined(USE_DELUXE_MAPPING)
-/* HACK: restore legacy behavior for bsp surface with lightmap
-but no deluxemap, do not use the lightgrid to compute the light
-direction, do not do normal mapping neither specular mapping
-with static lights.
-https://github.com/DaemonEngine/Daemon/issues/324
-
-Comment out this line to enable lightgrid light direction with
-lightmap light color when there is no deluxe map.
-*/
-	#define HACK_NO_BSP_GRID_LIGHTDIR
-#endif
-
 #if defined(USE_LIGHT_MAPPING)
 	uniform sampler2D u_LightMap;
-#else
+#elif defined(USE_GRID_LIGHTING)
 	uniform sampler3D u_LightMap;
 	#define u_LightGrid1 u_LightMap
 #endif
 
 #if defined(USE_DELUXE_MAPPING)
 	uniform sampler2D u_DeluxeMap;
-#else
+#elif defined(USE_GRID_DELUXE_MAPPING)
 	uniform sampler3D u_DeluxeMap;
 	#define u_LightGrid2 u_DeluxeMap
 #endif
@@ -67,7 +54,7 @@ lightmap light color when there is no deluxe map.
 	IN(smooth) vec2 var_TexLight;
 #endif
 
-#if !defined(USE_LIGHT_MAPPING) || !defined(USE_DELUXE_MAPPING)
+#if defined(USE_GRID_LIGHTING) || defined(USE_GRID_DELUXE_MAPPING)
 	uniform vec3 u_LightGridOrigin;
 	uniform vec3 u_LightGridScale;
 #endif
@@ -112,30 +99,26 @@ void main()
 	vec4 color;
 	color.a = diffuse.a;
 
-	#if !defined(USE_LIGHT_MAPPING) || !defined(USE_DELUXE_MAPPING)
-		#if !defined(HACK_NO_BSP_GRID_LIGHTDIR)
-			// Compute light grid position.
-			vec3 lightGridPos = (var_Position - u_LightGridOrigin) * u_LightGridScale;
-		#endif
+	#if defined(USE_GRID_LIGHTING) || defined(USE_GRID_DELUXE_MAPPING)
+		// Compute light grid position.
+		vec3 lightGridPos = (var_Position - u_LightGridOrigin) * u_LightGridScale;
 	#endif
 
 	#if defined(USE_DELUXE_MAPPING)
 		// Compute light direction in world space from deluxe map.
 		vec4 deluxe = texture2D(u_DeluxeMap, var_TexLight);
 		vec3 lightDir = normalize(2.0 * deluxe.xyz - 1.0);
-	#else
-		#if !defined(HACK_NO_BSP_GRID_LIGHTDIR)
-			// Compute light direction in world space from light grid.
-			vec4 texel = texture3D(u_LightGrid2, lightGridPos);
-			vec3 lightDir = normalize(texel.xyz - (128.0 / 255.0));
-		#endif
+	#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));
 	#endif
 
 	#if defined(USE_LIGHT_MAPPING)
 		// Compute light color from world space lightmap.
 		vec3 lightColor = texture2D(u_LightMap, var_TexLight).rgb;
 
-		#if !defined(HACK_NO_BSP_GRID_LIGHTDIR)
+		#if defined(USE_DELUXE_MAPPING) || defined(USE_GRID_DELUXE_MAPPING)
 			color.rgb = vec3(0.0);
 		#else
 			color.rgb = lightColor.rgb * diffuse.rgb;
@@ -146,9 +129,13 @@ void main()
 		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), ambientColor, lightColor);
 
 		color.rgb = ambientColor * r_AmbientScale * diffuse.rgb;
+
+		#if !defined(USE_DELUXE_MAPPING) && !defined(USE_GRID_DELUXE_MAPPING)
+			color.rgb += lightColor.rgb * diffuse.rgb;
+		#endif
 	#endif
 
-	#if defined(USE_LIGHT_MAPPING)
+	#if defined(USE_LIGHT_MAPPING) && defined(USE_DELUXE_MAPPING)
 		/* Lightmaps generated by q3map2 don't store the raw light value, but
 		they store light premultiplied with the dot product of the light
 		direction and surface normal. The line is just an attempt to reverse
@@ -170,13 +157,11 @@ void main()
 		https://github.com/DaemonEngine/Daemon/issues/299#issuecomment-606186347
 		*/
 
-		#if !defined(HACK_NO_BSP_GRID_LIGHTDIR)
-			// Divide by cosine term to restore original light color.
-			lightColor /= clamp(dot(normalize(var_Normal), lightDir), 0.3, 1.0);
-		#endif
+		// Divide by cosine term to restore original light color.
+		lightColor /= clamp(dot(normalize(var_Normal), lightDir), 0.3, 1.0);
 	#endif
 
-	#if !defined(HACK_NO_BSP_GRID_LIGHTDIR)
+	#if defined(USE_DELUXE_MAPPING) || defined(USE_GRID_DELUXE_MAPPING)
 		// Blend static light.
 		computeLight(lightDir, normal, viewDir, lightColor, diffuse, material, color);
 	#endif
@@ -187,7 +172,7 @@ void main()
 	#endif
 
 	// Add Rim Lighting to highlight the edges on model entities.
-	#if defined(r_rimLighting) && !defined(USE_BSP_SURFACE) && !defined(USE_LIGHT_MAPPING)
+	#if defined(r_rimLighting) && defined(USE_MODEL_SURFACE) && defined(USE_GRID_LIGHTING)
 		float rim = pow(1.0 - clamp(dot(normal, viewDir), 0.0, 1.0), r_RimExponent);
 		vec3 emission = ambientColor * rim * rim * 0.2;
 		color.rgb += 0.7 * emission;

src/engine/renderer/glsl_source/lightMapping_vp.glsl

@@ -22,9 +22,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* lightMapping_vp.glsl */
 
+#if !defined(USE_BSP_SURFACE)
+	#define USE_MODEL_SURFACE
+#endif
+
+#if !defined(USE_GRID_LIGHTING)
+	#define USE_LIGHT_MAPPING
+#endif
+
 uniform mat4		u_TextureMatrix;
 
-#if !defined(USE_BSP_SURFACE)
+#if defined(USE_MODEL_SURFACE)
 	uniform mat4 u_ModelMatrix;
 #endif