feat: add saturation slider for ssgi il, remove backface mult (#845)

* feat: saturation slider for ssgi il * chore: bump ssgi ver * chore: more drastic IL bounce value
doodlum · Dec 11, 2024 · 78247b4 · 78247b4
1 parent ab4f713
commit 78247b4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/features/Screen Space GI/Shaders/Features/ScreenSpaceGI.ini b/features/Screen Space GI/Shaders/Features/ScreenSpaceGI.ini
@@ -1,2 +1,2 @@
 [Info]
-Version = 3-0-0
+Version = 3-0-1
diff --git a/features/Screen Space GI/Shaders/ScreenSpaceGI/common.hlsli b/features/Screen Space GI/Shaders/ScreenSpaceGI/common.hlsli
@@ -47,7 +47,7 @@ cbuffer SSGICB : register(b1)
 	float2 DepthFadeRange;
 	float DepthFadeScaleConst;
 
-	float BackfaceStrength;
+	float GISaturation;
 	float GIBounceFade;
 	float GIDistanceCompensation;
 	float GICompensationMaxDist;

diff --git a/features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl b/features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl
@@ -210,7 +210,7 @@ void CalculateGI(
 					if (dot(samplePos, normalSample) > 0)
 						normalSample = -normalSample;
 					float frontBackMult = -dot(normalSample, sampleHorizonVec);
-					frontBackMult = frontBackMult < 0 ? abs(frontBackMult) * BackfaceStrength : frontBackMult;  // backface
+					frontBackMult = frontBackMult < 0 ? 0.0 : frontBackMult;  // backface
 
 					if (frontBackMult > 0.f) {
 						float3 sampleHorizonVecWS = normalize(mul(FrameBuffer::CameraViewInverse[eyeIndex], half4(sampleHorizonVec, 0)).xyz);
@@ -246,7 +246,7 @@ void CalculateGI(
 	radianceY *= rcpNumSlices;
 	radianceY = lerp(radianceY, 0, depthFade);
 
-	radianceCoCg *= rcpNumSlices;
+	radianceCoCg *= rcpNumSlices * GISaturation;
 #endif
 
 	o_ao = visibility;

diff --git a/src/Features/ScreenSpaceGI.cpp b/src/Features/ScreenSpaceGI.cpp
@@ -19,7 +19,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
 	GIRadius,
 	Thickness,
 	DepthFadeRange,
-	BackfaceStrength,
+	GISaturation,
 	EnableGIBounce,
 	GIBounceFade,
 	GIDistanceCompensation,
@@ -194,6 +194,8 @@ void ScreenSpaceGI::DrawSettings()
 			ImGui::Separator();
 		}
 
+		Util::PercentageSlider("IL Saturation", &settings.GISaturation);
+
 		recompileFlag |= ImGui::Checkbox("Ambient Bounce", &settings.EnableGIBounce);
 		if (auto _tt = Util::HoverTooltipWrapper())
 			ImGui::Text(
@@ -208,14 +210,6 @@ void ScreenSpaceGI::DrawSettings()
 			if (auto _tt = Util::HoverTooltipWrapper())
 				ImGui::Text("How much of this frame's ambient+IL get carried to the next frame as source.");
 		}
-
-		if (showAdvanced) {
-			ImGui::Separator();
-
-			Util::PercentageSlider("Backface Lighting Mix", &settings.BackfaceStrength);
-			if (auto _tt = Util::HoverTooltipWrapper())
-				ImGui::Text("How bright at the back of objects is compared to the front. A small value to make up for foliage translucency.");
-		}
 	}
 
 	///////////////////////////////
@@ -574,7 +568,7 @@ void ScreenSpaceGI::UpdateSB()
 		data.DepthFadeRange = settings.DepthFadeRange;
 		data.DepthFadeScaleConst = 1 / (settings.DepthFadeRange.y - settings.DepthFadeRange.x);
 
-		data.BackfaceStrength = settings.BackfaceStrength;
+		data.GISaturation = settings.GISaturation;
 		data.GIBounceFade = settings.GIBounceFade;
 		data.GIDistanceCompensation = settings.GIDistanceCompensation;
 		data.GICompensationMaxDist = settings.AORadius;

diff --git a/src/Features/ScreenSpaceGI.h b/src/Features/ScreenSpaceGI.h
@@ -58,9 +58,9 @@ struct ScreenSpaceGI : Feature
 		float Thickness = 75.f;
 		float2 DepthFadeRange = { 4e4, 5e4 };
 		// gi
-		float BackfaceStrength = 0.f;
+		float GISaturation = .9f;
 		bool EnableGIBounce = true;
-		float GIBounceFade = .5f;
+		float GIBounceFade = .3f;
 		float GIDistanceCompensation = 0.f;
 		// mix
 		float AOPower = 2.f;
@@ -98,7 +98,7 @@ struct ScreenSpaceGI : Feature
 		float2 DepthFadeRange;
 		float DepthFadeScaleConst;
 
-		float BackfaceStrength;  //
+		float GISaturation;  //
 		float GIBounceFade;
 		float GIDistanceCompensation;
 		float GICompensationMaxDist;