Merge pull request #8131 from Unity-Technologies/internal/2022.3/staging

Internal/2022.3/staging

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIDrawer.Builtins.cs

@@ -801,7 +801,10 @@ public override bool OnGUI(DebugUI.Widget widget, DebugState state)
 
                     rowRect.xMin += 2;
                     rowRect.xMax -= 2;
-                    EditorGUI.LabelField(rowRect, GUIContent.none, EditorGUIUtility.TrTextContent(row.displayName), DebugWindow.Styles.centeredLeft);
+
+                    bool isAlternate = r % 2 == 0;
+
+                    EditorGUI.LabelField(rowRect, GUIContent.none, EditorGUIUtility.TrTextContent(row.displayName),isAlternate ? DebugWindow.Styles.centeredLeft : DebugWindow.Styles.centeredLeftAlternate);
                     rowRect.xMin -= 2;
                     rowRect.xMax += 2;
 
@@ -812,7 +815,7 @@ public override bool OnGUI(DebugUI.Widget widget, DebugState state)
                             rowRect.x += rowRect.width;
                             rowRect.width = columns[visible[c]].width;
                             if (!row.isHidden)
-                                DisplayChild(rowRect, row.children[visible[c] - 1]);
+                                DisplayChild(rowRect, row.children[visible[c] - 1], isAlternate);
                         }
                         rowRect.y += rowRect.height;
                     }
@@ -855,7 +858,7 @@ internal Rect DrawOutline(Rect rect)
             return new Rect(rect.x + size, rect.y + size, rect.width - 2 * size, rect.height - 2 * size);
         }
 
-        internal void DisplayChild(Rect rect, DebugUI.Widget child)
+        internal void DisplayChild(Rect rect, DebugUI.Widget child, bool isAlternate)
         {
             rect.xMin += 2;
             rect.xMax -= 2;
@@ -869,7 +872,7 @@ internal void DisplayChild(Rect rect, DebugUI.Widget child)
                 if (child.GetType() == typeof(DebugUI.Value))
                 {
                     var widget = Cast<DebugUI.Value>(child);
-                    EditorGUI.LabelField(rect, GUIContent.none, EditorGUIUtility.TrTextContent(widget.GetValue().ToString()));
+                    EditorGUI.LabelField(rect, GUIContent.none, EditorGUIUtility.TrTextContent(widget.GetValue().ToString()), isAlternate ? DebugWindow.Styles.centeredLeft : DebugWindow.Styles.centeredLeftAlternate);
                 }
                 else if (child.GetType() == typeof(DebugUI.ColorField))
                 {

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -10,6 +10,7 @@
 using UnityEngine;
 using UnityEngine.Assertions;
 using UnityEngine.Rendering;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
 
 namespace UnityEditor.Rendering
 {
@@ -582,6 +583,7 @@ public class Styles
             public readonly Color skinBackgroundColor;
 
             public static GUIStyle centeredLeft = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleLeft };
+            public static GUIStyle centeredLeftAlternate = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleLeft };
             public static float singleRowHeight = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
 
             public static int foldoutColumnWidth = 70;
@@ -593,6 +595,12 @@ public Styles()
                 Color backgroundColorDarkSkin = new Color32(38, 38, 38, 128);
                 Color backgroundColorLightSkin = new Color32(128, 128, 128, 96);
 
+                centeredLeftAlternate.normal.background = CoreEditorUtils.CreateColoredTexture2D(
+                    EditorGUIUtility.isProSkin
+                        ? new Color(63 / 255.0f, 63 / 255.0f, 63 / 255.0f, 255 / 255.0f)
+                        : new Color(202 / 255.0f, 202 / 255.0f, 202 / 255.0f, 255 / 255.0f),
+                    "centeredLeftAlternate Background");
+
                 sectionScrollView = new GUIStyle(sectionScrollView);
                 sectionScrollView.overflow.bottom += 1;
 
@@ -604,6 +612,15 @@ public Styles()
                 sectionHeader.margin.left += 1;
                 sectionHeader.normal.textColor = EditorGUIUtility.isProSkin ? textColorDarkSkin : textColorLightSkin;
                 skinBackgroundColor = EditorGUIUtility.isProSkin ? backgroundColorDarkSkin : backgroundColorLightSkin;
+
+                // Make sure that textures are unloaded on domain reloads.
+                void OnBeforeAssemblyReload()
+                {
+                    UnityEngine.Object.DestroyImmediate(centeredLeftAlternate.normal.background);
+                    AssemblyReloadEvents.beforeAssemblyReload -= OnBeforeAssemblyReload;
+                }
+
+                AssemblyReloadEvents.beforeAssemblyReload += OnBeforeAssemblyReload;
             }
         }
 

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsVolumes.cs

@@ -80,7 +80,10 @@ public IEnumerable<Camera> cameras
 
                     if (camera.cameraType != CameraType.Preview && camera.cameraType != CameraType.Reflection)
                     {
-                        if (camera.TryGetComponent<T>(out T additionalData))
+                        if (!camera.TryGetComponent<T>(out T additionalData))
+                            additionalData = camera.gameObject.AddComponent<T>();
+
+                        if (additionalData != null)
                             m_Cameras.Add(camera);
                     }
                 }
