Merge pull request #298 from taysta/rend2-updates

Rend2 updates

Author: taysta

shared/rd-rend2/glsl/lightall.glsl

@@ -80,23 +80,23 @@ uniform vec4 u_VertColor;
 uniform vec4 u_Disintegration;
 uniform int u_ColorGen;
 
+#if defined(PER_PIXEL_LIGHTING) && defined(USE_NORMALMAP) && defined(USE_PARALLAXMAP)
+uniform sampler2D u_NormalMap;
+#endif
+
 out vec4 var_TexCoords;
 out vec4 var_Color;
 
 #if defined(PER_PIXEL_LIGHTING)
 out vec4 var_Normal;
 out vec4 var_Tangent;
 out vec4 var_ViewDir;
-out vec4 var_TangentViewDir;
+out vec4 var_LightDir;
 #else
 out vec3 var_Position;
 out vec3 var_Normal;
 #endif
 
-#if defined(PER_PIXEL_LIGHTING)
-out vec4 var_LightDir;
-#endif
-
 vec4 CalcColor(vec3 position)
 {
 	vec4 color = vec4(1.0);
@@ -327,15 +327,30 @@ void main()
 
 #if defined(PER_PIXEL_LIGHTING)
 	vec3 viewDir = u_ViewOrigin.xyz - position;
-
-	// store view direction in tangent space to save on outs
-	var_Normal  = vec4(normal,    0.0);
 	var_Tangent = vec4(tangent,   (attr_Tangent.w * 2.0 - 1.0));
-	var_ViewDir = vec4(viewDir.xyz, 0.0);
 
-	vec3 bitangent = cross(normal, tangent) * var_Tangent.w;
-	mat3 TBN = mat3(tangent, bitangent, normal);
-	var_TangentViewDir = vec4(var_ViewDir.xyz * TBN, 0.0);
+	#if defined(USE_NORMALMAP) && defined(USE_PARALLAXMAP)
+	  vec3 bitangent = cross(normal, tangent) * var_Tangent.w;
+	  mat3 TBN = mat3(tangent, bitangent, normal);
+	  vec3 tangentViewDir = viewDir * TBN;
+
+	  // normal map aspect correction for parallax mapping
+	  vec2 normalSize = vec2(textureSize(u_NormalMap, 0));
+	  float normalMapAspect = normalSize.y / normalSize.x;
+
+	  tangentViewDir *= vec3(
+	  	max(1.0, normalMapAspect),
+	  	max(1.0, 1.0 / normalMapAspect),
+	  	1.0
+	  );
+	#else
+	  vec3 tangentViewDir = vec3(0.0);
+	#endif
+
+	// store tangent view direction in other outs to save space
+	var_LightDir.w = tangentViewDir.x;
+	var_Normal  = vec4(normal,    tangentViewDir.y);
+	var_ViewDir = vec4(viewDir,   tangentViewDir.z);
 #else
 	var_Normal = normal;
 	var_Position = position;
@@ -456,7 +471,6 @@ in vec4 var_Color;
 in vec4 var_Normal;
 in vec4 var_Tangent;
 in vec4 var_ViewDir;
-in vec4 var_TangentViewDir;
 in vec4 var_LightDir;
 #else
 in vec3 var_Position;
@@ -615,7 +629,7 @@ float RayIntersectDisplaceMap(in vec2 inDp, in vec2 ds, in sampler2D normalMap,
 	const int linearSearchSteps = 16;
 	const int binarySearchSteps = 8;
 
-	vec2 dp = inDp - parallaxBias * ds;
+	vec2 dp = fract(inDp - parallaxBias * ds);
 
 	// current size of search window
 	float size = 1.0 / float(linearSearchSteps);
@@ -629,8 +643,16 @@ float RayIntersectDisplaceMap(in vec2 inDp, in vec2 ds, in sampler2D normalMap,
 	vec2 dx = dFdx(inDp);
 	vec2 dy = dFdy(inDp);
 
+	// try sampling at least one border pixel
+	vec2 tMin = (vec2(0.0) - dp) / ds;
+	vec2 tMax = (vec2(1.0) - dp) / ds;
+	vec2 t = max(tMin, tMax);
+	float tExit  = min(t.x, t.y);
+	float stepFraction = fract(tExit / size) * size;
+	depth -= size-stepFraction;
+
 	// search front to back for first point inside object
-	for(int i = 0; i < linearSearchSteps - 1; ++i)
+	for(int i = 0; i < linearSearchSteps; ++i)
 	{
 		depth += size;
 
@@ -676,9 +698,7 @@ float RayIntersectDisplaceMap(in vec2 inDp, in vec2 ds, in sampler2D normalMap,
 vec2 GetParallaxOffset(in vec2 texCoords, in vec3 tangentDir)
 {
 #if defined(USE_PARALLAXMAP)
-	ivec2 normalSize = textureSize(u_NormalMap, 0);
-	vec3 nonSquareScale = mix(vec3(normalSize.y / normalSize.x, 1.0, 1.0), vec3(1.0, normalSize.x / normalSize.y, 1.0), float(normalSize.y <= normalSize.x));
-	vec3 offsetDir = normalize(tangentDir * nonSquareScale);
+	vec3 offsetDir = normalize(tangentDir);
 	offsetDir.xy *= -u_NormalScale.a / offsetDir.z;
 
 	return offsetDir.xy * RayIntersectDisplaceMap(texCoords, offsetDir.xy, u_NormalMap, u_ParallaxBias);
@@ -1052,7 +1072,9 @@ void main()
 	vec2 texCoords = var_TexCoords.xy;
 	vec2 lmCoords = var_TexCoords.zw;
 #if defined(PER_PIXEL_LIGHTING)
-	vec2 tex_offset = GetParallaxOffset(texCoords, var_TangentViewDir.xyz);
+	// Unpack tangent view direction
+	vec3 tangentViewDir = vec3(var_LightDir.w, var_Normal.w, var_ViewDir.w);
+	vec2 tex_offset = GetParallaxOffset(texCoords, tangentViewDir);
 	texCoords += tex_offset;
 #endif
 
@@ -1127,10 +1149,6 @@ void main()
 	vec3 normalBias = vertexNormal * (1.0 - NPL);
 	float shadowValue = sunShadow(u_ViewOrigin, viewDir, normalBias, u_ShadowMap) * NPL;
 
-	// surfaces not facing the light are always shadowed
-
-	//shadowValue = mix(0.0, shadowValue, dot(N, primaryLightDir) > 0.0);
-
     #if defined(SHADOWMAP_MODULATE)
 	vec3 ambientScale = mix(vec3(1.0), u_PrimaryLightAmbient, u_EnableTextures.z);
 	lightColor = mix(ambientScale * lightColor, lightColor, shadowValue);

shared/rd-rend2/glsl/surface_sprites.glsl

@@ -132,6 +132,12 @@ void main()
 	float distanceToCamera = length(V);
 	float fadeScale = smoothstep(u_FadeStartDistance, u_FadeEndDistance,
 						distanceToCamera);
+	
+	if (fadeScale >= 1.0)
+	{
+		gl_Position = vec4(0.0);
+		return;
+	}
 
 	float sprite_time = u_frameTime * 1000.0;
 	int vertex_id = gl_VertexID % 4;

shared/rd-rend2/tr_bsp.cpp

@@ -4150,7 +4150,6 @@ static void R_GenerateSurfaceSprites( const world_t *world, int worldIndex )
 					if (j > 0 && (stage->stateBits & GLS_DEPTHFUNC_EQUAL))
 					{
 						ri.Printf(PRINT_WARNING, "depthFunc equal is not supported on surface sprites in rend2. Skipping stage\n");
-						surf->numSurfaceSprites -= 1;
 						continue;
 					}
 
@@ -4180,6 +4179,8 @@ static void R_GenerateSurfaceSprites( const world_t *world, int worldIndex )
 
 					++surfaceSpriteNum;
 				}
+				surf->numSurfaceSprites = surfaceSpriteNum;
+
 				break;
 			}