Merge Hd/bugfix

com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeUI.Drawer.cs

@@ -139,7 +139,8 @@ static void Drawer_VolumeContent(SerializedProbeVolume serialized, Editor owner)
             EditorGUI.BeginChangeCheck();
             if ((serialized.serializedObject.targetObject as ProbeVolume).mightNeedRebaking)
             {
-                EditorGUILayout.HelpBox("The probe volume has changed since last baking or the data was never baked.\nPlease bake lighting in the lighting panel to update the lighting data.", MessageType.Warning, wide: true);
+                var helpBoxRect = GUILayoutUtility.GetRect(new GUIContent(Styles.s_ProbeVolumeChangedMessage, EditorGUIUtility.IconContent("Warning@2x").image), EditorStyles.helpBox);
+                EditorGUI.HelpBox(helpBoxRect, Styles.s_ProbeVolumeChangedMessage, MessageType.Warning);
             }
 
             EditorGUILayout.PropertyField(serialized.globalVolume, Styles.s_GlobalVolume);

com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeUI.Skin.cs

@@ -11,6 +11,7 @@ internal static class Styles
             internal static readonly GUIContent s_MinMaxSubdivSlider = new GUIContent("Subdivision Controller", "Control how much the probe baking system will subdivide in this volume.\nBoth min and max values are used to compute the allowed subdivision levels inside this volume. e.g. a Min subdivision of 2 will ensure that there is at least 2 levels of subdivision everywhere in the volume.");
             internal static readonly GUIContent s_ObjectLayerMask = new GUIContent("Object Layer Mask", "Control which layers will be used to select the meshes for the probe placement algorithm.");
             internal static readonly GUIContent s_GeometryDistanceOffset = new GUIContent("Geometry Distance Offset", "Affects the minimum distance at which the subdivision system will place probes near the geometry.");
+            internal static readonly string s_ProbeVolumeChangedMessage = "The probe volume has changed since last baking or the data was never baked.\nPlease bake lighting in the lighting panel to update the lighting data.";
 
             internal static readonly Color k_GizmoColorBase = new Color32(137, 222, 144, 255);
 

com.unity.render-pipelines.core/Editor/LookDev/DisplayWindow.EnvironmentLibrarySidePanel.cs

@@ -291,6 +291,7 @@ void RefreshLibraryDisplay()
                     m_EnvironmentListToolbar.style.visibility = Visibility.Visible;
                     m_NoEnvironmentList.style.display = DisplayStyle.None;
                 }
+                m_EnvironmentList.RefreshItems();
             }
         }
 

com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs

@@ -2,6 +2,7 @@
 using UnityEngine.Rendering.LookDev;
 using UnityEditorInternal;
 using UnityEngine;
