🐛 Fix #1145 UR Density Factor not supporting Portals

wave-harmonic · Apr 6, 2024 · 86f9e03 · 86f9e03
1 parent d137997
commit 86f9e03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/crest/Assets/Crest/Crest/Shaders/Helpers/WaterVolume.hlsl b/crest/Assets/Crest/Crest/Shaders/Helpers/WaterVolume.hlsl
@@ -9,7 +9,7 @@ TEXTURE2D_X(_CrestWaterVolumeFrontFaceTexture);
 TEXTURE2D_X(_CrestWaterVolumeBackFaceTexture);
 
 #if CREST_WATER_VOLUME
-void ApplyVolumeToOceanSurface(const float4 i_positionCS)
+float ApplyVolumeToOceanSurface(const float4 i_positionCS)
 {
 #if CREST_WATER_VOLUME_HAS_BACKFACE
 	// Discard ocean after volume or when not on pixel.
@@ -34,6 +34,8 @@ void ApplyVolumeToOceanSurface(const float4 i_positionCS)
 		discard;
 	}
 #endif // CREST_WATER_VOLUME_2D
+
+	return rawFrontFaceZ;
 }
 #endif
 

diff --git a/crest/Assets/Crest/Crest/Shaders/Ocean.shader b/crest/Assets/Crest/Crest/Shaders/Ocean.shader
@@ -525,7 +525,7 @@ Shader "Crest/Ocean"
 				half2 uvDepth = screenPos.xy / screenPos.z;
 
 #if CREST_WATER_VOLUME
-				ApplyVolumeToOceanSurface(input.positionCS);
+				float rawFrontFaceZ = ApplyVolumeToOceanSurface(input.positionCS);
 #endif
 
 				#if _CLIPUNDERTERRAIN_ON
@@ -739,8 +739,12 @@ Shader "Crest/Ocean"
 #if CREST_UNDERWATER_BEFORE_TRANSPARENT
 				else
 				{
+					float depthFogDistance = pixelZ;
+#if CREST_WATER_VOLUME
+					depthFogDistance -= CrestLinearEyeDepth(rawFrontFaceZ);
+#endif
 					// underwater - do depth fog
-					col = lerp(col, scatterCol, saturate(1. - exp(-_CrestDepthFogDensity.xyz * pixelZ)));
+					col = lerp(col, scatterCol, saturate(1. - exp(-_CrestDepthFogDensity.xyz * depthFogDistance)));
 				}
 #endif