@@ -270,21 +273,9 @@ public bool RefreshVolumes(Volume[] newVolumes)
         /// <returns>The weight of the volume</returns>
         public float GetVolumeWeight(Volume volume)
         {
-            if (weights == null)
-                return 0;
-
-            float total = 0f, weight = 0f;
-            for (int i = 0; i < volumes.Length; i++)
-            {
-                weight = weights[i];
-                weight *= 1f - total;
-                total += weight;
-
-                if (volumes[i] == volume)
-                    return weight;
-            }
-
-            return 0f;
+            // TODO: Store the calculated weight in the stack for the volumes that have influence and return it here
+            var triggerPos = selectedCameraPosition;
+            return ComputeWeight(volume, triggerPos);
         }
 
         /// <summary>
@@ -294,14 +285,9 @@ public float GetVolumeWeight(Volume volume)
         /// <returns>If the volume has influence</returns>
         public bool VolumeHasInfluence(Volume volume)
         {
-            if (weights == null)
-                return false;
-
-            int index = Array.IndexOf(volumes, volume);
-            if (index == -1)
-                return false;
-
-            return weights[index] != 0f;
+            // TODO: Store the calculated weight in the stack for the volumes that have influence and return it here
+            var triggerPos = selectedCameraPosition;
+            return ComputeWeight(volume, triggerPos) > 0.0f;
         }
     }
 }

Packages/com.unity.render-pipelines.core/Runtime/Debugging/VolumeDebugSettings.cs

@@ -162,6 +162,17 @@ internal static void FindParameters(object o, List<VolumeParameter> parameters,
                     if (filter?.Invoke(field) ?? true)
                     {
                         VolumeParameter volumeParameter = (VolumeParameter)field.GetValue(o);
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+                        var attr = (DisplayInfoAttribute[])field.GetCustomAttributes(typeof(DisplayInfoAttribute), true);
+                        if (attr.Length != 0)
+                        {
+                            volumeParameter.debugId = attr[0].name;
+                        }
+                        else
+                        {
+                            volumeParameter.debugId = field.Name;
+                        }
+#endif
                         parameters.Add(volumeParameter);
                     }
                 }

Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs

