[7.x.x] Merge 7.x.x/hd/staging

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

@@ -91,6 +91,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Tentative fix for missing include in depth of field shaders.
 - Fix an issue in reading the gbuffer for ray traced subsurface scattering (case 1248358).
 - Cloned volume profile from read only assets are created in the root of the project. (case 1154961)
+- Fixed Wizard check on default volume profile to also check it is not the default one in package.
 
 ### Changed
 - Rejecting history for ray traced reflections based on a threshold evaluated on the neighborhood of the sampled history.

com.unity.render-pipelines.high-definition/Documentation~/Decal-Projector.md

@@ -45,4 +45,5 @@ Using the Inspector allows you to change all of the Decal Projector properties,
 ## Limitations
 
 - If you project a decal onto a transparent surface, HDRP ignores the decal's Texture tiling.
+- When you project a decal onto a surface, the emissive component of the decal affects the surface regardless of whether you enable **Receive Decal** on the surface's Material or not.
 - In **Project Settings > Graphics**, if **Instancing Variants** is set to **Strip All**, Unity strips the Decal Shader this component references when you build your Project. This happens even if you include the Shader in the **Always Included Shaders** list. If Unity strips the Shader during the build process, the decal does not appear in your built Application.

com.unity.render-pipelines.high-definition/Documentation~/HDRP-Features.md

@@ -40,7 +40,6 @@ Use Volumes to localize environmental Scene settings and post-processing effects
 HDRP Shaders allow you to use the following features:
 
 - [Opaque/transparent surfaces](Surface-Type.md).
-
   - Different blend modes for transparent surfaces.
   - Transparent surfaces that work with fog.
   - Refraction and distortion for transparent surfaces.
@@ -116,7 +115,7 @@ The Decal Shader allows you to place decals on surfaces in your Scene. To apply
 
 ![](Images/HDRPFeatures-TerrainShader.png)
 
-The Terrain Lit Shader is compatible with the built-in terrain system and supports up to eight layers in a single draw call. This Shader uses the same lighting model as the Lit Shader.
+The Terrain Lit Shader is compatible with the built-in terrain system and supports up to eight layers in a single draw call. This Shader uses the same lighting model as the Lit Shader. For more information, including the full list of Shader properties, see the [Terrain Lit Shader documentation](Terrain-Lit-Shader.md).
 
 <a name="Lighting"></a>
 

com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md

@@ -63,6 +63,7 @@
     * [Layered Lit Shader](Layered-Lit-Shader)
     * [Lit Tessellation Shader](Lit-Tessellation-Shader)
     * [Lit Shader](Lit-Shader)
+    * [Terrain Lit Shader](Terrain-Lit-Shader.md)
     * [Unlit Shader](Unlit-Shader)
   * Shader Graph Master Nodes
     * [Customizing Materials Using Master Nodes](Customizing-HDRP-materials-with-Shader-Graph)

com.unity.render-pipelines.high-definition/Documentation~/Terrain-Lit-Shader.md

