refactor: add namespace for TerrainOcclusion

FlayaN · Aug 18, 2024 · 67e2bf3 · 67e2bf3
1 parent d119bde
commit 67e2bf3
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 50 deletions.
diff --git a/features/Terrain Occlusion/Shaders/TerrainOcclusion/TerrainOcclusion.hlsli b/features/Terrain Occlusion/Shaders/TerrainOcclusion/TerrainOcclusion.hlsli
@@ -2,57 +2,60 @@ Texture2D<float> TexTerraOcc : register(t40);
 Texture2D<float> TexNormalisedHeight : register(t41);
 Texture2D<float2> TexShadowHeight : register(t42);
 
-float2 GetTerrainOcclusionUV(float2 xy)
+namespace TerrainOcclusion
 {
-	return xy * terraOccSettings.Scale.xy + terraOccSettings.Offset.xy;
-}
-
-float2 GetTerrainOcclusionXY(float2 uv)
-{
-	return (uv - terraOccSettings.Offset.xy) * terraOccSettings.InvScale.xy;
-}
-
-float GetTerrainZ(float norm_z)
-{
-	return lerp(terraOccSettings.ZRange.x, terraOccSettings.ZRange.y, norm_z) + terraOccSettings.HeightBias;
-}
-
-float2 GetTerrainZ(float2 norm_z)
-{
-	return float2(GetTerrainZ(norm_z.x), GetTerrainZ(norm_z.y));
-}
-
-void GetTerrainOcclusion(
-	const float3 worldPos, const float viewDistance, SamplerState samp,
-	out float terrainShadow, out float terrainAo)
-{
-	terrainShadow = 1;
-	terrainAo = 1;
-
-	float2 terraOccUV = GetTerrainOcclusionUV(worldPos.xy);
-
-	if (any(terraOccUV < 0) && any(terraOccUV > 1))
-		return;
-
-	[flatten] if (terraOccSettings.EnableTerrainShadow && (viewDistance > terraOccSettings.ShadowFadeDistance.x))
+	float2 GetTerrainOcclusionUV(float2 xy)
 	{
-		float fadeFactor = saturate((viewDistance - terraOccSettings.ShadowFadeDistance.x) / (terraOccSettings.ShadowFadeDistance.y - terraOccSettings.ShadowFadeDistance.x));
-		float2 shadowHeight = GetTerrainZ(TexShadowHeight.SampleLevel(samp, terraOccUV, 0));
-		float shadowFraction = saturate((worldPos.z - shadowHeight.y) / (shadowHeight.x - shadowHeight.y));
-		terrainShadow = lerp(1, shadowFraction, fadeFactor);
+		return xy * terraOccSettings.Scale.xy + terraOccSettings.Offset.xy;
 	}
-	[flatten] if (terraOccSettings.EnableTerrainAO)
+
+	float2 GetTerrainOcclusionXY(float2 uv)
 	{
-		float terrainHeight = GetTerrainZ(TexNormalisedHeight.SampleLevel(samp, terraOccUV, 0).x);
-		terrainAo = TexTerraOcc.SampleLevel(samp, terraOccUV, 0).x;
+		return (uv - terraOccSettings.Offset.xy) * terraOccSettings.InvScale.xy;
+	}
 
-		// power
-		terrainAo = pow(abs(terrainAo), terraOccSettings.AOPower);
+	float GetTerrainZ(float norm_z)
+	{
+		return lerp(terraOccSettings.ZRange.x, terraOccSettings.ZRange.y, norm_z) + terraOccSettings.HeightBias;
+	}
 
-		// height fadeout
-		float fadeOut = saturate((worldPos.z - terrainHeight) * terraOccSettings.AOFadeOutHeightRcp);
-		terrainAo = lerp(terrainAo, 1, fadeOut);
+	float2 GetTerrainZ(float2 norm_z)
+	{
+		return float2(GetTerrainZ(norm_z.x), GetTerrainZ(norm_z.y));
+	}
 
-		terrainAo = lerp(1, terrainAo, terraOccSettings.AOMix);
+	void GetTerrainOcclusion(
+		const float3 worldPos, const float viewDistance, SamplerState samp,
+		out float terrainShadow, out float terrainAo)
+	{
+		terrainShadow = 1;
+		terrainAo = 1;
+
+		float2 terraOccUV = GetTerrainOcclusionUV(worldPos.xy);
+
+		if (any(terraOccUV < 0) && any(terraOccUV > 1))
+			return;
+
+		[flatten] if (terraOccSettings.EnableTerrainShadow && (viewDistance > terraOccSettings.ShadowFadeDistance.x))
+		{
+			float fadeFactor = saturate((viewDistance - terraOccSettings.ShadowFadeDistance.x) / (terraOccSettings.ShadowFadeDistance.y - terraOccSettings.ShadowFadeDistance.x));
+			float2 shadowHeight = GetTerrainZ(TexShadowHeight.SampleLevel(samp, terraOccUV, 0));
+			float shadowFraction = saturate((worldPos.z - shadowHeight.y) / (shadowHeight.x - shadowHeight.y));
+			terrainShadow = lerp(1, shadowFraction, fadeFactor);
+		}
+		[flatten] if (terraOccSettings.EnableTerrainAO)
+		{
+			float terrainHeight = GetTerrainZ(TexNormalisedHeight.SampleLevel(samp, terraOccUV, 0).x);
+			terrainAo = TexTerraOcc.SampleLevel(samp, terraOccUV, 0).x;
+
+			// power
+			terrainAo = pow(abs(terrainAo), terraOccSettings.AOPower);
+
+			// height fadeout
+			float fadeOut = saturate((worldPos.z - terrainHeight) * terraOccSettings.AOFadeOutHeightRcp);
+			terrainAo = lerp(terrainAo, 1, fadeOut);
+
+			terrainAo = lerp(1, terrainAo, terraOccSettings.AOMix);
+		}
 	}
-}
+}
diff --git a/package/Shaders/Common/ShadowSampling.hlsli b/package/Shaders/Common/ShadowSampling.hlsli
@@ -129,7 +129,7 @@ float3 GetWorldShadow(float3 positionWS, float depth, float3 offset, uint eyeInd
 #if defined(TERRA_OCC)
 	float terrainShadow = 1.0;
 	float terrainAo = 1.0;
-	GetTerrainOcclusion(positionWS + offset + CameraPosAdjust[eyeIndex], depth, LinearSampler, terrainShadow, terrainAo);
+	TerrainOcclusion::GetTerrainOcclusion(positionWS + offset + CameraPosAdjust[eyeIndex], depth, LinearSampler, terrainShadow, terrainAo);
 	worldShadow = terrainShadow;
 	if (worldShadow == 0.0)
 		return 0.0;

diff --git a/package/Shaders/DistantTree.hlsl b/package/Shaders/DistantTree.hlsl
@@ -222,7 +222,7 @@ PS_OUTPUT main(PS_INPUT input)
 	if (dirShadow > 0.0) {
 		float terrainShadow = 1;
 		float terrainAo = 1;
-		GetTerrainOcclusion(input.WorldPosition.xyz + CameraPosAdjust[eyeIndex], length(input.WorldPosition.xyz), SampDiffuse, terrainShadow, terrainAo);
+		TerrainOcclusion::GetTerrainOcclusion(input.WorldPosition.xyz + CameraPosAdjust[eyeIndex], length(input.WorldPosition.xyz), SampDiffuse, terrainShadow, terrainAo);
 		dirShadow = min(dirShadow, terrainShadow);
 	}
 #			endif

diff --git a/package/Shaders/Lighting.hlsl b/package/Shaders/Lighting.hlsl
@@ -1948,7 +1948,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
 #	if defined(TERRA_OCC)
 		float terrainShadow = 1;
 		float terrainAo = 1;
-		GetTerrainOcclusion(input.WorldPosition.xyz + CameraPosAdjust[eyeIndex].xyz, length(input.WorldPosition.xyz), SampColorSampler, terrainShadow, terrainAo);
+		TerrainOcclusion::GetTerrainOcclusion(input.WorldPosition.xyz + CameraPosAdjust[eyeIndex].xyz, length(input.WorldPosition.xyz), SampColorSampler, terrainShadow, terrainAo);
 		dirShadow *= terrainShadow;
 		inDirShadow = inDirShadow || dirShadow == 0.0;
 #	endif

diff --git a/package/Shaders/RunGrass.hlsl b/package/Shaders/RunGrass.hlsl
@@ -521,7 +521,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
 		if (dirShadow > 0.0) {
 			float terrainShadow = 1;
 			float terrainAo = 1;
-			GetTerrainOcclusion(input.WorldPosition.xyz + CameraPosAdjust[eyeIndex].xyz, length(input.WorldPosition.xyz), SampBaseSampler, terrainShadow, terrainAo);
+			TerrainOcclusion::GetTerrainOcclusion(input.WorldPosition.xyz + CameraPosAdjust[eyeIndex].xyz, length(input.WorldPosition.xyz), SampBaseSampler, terrainShadow, terrainAo);
 			dirShadow *= terrainShadow;
 		}
 #			endif  // TERRA_OCC