View difference between Paste ID: gk66GhUG and vEVN2EZu

-Shader "Stylized Water 3/Underwater Masking test"
+Shader "Stylized Water 3/Underwater Transparent"
 {
 	Properties
 	{
 		_Color("Color", Color) = (1,1,1, 1)
 	}
 
     SubShader
     {
-        Tags { "RenderType" = "Transparent" "Queue" = "Transparent" "RenderPipeline" = "UniversalPipeline" }
+        //Offset the render queue so that the material actually renders after the underwater fog!
         Tags { "RenderType" = "Transparent" "Queue" = "Transparent+2" "RenderPipeline" = "UniversalPipeline" }
         Blend SrcAlpha OneMinusSrcAlpha
         ZWrite Off
 
         Pass
         {
             Tags { "LightMode" = "UniversalForward" }
 
             HLSLPROGRAM
             #pragma target 3.0
             #pragma vertex vert
             #pragma fragment frag
 
             #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
 
             //Using a shader variant is optional, as the code is still conditionally executed
             #pragma multi_compile_fragment _ UNDERWATER_ENABLED
 
             //Include this library
-            //Declare these properties
+            #include "Assets/Stylized Water 3/Shaders/Underwater/UnderwaterShading.hlsl"
-            bool _FullySubmerged, _UnderwaterRenderingEnabled;
+
-            TEXTURE2D_X(_UnderwaterMask);
+
-            //Note: you can use any sampler, as long as it doesn't use point-filtering
+
-            SAMPLER(sampler_UnderwaterMask);
+
             {
                 float4 vertex : POSITION;
             };
 
             struct v2f
             {
                 float4 positionCS     : SV_POSITION;
                 float3 positionWS     : TEXCOORD0;
             };
 
             v2f vert(appdata v)
             {
                 v2f o;
 
                 o.positionCS = TransformObjectToHClip(v.vertex.xyz);
                 o.positionWS = TransformObjectToWorld(v.vertex.xyz);
 
                 return o;
             }
 
             half4 frag(v2f input) : SV_Target
             {
                 float3 color = _Color.rgb;
                 float alpha = _Color.a;
                 float2 uv = GetNormalizedScreenSpaceUV(input.positionCS);
 
                 #if UNDERWATER_ENABLED
-                //Boolean toggled if the current rendering camera is valid and touching the water line
+                //Factor to fade the alpha with, material will dissappear into the fog
-                if(_UnderwaterRenderingEnabled)
+                float fogDensity = GetUnderwaterFogDensity(input.positionWS);
-	            {
+
-                    //This value will be true if the top of the screen is completely below the water level
+                //Used to restrict visibility to underwater
-                    //If so the pixels in this function should be completely discarded because the underwater fog consumes the visible area
+                half underwaterMask = SampleUnderwaterMask(uv) * fogDensity;
-                    if(_FullySubmerged)
+
-                    {
+                //Fade out material as it touches the water level
-                        alpha = 0;
+                float waterLevel = SampleWaterLevel(input.positionWS);
-                    }
+
-                    else
+                //Will make the parts that are BELOW the water completely transparent
-                    {
+                alpha *= 1-underwaterMask;
-                        //Screen-space texture. White for parts that are underwater, anything else is black.
+                alpha *= saturate(waterLevel - input.positionWS.y);
-                        half underwaterMask = SAMPLE_TEXTURE2D_X(_UnderwaterMask, sampler_UnderwaterMask, uv).r;
+
 
-                        //Will make the parts that are BELOW the water completely transparent
+
-                        alpha *= 1-underwaterMask;
+
-                    }
+
-                }
+
         }
     }
 }