Merge pull request #8261 from Unity-Technologies/internal/6000.3/staging

Mirror Internal/6000.3/staging

Author: KEngelstoft

Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs

@@ -48,7 +48,7 @@ VisualElement panelRoot
     {
         get
         {
-            _panelRoot ??= injectingElement.panel.visualTree;
+            _panelRoot ??= injectingElement?.panel?.visualTree;
             return _panelRoot;
         }
     }
@@ -82,11 +82,11 @@ VisualElement IPackageManagerExtension.CreateExtensionUI()
 
     void RefreshSampleButtons()
     {
-        if (injectingElement == null || m_PackageInfo == null || m_SampleList == null)
+        if (injectingElement == null || m_PackageInfo == null || m_SampleList == null || panelRoot == null)
             return;
 
         // Call refresh of samples and button injection when switching to the "Samples" tab.
-        if (samplesButton == null )
+        if (samplesButton == null)
         {
             samplesButton = panelRoot.Q<Button>(name: samplesButtonName);
             if (samplesButton != null)

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

@@ -32,10 +32,6 @@ private void Reset()
         /// <param name="settings"><see cref="IDebugDisplaySettings"/> to be registered</param>
         public void RegisterDebug(IDebugDisplaySettings settings)
         {
-#if UNITY_EDITOR
-            if (UnityEditor.BuildPipeline.isBuildingPlayer)
-                return;
-#endif
             DebugManager debugManager = DebugManager.instance;
             List<IDebugDisplaySettingsPanelDisposable> panels = new List<IDebugDisplaySettingsPanelDisposable>();
 

Packages/com.unity.render-pipelines.core/Samples~/Common/Scripts/InstallPackage.cs

@@ -1,6 +1,3 @@
-using UnityEditor;
-using UnityEditor.PackageManager;
-using UnityEditor.PackageManager.Requests;
 using UnityEngine;
 
 public class InstallPackage : MonoBehaviour

Packages/com.unity.render-pipelines.high-definition/Documentation~/water-vfx-interaction.md

@@ -6,11 +6,17 @@ However there are several simulations that are important to be aware of.
 As the water surface gameobject is saved inside a scene, and the VFX graph is an asset on disk, it is not possible to directly reference the surface from within the graph. This means data of the water surface need to be set globally by the user before the VFX can sample the water.
 As a result, only a single surface can be sampled from any VFX Graph at any given time.
 
-Additionally, the settings on the Sample node in the VFX Graph needs to be set according to what water surfaces will be bound globally at runtime. This inclues setting the proper **Surface Type** and enabling **Include Current** if a current map is assigned on the water surface.
+Additionally, the settings on the Sample node in the VFX Graph needs to be set according to what water surfaces will be bound globally at runtime. This includes setting the proper **Surface Type** and enabling **Include Current** if a current map is assigned on the water surface.
 The **Evaluate Ripples** needs to be disabled if the surface doesn't have ripples, but can be disabled on purpose for performance reasons even if the surface has ripplies, at the cost of slighly lower precision in the results. The same applies to the **Include Deformation** option.
+Finally, to ensure proper masking is applied, the option **Use Mask and Current Water Decals Workflow** must be set to match the **Enable Mask And Current Water Decals** setting in the Graphics settings.
+
 
 The following script can be used to bind the relevant textures in the global scope, so that the VFX Graph can access them.
+Alternatively, can also use the more complete script WaterSurfaceBindVFXEditor.cs, located in the HDRP Package Manager Water samples.
 ```
+using UnityEngine; 
+using UnityEngine.Rendering.HighDefinition; 
+
 public class WaterSurfaceBinder : MonoBehaviour 
 {
     public WaterSurface waterSurface;

Packages/com.unity.render-pipelines.high-definition/Editor/Water/WaterSurface/VFX/SampleWaterSurface.cs

@@ -46,6 +46,9 @@ class SampleWaterSurface : VFXOperator
         [VFXSetting(VFXSettingAttribute.VisibleFlags.Default)]
         [Tooltip("Specifies if the search should sample the current map.")]
         protected bool includeCurrent = false;
+        [VFXSetting(VFXSettingAttribute.VisibleFlags.Default)]
+        [Tooltip("Specifies if the system use mask and current water decal workflow. This has to be set in accordance with the same checkbox in the Graphics Settings.")]
+        protected bool useMaskAndCurrentWaterDecalsWorkflow = false;
 
         public class InputProperties
         {
@@ -107,6 +110,9 @@ protected override sealed VFXExpression[] BuildExpression(VFXExpression[] inputE
             if (!includeDeformation) baseCode += "#define IGNORE_WATER_DEFORMATION\n";
             if (includeCurrent) baseCode += "#define WATER_LOCAL_CURRENT\n";
 
+            // We need this because water decals can attenuate frequency bands using a water mask when Mask and Current Water Decals workflow is enabled.
+            if (useMaskAndCurrentWaterDecalsWorkflow)   baseCode += "#define WATER_DECAL_COMPLETE\n";
+
             baseCode += $"#include \"{m_SampleWaterSurface}\"\n";
 
             string FindVerticalDisplacements = $"float error; int steps; float3 normal; float2 current; float height = FindVerticalDisplacement(positionWS, {maxIterations}, {error.ToString("0.00", System.Globalization.CultureInfo.InvariantCulture)}, steps, error, normal, current);";

Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs

@@ -2125,11 +2125,6 @@ void UnregisterRenderingDebug()
 
         internal void RegisterDebug()
         {
-#if UNITY_EDITOR
-            if (UnityEditor.BuildPipeline.isBuildingPlayer)
-                return;
-#endif
-            
             RegisterMaterialDebug();
             RegisterLightingDebug();
             RegisterRenderingDebug();
@@ -2149,7 +2144,7 @@ void UnregisterDebugItems(string panelName, DebugUI.Widget[] items)
         {
             if (items == null || items.Length == 0)
                 return;
-            
+
             var panel = DebugManager.instance.GetPanel(panelName);
             if (panel != null)
                 panel.children.Remove(items);

Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs

@@ -343,7 +343,7 @@ static WaterSimulationTapData EvaluateDisplacementData(WaterSimSearchData wsd, f
             EvaluateSimulationDisplacement(wsd, currentLocation, includeSimulation, out data.horizontalDisplacement, out data.direction, out data.verticalDisplacements);
 
             // Evaluate the distance to the reference point
-            data.offset = (currentLocation.xz + data.horizontalDisplacement) - referencePosition.xz;
+            data.offset = currentLocation.xz - referencePosition.xz;
             data.distance = length(data.offset);
 
             return data;

Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl

@@ -579,7 +579,7 @@ TapData EvaluateDisplacementData(float3 currentLocation, float3 referencePositio
     EvaluateSimulationDisplacement(currentLocation, data.horizontalDisplacement, data.verticalDisplacements);
 
     // Evaluate the distance to the reference point
-    data.offset = (currentLocation.xz + data.horizontalDisplacement) - referencePosition.xz;
+    data.offset = currentLocation.xz - referencePosition.xz;
     data.distance = length(data.offset);
 
     return data;

Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/Scripts/CurrentWithSplines/SplineToTexture.cs

@@ -3,11 +3,11 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering.HighDefinition;
-using UnityEditor.PackageManager.Requests;
-using UnityEditor.PackageManager;
 #if SPLINE_PACKAGE_INSTALLED
-    using UnityEditor.Splines;
-    using UnityEngine.Splines;
+    #if UNITY_EDITOR
+        using UnityEditor.Splines;
+    #endif
+using UnityEngine.Splines;
 #endif
 
 [ExecuteInEditMode]
@@ -51,7 +51,7 @@ void OnEnable()
 
     void HookCallbacks()
     {
-#if SPLINE_PACKAGE_INSTALLED
+#if SPLINE_PACKAGE_INSTALLED && UNITY_EDITOR
         if (splineContainer != null)
             foreach (Spline spline in splineContainer.Splines)
                 EditorSplineUtility.AfterSplineWasModified += OnAfterSplineWasModified;
@@ -60,7 +60,7 @@ void HookCallbacks()
 
     void UnhookCallbacks()
     {
-#if SPLINE_PACKAGE_INSTALLED
+#if SPLINE_PACKAGE_INSTALLED && UNITY_EDITOR
         if (splineContainer != null)
             foreach (Spline spline in splineContainer.Splines)
                 EditorSplineUtility.AfterSplineWasModified -= OnAfterSplineWasModified;
@@ -308,6 +308,8 @@ public void RunCompute()
 #endif
         }
     }
+
+#if UNITY_EDITOR
     public void OpenDialogAndSaveCurrentMap()
     {
         var path = EditorUtility.SaveFilePanel("Save current map", "","currentMap","png");
@@ -329,6 +331,7 @@ public static void SaveTextureOnDisk(RenderTexture renderTexture, string path)
         File.WriteAllBytes(path, bytesHeight);
         AssetDatabase.Refresh();
     }
+#endif
 
     public static Texture2D ToTexture2D(RenderTexture rTex)
     {