more ssao tweaks; fix shadowmaps changing resolution

Author: malytomas

data/cage/shaders/effects/ssaoGenerate.glsl

@@ -29,7 +29,7 @@ vec3 ndcToView(vec2 p, float d)
 // all view-space
 vec3 reconstructNormal(vec3 position)
 {
-	return normalize(cross(dFdx(position), dFdy(position)));
+	return normalize(cross(dFdxFine(position), dFdyFine(position)));
 }
 
 mat3 makeTbn(vec3 myNormal)
@@ -82,7 +82,7 @@ void main()
 		{
 			vec3 samplePos = ndcToView(rayNdc.xy, sampleDepth); // view-space sample position
 			float diff = length(rayPos - samplePos);
-			occ += smoothstep(1, 0, diff / raysLength);
+			occ += smoothstep(1, 0, saturate(diff / raysLength));
 		}
 		total += 1;
 	}

data/cage/shaders/effects/ssaoParams.glsl

@@ -3,6 +3,6 @@ layout(std140, binding = CAGE_SHADER_UNIBLOCK_CUSTOMDATA) uniform Ssao
 {
 	mat4 proj;
 	mat4 projInv;
-	vec4 params; // strength, threshold, power, raysLength
+	vec4 params; // strength, bias, power, raysLength
 	ivec4 iparams; // sampleCount, hashSeed
 };

data/cage/shaders/effects/ssaoResolve.glsl

@@ -14,8 +14,6 @@ out float outAo;
 void main()
 {
 	float ao = texelFetch(texAo, ivec2(gl_FragCoord.xy), 0).x;
-	if (ao < params[1])
-		ao = 0;
-	ao = pow(max(ao, 0), params[2]) * params[0];
+	ao = pow(max(ao - params[1], 0), params[2]) * params[0];
 	outAo = clamp(1 - ao, 0, 1);
 }

sources/include/cage-engine/screenSpaceEffectsProperties.h

@@ -8,10 +8,10 @@ namespace cage
 	struct CAGE_ENGINE_API ScreenSpaceAmbientOcclusion
 	{
 		Real raysLength = 0.1; // world-space
-		Real threshold = 0.03;
+		Real bias = 0.03;
 		Real power = 1.2;
 		Real strength = 3;
-		// ao = pow(ao - threshold, power) * strength
+		// ao = pow(ao - bias, power) * strength
 		uint32 samplesCount = 32;
 		uint32 blurPasses = 3;
 	};

sources/libengine/graphics/renderPipeline.cpp

@@ -1595,7 +1595,7 @@ namespace cage
 					{
 						Holder<ProvisionalTexture> tex;
 						{
-							const String name = Stringizer() + this->name + "_shadowmap_" + e->id() + "_cascades_" + resolution;
+							const String name = Stringizer() + this->name + "_shadowmap_" + e->id() + "_cascades_" + sc.resolution;
 							tex = provisionalGraphics->texture(name, GL_TEXTURE_2D_ARRAY,
 								[resolution = sc.resolution](Texture *t)
 								{
@@ -1628,7 +1628,7 @@ namespace cage
 						auto data = createShadowmapPipeline(e, lc, sc);
 						data->initializeShadowmapSingle();
 						{
-							const String name = Stringizer() + data->name + "_" + resolution;
+							const String name = Stringizer() + this->name + "_shadowmap_" + e->id() + "_" + sc.resolution;
 							data->shadowmap->shadowTexture = provisionalGraphics->texture(name, data->shadowmap->lightComponent.lightType == LightTypeEnum::Point ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D_ARRAY,
 								[resolution = data->resolution, internalFormat = data->shadowmap->lightComponent.lightType == LightTypeEnum::Point ? GL_DEPTH_COMPONENT16 : GL_DEPTH_COMPONENT24](Texture *t)
 								{

sources/libengine/graphics/screenSpaceEffects.cpp

@@ -84,12 +84,12 @@ namespace cage
 		{
 			Mat4 proj;
 			Mat4 projInv;
-			Vec4 params; // strength, threshold, power, raysLength
+			Vec4 params; // strength, bias, power, raysLength
 			Vec4i iparams; // sampleCount, hashSeed
 		} s;
 		s.proj = config.proj;
 		s.projInv = inverse(config.proj);
-		s.params = Vec4(config.strength, config.threshold, config.power, config.raysLength);
+		s.params = Vec4(config.strength, config.bias, config.power, config.raysLength);
 		s.iparams[0] = config.samplesCount;
 		s.iparams[1] = hash(config.frameIndex);
 		q->universalUniformStruct(s, CAGE_SHADER_UNIBLOCK_CUSTOMDATA);