@@ -18,6 +18,10 @@ namespace UnityEngine.Rendering
     /// <seealso cref="VolumeParameter{T}"/>
     public abstract class VolumeParameter : ICloneable
     {
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+        internal string debugId { get; set; }
+#endif
+
         /// <summary>
         /// A beautified string for debugger output. This is set on a <c>DebuggerDisplay</c> on every
         /// parameter types.

Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs

@@ -276,20 +276,28 @@ SHADOW_TYPE EvaluateShadow_Directional( LightLoopContext lightLoopContext, Posit
         }
         else if (shadowSplitIndex == int(_CascadeShadowCount) - 1)
         {
-            // float fade = lightLoopContext.shadowContext.fade;
-            float3 camToPixel = posInput.positionWS - GetPrimaryCameraPosition();
-            float distanceCamToPixel2 = dot(camToPixel, camToPixel);
-
-            HDDirectionalShadowData dsd = lightLoopContext.shadowContext.directionalShadowData;
-            float fade = saturate(distanceCamToPixel2 * dsd.fadeScale + dsd.fadeBias);
+            float fade = lightLoopContext.shadowContext.fade;
             // In the transition code (both dithering and blend) we use shadow = lerp( shadow, 1.0, fade ) for last transition
             // mean if we expend the code we have (shadow * (1 - fade) + fade). Here to make transition with shadow mask
             // we will remove fade and add fade * shadowMask which mean we do a lerp with shadow mask
             shadow = shadow - fade + fade * shadowMask;
         }
 
         // See comment in EvaluateBSDF_Punctual
-        shadow = light.nonLightMappedOnly ? min(shadowMask, shadow) : shadow;
+        if (light.nonLightMappedOnly)
+        {
+            shadow = min(shadowMask, shadow);
+        }
+        else
+        {
+            // Use shadowmask when shadow value ​​cannot be retrieved due to shadow caster culling.
+            float3 camToPixel = posInput.positionWS - GetPrimaryCameraPosition();
+            float distanceCamToPixel2 = dot(camToPixel, camToPixel);
+
+            HDDirectionalShadowData dsd = lightLoopContext.shadowContext.directionalShadowData;
+            float alpha = saturate(distanceCamToPixel2 * dsd.fadeScale + dsd.fadeBias);
+            shadow = min(shadow, lerp(1.0, shadowMask, alpha * alpha));
+        }
     #endif
 
         shadow = lerp(shadowMask.SHADOW_TYPE_REPLICATE, shadow, light.shadowDimmer);

Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl

@@ -143,7 +143,8 @@
     * [Scriptable Render Passes](renderer-features/scriptable-render-passes.md)
       * [Scriptable Render Passes](renderer-features/intro-to-scriptable-render-passes.md)
       * [Write a Scriptable Render Pass](renderer-features/write-a-scriptable-render-pass.md)
-      * [Inject a pass via scripting](customize/inject-render-pass-via-script.md)    
+      * [Inject a pass via scripting](customize/inject-render-pass-via-script.md)  
+      * [Restrict a render pass to a scene area](customize/restrict-render-pass-scene-area.md)        
     * [Scriptable Renderer Features](renderer-features/scriptable-renderer-features/scriptable-renderer-features-landing.md)
       * [Introduction to Scriptable Renderer Features](renderer-features/scriptable-renderer-features/intro-to-scriptable-renderer-features.md)
       * [Inject a custom render pass using a Scriptable Renderer Feature](renderer-features/scriptable-renderer-features/inject-a-pass-using-a-scriptable-renderer-feature.md)

Packages/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md

@@ -0,0 +1,112 @@
+# Restrict a render pass to a scene area in URP
+
+To restrict a render pass to a specific area of a scene, add a [volume](../Volumes.md) to the scene, then add code to your render pass and your shader to check if the camera is inside the volume.
+
+Follow these steps:
+
+1. Update your shader code to enable or disable your custom rendering effect based on a Boolean value.
+
+    For example, add the following code to your shader:
+
+    ```hlsl
+    Pass
+    {
+        ...
+
+        // Add a variable to enable or disable your custom rendering effect
+        float _Enabled;
+
+        ...
+
+        float4 Frag(Varyings input) : SV_Target0
+        {
+            ...
+
+            // Return the color with the effect if the variable is 1, or the original color if the variable is 0
+            if (_Enabled == 1){
+                return colorWithEffect;
+            } else {
+                return originalColor;
+            }
+        }
+    }
+    ```
+
+2. Create a script that implements the `VolumeComponent` class. This creates a volume override component that you can add to a volume.
+
+    ```c#
+    using UnityEngine;
+    using UnityEngine.Rendering;
+
+    public class MyVolumeOverride : VolumeComponent
+    {
+    }
+    ```
+
+3. In the **Hierarchy** window, select the **Add** (**+**) button, then select **GameObject** > **Volume** > **Box Volume**.
+
+4. In the **Inspector** window for the new box volume, under **Volume**, select **New** to create a new volume profile.
+
+5. Select **Add override**, then select your volume override component, for example **My Volume Override**.
+
+6. Add a property to the volume override script. Unity adds the property in the **Inspector** window of the volume override.
+
+    For example:
+
+    ```c#
+    public class MyVolumeOverride : VolumeComponent
+    {
+        // Add an 'Effect Enabled' checkbox to the Volume Override, with a default value of true.
+        public BoolParameter effectEnabled = new BoolParameter(true);
+    }
+    ```
+
+5. In your custom pass, use the `GetComponent` API to get the volume override component and check the value of the property.
+
+    For example:
+
+    ```c#
+    class myCustomPass : ScriptableRenderPass
+    {
+
+        ...
+
+        public void Setup(Material material)
+        {
+            // Get the volume override component
+            MyVolumeOverride myOverride = VolumeManager.instance.stack.GetComponent<MyVolumeOverride>();
+
+            // Get the value of the 'Effect Enabled' property
+            bool effectStatus = myOverride.effectEnabled.overrideState ? myOverride.effectEnabled.value : false;
+        }
+    }
+    ```
+
+6. Pass the value of the property to the variable you added to the shader code.
+
+    For example:
+
+    ```c#
+    class myCustomPass : ScriptableRenderPass
+    {
+
+        ...
+
+        public void Setup(Material material)
+        {
+            MyVolumeOverride myOverride = VolumeManager.instance.stack.GetComponent<MyVolumeOverride>();
+            bool effectStatus = myOverride.effectEnabled.overrideState ? myOverride.effectEnabled.value : false;
+
+            // Pass the value to the shader
+            material.SetFloat("_Enabled", effectStatus ? 1 : 0);
+        }
+    }
+    ```
+
+Your custom rendering effect is now enabled when the camera is inside the volume, and disabled when the camera is outside the volume.
+
+## Additional resources
+
+- [Write a Scriptable Render Pass](../renderer-features/write-a-scriptable-render-pass.md)
+- [Volumes in URP](../volumes.md)
+- [Writing custom shaders in URP](../writing-custom-shaders-urp.md)

Packages/com.unity.render-pipelines.universal/Documentation~/customize/restrict-render-pass-scene-area.md

@@ -7,6 +7,7 @@ Use the `ScriptableRenderPass` API to write a custom render pass. You can then i
 |[Introduction to Scriptable Render Passes](intro-to-scriptable-render-passes.md)|What a Scriptable Render Pass is, and how you can inject it into a scene.|
 |[Write a Scriptable Render Pass](write-a-scriptable-render-pass.md)|An example of a `ScriptableRenderPass` instance that uses `Blit` to create a red tint effect.|
 |[Inject a pass via scripting](../customize/inject-render-pass-via-script.md)|Use the `RenderPipelineManager` API to inject a render pass, without using a Scriptable Renderer Feature.|
+|[Restrict a render pass to a scene area](../customize/restrict-render-pass-scene-area.md) | Enable a custom rendering effect only if the camera is inside a volume in a scene. |
 
 ## Additional resources