@@ -0,0 +1,46 @@
+# **Terrain Lit Shader**
+
+The High Definition Render Pipeline (HDRP) uses the Terrain Lit Shader for Unity Terrain. This Shader is a simpler version of the [Lit Shader](Lit-Shader.md). A Terrain can use a Terrain Lit Material with up to eight [Terrain Layers](https://docs.unity3d.com/Manual/class-TerrainLayer.html).
+
+![](Images/HDRPFeatures-TerrainShader.png)
+
+## Creating a Terrain Lit Material
+
+To create a new Terrain Lit Shader Material:
+
+1. Go to your Project window and right-click in the **Assets** folder
+2. Select **Create > Material**. This adds a new Material to your Unity Project’s Asset folder.
+3. Click on the Material to view it in the Inspector.
+4. Click on the **Shader** drop-down and select **HDRP > TerrainLit**.
+
+## Using a Terrain Lit Material
+
+To use a Terrain Lit Material, you must assign it to a Terrain:
+
+1. View the Terrain in the Inspector and click on the cog button to go to the **Terrain Settings** section.
+2. Either drag and drop or use the radio button to assign your Terrain Lit Material to the **Material** property.
+
+![](Images/TerrainLitShader1.png)
+
+## Material properties
+
+### Surface Options
+
+| **Property**       | **Description**                                              |
+| ------------------ | ------------------------------------------------------------ |
+| **Receive Decals** | Enable this checkbox to allow HDRP to draw decals on this Material’s surface. |
+
+### Terrain
+
+| **Property**                  | **Description**                                              |
+| ----------------------------- | ------------------------------------------------------------ |
+| **Enable Height-based Blend** | Specifies whether HDRP should only render the Terrain Layer with the greatest height value for a particular pixel. When enabled, HDRP takes the height values from the blue channel of the **Mask Map** Texture. When disabled, HDRP blends the Terrain Layers based on the weights painted in the control map Textures. |
+| **- Height Transition**       | Controls how much HDRP blends the terrain if multiple Terrain Layers are approximately the same height. |
+| **Enable Per-pixel Normal**   | Specifies whether HDRP should sample the normal map Texture on a per-pixel level.  When enabled, Unity preserves more geometry details for distant terrain parts. Unity generates a geometry normal map at runtime from the heightmap, rather than the Mesh geometry. This means you can have high-resolution Mesh normals, even if your Mesh is low resolution. It only works if you enable **Draw Instanced** on the terrain. |
+| **Specular Occlusion Mode**   | Sets the mode that HDRP uses to calculate specular occlusion. <br/>&#8226; **Off**: Disables specular occlusion.<br/>&#8226; **From Ambient Occlusion**: Calculates specular occlusion from the ambient occlusion map and the Camera's view direction. |
+
+### Advanced Options
+
+| **Property**              | **Description**                                              |
+| ------------------------- | ------------------------------------------------------------ |
+| **Enable GPU Instancing** | Enable this checkbox to tell HDRP to render meshes with the same geometry and Material/Shader in one batch when possible. This makes rendering faster. HDRP can not render Meshes in one batch if they have different Materials, or if the hardware does not support GPU instancing. |

com.unity.render-pipelines.high-definition/Editor/DefaultScene/HDWizard.Configuration.cs

@@ -460,7 +460,9 @@ bool IsDefaultVolumeProfileAssigned()
                 return false;
 
             var hdAsset = HDRenderPipeline.currentAsset;
-            return hdAsset.defaultVolumeProfile != null && !hdAsset.defaultVolumeProfile.Equals(null);
+            return hdAsset.defaultVolumeProfile != null
+                && !hdAsset.defaultVolumeProfile.Equals(null)
+                && hdAsset.defaultVolumeProfile != hdAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile;
         }
         void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused)
         {
@@ -471,7 +473,19 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused)
             if (hdrpAsset == null)
                 return;
 
-            EditorDefaultSettings.GetOrAssignDefaultVolumeProfile(hdrpAsset);
+            VolumeProfile defaultSettingsVolumeProfileInPackage = hdrpAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile;
+            string defaultSettingsVolumeProfilePath = "Assets/" + HDProjectSettings.projectSettingsFolderPath + '/' + defaultSettingsVolumeProfileInPackage.name + ".asset";
+
+            //try load one if one already exist
+            VolumeProfile defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath<VolumeProfile>(defaultSettingsVolumeProfilePath);
+            if (defaultSettingsVolumeProfile == null || defaultSettingsVolumeProfile.Equals(null))
+            {
+                //else create it
+                AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(defaultSettingsVolumeProfileInPackage), defaultSettingsVolumeProfilePath);
+                defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath<VolumeProfile>(defaultSettingsVolumeProfilePath);
+            }
+            hdrpAsset.defaultVolumeProfile = defaultSettingsVolumeProfile;
+
             EditorUtility.SetDirty(hdrpAsset);
         }
 

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

@@ -108,7 +108,7 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT
                 error: "Default scene prefab must be set to create HD templated scene!");
             public static readonly ConfigStyle hdrpVolumeProfile = new ConfigStyle(
                 label: "Default volume profile",
-                error: "Default volume profile must be assigned in the HDRP asset!");
+                error: "Default volume profile must be assigned in the HDRP asset! Also, for it to be editable, it should be outside of package.");
 
             public static readonly ConfigStyle vrLegacyVRSystem = new ConfigStyle(
                 label: "Legacy VR System",