+using System.Linq;
 
 namespace UnityEditor.Rendering.LookDev
 {
@@ -32,6 +33,11 @@ internal static Context currentContext
             {
                 if (s_CurrentContext == null || s_CurrentContext.Equals(null))
                 {
+                    // In case the context is still alive somewhere but the static reference has been lost, we can find the object back with this
+                    s_CurrentContext = TryFindCurrentContext();
+                    if (s_CurrentContext != null)
+                        return s_CurrentContext;
+
                     s_CurrentContext = LoadConfigInternal();
                     if (s_CurrentContext == null)
                         s_CurrentContext = defaultContext;
@@ -43,11 +49,22 @@ internal static Context currentContext
             private set => s_CurrentContext = value;
         }
 
+        static Context TryFindCurrentContext()
+        {
+            Context context = s_CurrentContext;
+
+            if (context != null)
+                return context;
+
+            return Resources.FindObjectsOfTypeAll<Context>().FirstOrDefault();
+        }
+
         static Context defaultContext
         {
             get
             {
                 var context = UnityEngine.ScriptableObject.CreateInstance<Context>();
+                context.hideFlags = HideFlags.HideAndDontSave;
                 context.Init();
                 return context;
             }
@@ -132,7 +149,7 @@ internal static void Initialize(DisplayWindow window)
 
             // Lookdev Initialize can be called when the window is re-created by the editor layout system.
             // In that case, the current context won't be null and there might be objects to reload from the temp ID
-            ConfigureLookDev(reloadWithTemporaryID: s_CurrentContext != null);
+            ConfigureLookDev(reloadWithTemporaryID: TryFindCurrentContext() != null);
         }
 
         [Callbacks.DidReloadScripts]

com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs

@@ -14,14 +14,16 @@ namespace UnityEngine.Rendering
     [CoreRPHelpURLAttribute("Free-Camera")]
     public class FreeCamera : MonoBehaviour
     {
+        const float k_MouseSensitivityMultiplier = 0.01f;
+
         /// <summary>
         /// Rotation speed when using a controller.
         /// </summary>
         public float m_LookSpeedController = 120f;
         /// <summary>
         /// Rotation speed when using the mouse.
         /// </summary>
-        public float m_LookSpeedMouse = 10.0f;
+        public float m_LookSpeedMouse = 4.0f;
         /// <summary>
         /// Movement speed.
         /// </summary>
@@ -51,7 +53,6 @@ public class FreeCamera : MonoBehaviour
         InputAction lookAction;
         InputAction moveAction;
         InputAction speedAction;
-        InputAction fireAction;
         InputAction yMoveAction;
 #endif
 
@@ -94,7 +95,6 @@ void RegisterInputs()
             moveAction.Enable();
             lookAction.Enable();
             speedAction.Enable();
-            fireAction.Enable();
             yMoveAction.Enable();
 #endif
 
@@ -129,8 +129,8 @@ void UpdateInputs()
 
 #if USE_INPUT_SYSTEM
             var lookDelta = lookAction.ReadValue<Vector2>();
-            inputRotateAxisX = lookDelta.x * m_LookSpeedMouse * Time.deltaTime;
-            inputRotateAxisY = lookDelta.y * m_LookSpeedMouse * Time.deltaTime;
+            inputRotateAxisX = lookDelta.x * m_LookSpeedMouse * k_MouseSensitivityMultiplier;
+            inputRotateAxisY = lookDelta.y * m_LookSpeedMouse * k_MouseSensitivityMultiplier;
 
             leftShift = Keyboard.current.leftShiftKey.isPressed;
             fire1 = Mouse.current?.leftButton?.isPressed == true || Gamepad.current?.xButton?.isPressed == true;
@@ -148,8 +148,8 @@ void UpdateInputs()
                 inputRotateAxisX = Input.GetAxis(kMouseX) * m_LookSpeedMouse;
                 inputRotateAxisY = Input.GetAxis(kMouseY) * m_LookSpeedMouse;
             }
-            inputRotateAxisX += (Input.GetAxis(kRightStickX) * m_LookSpeedController * Time.deltaTime);
-            inputRotateAxisY += (Input.GetAxis(kRightStickY) * m_LookSpeedController * Time.deltaTime);
+            inputRotateAxisX += (Input.GetAxis(kRightStickX) * m_LookSpeedController * k_MouseSensitivityMultiplier);
+            inputRotateAxisY += (Input.GetAxis(kRightStickY) * m_LookSpeedController * k_MouseSensitivityMultiplier);
 
             leftShift = Input.GetKey(KeyCode.LeftShift);
             fire1 = Input.GetAxis("Fire1") > 0.0f;

com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs

@@ -347,6 +347,9 @@ public void Update(VolumeStack stack, Transform trigger, LayerMask layerMask)
             // Traverse all volumes
             foreach (var volume in volumes)
             {
+                if (volume == null)
+                    continue;
+
 #if UNITY_EDITOR
                 // Skip volumes that aren't in the scene currently displayed in the scene view
                 if (!IsVolumeRenderedByCamera(volume, camera))
@@ -417,6 +420,7 @@ public void Update(VolumeStack stack, Transform trigger, LayerMask layerMask)
         public Volume[] GetVolumes(LayerMask layerMask)
         {
             var volumes = GrabVolumes(layerMask);
+            volumes.RemoveAll(v => v == null);
             return volumes.ToArray();
         }
 

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -315,6 +315,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed an issue with reflection probe normalization via APV when no probes are in scene.
 - Fixed Volumetric Clouds not updated when using RenderTexture as input for cloud maps.
 - Fixed custom post process name not displayed correctly in GPU markers.
+- Fixed objects disappearing from Lookdev window when entering playmode (case 1309368).
+- Fixed rendering of objects just after the TAA pass (before post process injection point).
+- Fixed tiled artifacts in refraction at borders between two reflection probes.
+- Fixed the FreeCamera and SimpleCameraController mouse rotation unusable at low framerate (case 1340344).
+- Fixed warning "Releasing render texture that is set to be RenderTexture.active!" on pipeline disposal / hdrp live editing.
+- Fixed a null ref exception when adding a new environment to the Look Dev library.
+- Fixed a nullref in volume system after deleting a volume object (case 1348374).
+- Fixed the APV UI loosing focus when the helpbox about baking appears in the probe volume.
 
 ### Changed
 - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard

com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs

@@ -252,10 +252,6 @@ static HDWizard()
 
         static void WizardBehaviourDelayed()
         {
-            if (!HDProjectSettings.wizardIsStartPopup)
-                throw new Exception(
-                    $"HDProjectSettings.wizardIsStartPopup must be true");
-
             if (frameToWait > 0)
             {
                 --frameToWait;
@@ -265,6 +261,10 @@ static void WizardBehaviourDelayed()
             // No need to update this method, unsubscribe from the application update
             EditorApplication.update -= WizardBehaviourDelayed;
 
+            // If the wizard does not need to be shown at start up, do nothing.
+            if (!HDProjectSettings.wizardIsStartPopup)
+                return;
+
             //Application.isPlaying cannot be called in constructor. Do it here
             if (Application.isPlaying)
                 return;
@@ -307,10 +307,6 @@ static void CheckPersistencyPopupAlreadyOpened()
         [Callbacks.DidReloadScripts]
         static void WizardBehaviour()
         {
-            // If the wizard does not need to be shown at start up, do nothing.
-            if (!HDProjectSettings.wizardIsStartPopup)
-                return;
-
             //We need to wait at least one frame or the popup will not show up
             frameToWait = 10;
             EditorApplication.update += WizardBehaviourDelayed;

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

@@ -349,21 +349,46 @@ void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BS
         }
     #endif
 
-        EnvLightData envLightData;
-        if (envLightCount > 0)
-        {
-            envLightData = FetchEnvLight(envLightStart, 0);
-        }
-        else
-        {
-            envLightData = InitSkyEnvLightData(0);
-        }
+#if HAS_REFRACTION
 
+        // For refraction to be stable, we should reuse the same refraction probe for the whole object.
+        // Otherwise as if the object span different tiles it could produce a different refraction probe picking and thus have visual artifacts.
+        // For this we need to find the tile that is at the center of the object that is being rendered.
+        // And then select the first refraction probe of this list.
         if ((featureFlags & LIGHTFEATUREFLAGS_SSREFRACTION) && (_EnableSSRefraction > 0))
         {
+            // grab current object position and retrieve in which tile it belongs too
+            float4x4 modelMat = GetObjectToWorldMatrix();
+            float3 objPos = modelMat._m03_m13_m23;
+            float4 posClip = TransformWorldToHClip(objPos);
+            posClip.xyz = posClip.xyz / posClip.w;
+
+            uint2 tileObj = (saturate(posClip.xy * 0.5f + 0.5f) * _ScreenSize.xy) / GetTileSize();
+
+            uint envLightStart, envLightCount;
+
+            // Fetch first env light to provide the scene proxy for screen space refraction computation
+            PositionInputs localInput;
+            ZERO_INITIALIZE(PositionInputs, localInput);
+            localInput.tileCoord = tileObj.xy;
+            localInput.linearDepth = posClip.w;
+
+            GetCountAndStart(localInput, LIGHTCATEGORY_ENV, envLightStart, envLightCount);
+
+            EnvLightData envLightData;
+            if (envLightCount > 0)
+            {
+                envLightData = FetchEnvLight(FetchIndex(envLightStart, 0));
+            }
+            else // If no refraction probe, use sky
+            {
+                envLightData = InitSkyEnvLightData(0);
+            }
+
             IndirectLighting lighting = EvaluateBSDF_ScreenspaceRefraction(context, V, posInput, preLightData, bsdfData, envLightData, refractionHierarchyWeight);
             AccumulateIndirectLighting(lighting, aggregateLighting);
         }
+#endif
 
 
 #if defined(PROBE_VOLUMES_L1) || defined(PROBE_VOLUMES_L2)

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs

@@ -483,6 +483,7 @@ TextureHandle RenderPostProcess(RenderGraph     renderGraph,
                     if (hdCamera.antialiasing == HDAdditionalCameraData.AntialiasingMode.TemporalAntialiasing)
                     {
                         source = DoTemporalAntialiasing(renderGraph, hdCamera, depthBuffer, motionVectors, depthBufferMipChain, source, postDoF: false, "TAA Destination");
+                        RestoreNonjitteredMatrices(renderGraph, hdCamera);
                     }
                     else if (hdCamera.antialiasing == HDAdditionalCameraData.AntialiasingMode.SubpixelMorphologicalAntiAliasing)
                     {
@@ -539,6 +540,34 @@ TextureHandle RenderPostProcess(RenderGraph     renderGraph,
             return dest;
         }
 
+        class RestoreNonJitteredPassData
+        {
+            public ShaderVariablesGlobal globalCB;
+            public HDCamera hdCamera;
+        }
+
+        void RestoreNonjitteredMatrices(RenderGraph renderGraph, HDCamera hdCamera)
+        {
+            using (var builder = renderGraph.AddRenderPass<RestoreNonJitteredPassData>("Restore Non-Jittered Camera Matrices", out var passData))
+            {
+                passData.hdCamera = hdCamera;
+                passData.globalCB = m_ShaderVariablesGlobalCB;
+
+                builder.SetRenderFunc((RestoreNonJitteredPassData data, RenderGraphContext ctx) =>
+                {
+                    // Note about AfterPostProcess and TAA:
+                    // When TAA is enabled rendering is jittered and then resolved during the post processing pass.
+                    // It means that any rendering done after post processing need to disable jittering. This is what we do with hdCamera.UpdateViewConstants(false);
+                    // The issue is that the only available depth buffer is jittered so pixels would wobble around depth tested edges.
+                    // In order to avoid that we decide that objects rendered after Post processes while TAA is active will not benefit from the depth buffer so we disable it.
+                    data.hdCamera.UpdateAllViewConstants(false);
+                    data.hdCamera.UpdateShaderVariablesGlobalCB(ref data.globalCB);
+
+                    ConstantBuffer.PushGlobal(ctx.cmd, data.globalCB, HDShaderIDs._ShaderVariablesGlobal);
+                });
+            }
+        }
+
         #region AfterPostProcess
         class AfterPostProcessPassData
         {
@@ -577,14 +606,6 @@ TextureHandle RenderAfterPostProcessObjects(RenderGraph renderGraph, HDCamera hd
                 builder.SetRenderFunc(
                     (AfterPostProcessPassData data, RenderGraphContext ctx) =>
                     {
-                        // Note about AfterPostProcess and TAA:
-                        // When TAA is enabled rendering is jittered and then resolved during the post processing pass.
-                        // It means that any rendering done after post processing need to disable jittering. This is what we do with hdCamera.UpdateViewConstants(false);
-                        // The issue is that the only available depth buffer is jittered so pixels would wobble around depth tested edges.
-                        // In order to avoid that we decide that objects rendered after Post processes while TAA is active will not benefit from the depth buffer so we disable it.
-                        data.hdCamera.UpdateAllViewConstants(false);
-                        data.hdCamera.UpdateShaderVariablesGlobalCB(ref data.globalCB);
-
                         UpdateOffscreenRenderingConstants(ref data.globalCB, true, 1.0f);
                         ConstantBuffer.PushGlobal(ctx.cmd, data.globalCB, HDShaderIDs._ShaderVariablesGlobal);
 

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs

@@ -648,6 +648,8 @@ void InitializeRenderStateBlocks()
         /// <param name="disposing">Is disposing.</param>
         protected override void Dispose(bool disposing)
         {
+            Graphics.ClearRandomWriteTargets();
+            Graphics.SetRenderTarget(null);
             DisposeProbeCameraPool();
 
             UnsetRenderingFeatures();

com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs

@@ -8,6 +8,8 @@
 
 public class LookWithMouse : MonoBehaviour
 {
+    const float k_MouseSensitivityMultiplier = 0.01f;
+
     public float mouseSensitivity = 100f;
 
     public Transform playerBody;
@@ -39,11 +41,11 @@ void Update()
             mouseY += value.y;
         }
 
-        mouseX *= mouseSensitivity * Time.deltaTime;
-        mouseY *= mouseSensitivity * Time.deltaTime;
+        mouseX *= mouseSensitivity * k_MouseSensitivityMultiplier;
+        mouseY *= mouseSensitivity * k_MouseSensitivityMultiplier;
 #else
-        float mouseX = Input.GetAxis("Mouse X") * mouseSensitivity * Time.deltaTime;
-        float mouseY = Input.GetAxis("Mouse Y") * mouseSensitivity * Time.deltaTime;
+        float mouseX = Input.GetAxis("Mouse X") * mouseSensitivity * k_MouseSensitivityMultiplier;
+        float mouseY = Input.GetAxis("Mouse Y") * mouseSensitivity * k_MouseSensitivityMultiplier;
 #endif
 
         xRotation -= mouseY;

com.unity.template-hd/Assets/SampleSceneAssets/Scripts/SimpleCameraController.cs

@@ -54,6 +54,8 @@ public void UpdateTransform(Transform t)
             }
         }
 
+        const float k_MouseSensitivityMultiplier = 0.01f;
+
         CameraState m_TargetCameraState = new CameraState();
         CameraState m_InterpolatingCameraState = new CameraState();
 
@@ -165,8 +167,6 @@ Vector3 GetInputTranslationDirection()
 
         void Update()
         {
-            // Exit Sample
-
             if (IsEscapePressed())
             {
                 Application.Quit();
@@ -191,7 +191,7 @@ void Update()
             // Rotation
             if (IsCameraRotationAllowed())
             {
-                var mouseMovement = GetInputLookRotation() * Time.deltaTime * mouseSensitivity;
+                var mouseMovement = GetInputLookRotation() * k_MouseSensitivityMultiplier * mouseSensitivity;
                 if (invertY)
                     mouseMovement.y = -mouseMovement.y;
 
@@ -243,7 +243,7 @@ Vector2 GetInputLookRotation()
             delta *= 0.1f; // Account for sensitivity setting on old Mouse X and Y axes.
             return delta;
 #else
-            return new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y") * (invertY ? 1 : -1));
+            return new Vector2(Input.GetAxis("Mouse X"), Input.GetAxis("Mouse Y"));
 #endif
         }