Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop

Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs

             m_ShadowSettings.directionalLightCascadeCount = commonSettings.shadowCascadeCount;
             m_ShadowSettings.directionalLightCascades = new Vector3(commonSettings.shadowCascadeSplit0, commonSettings.shadowCascadeSplit1, commonSettings.shadowCascadeSplit2);
             m_ShadowSettings.maxShadowDistance = commonSettings.shadowMaxDistance;
+            m_ShadowSettings.directionalLightNearPlaneOffset = commonSettings.shadowNearPlaneOffset;
         }
 
         public void OnValidate()

Assets/ScriptableRenderLoop/HDRenderPipeline/SceneSettings/CommonSettings.cs

             float m_ShadowCascadeSplit1;
             [SerializeField]
             float m_ShadowCascadeSplit2;
+            [SerializeField]
+            float m_ShadowNearPlaneOffset;
-            public float shadowMaxDistance   { set { m_ShadowMaxDistance   = value; OnValidate(); } get { return m_ShadowMaxDistance; } }
-            public int   shadowCascadeCount  { set { m_ShadowCascadeCount  = value; OnValidate(); } get { return m_ShadowCascadeCount; } }
-            public float shadowCascadeSplit0 { set { m_ShadowCascadeSplit0 = value; OnValidate(); } get { return m_ShadowCascadeSplit0; } }
-            public float shadowCascadeSplit1 { set { m_ShadowCascadeSplit1 = value; OnValidate(); } get { return m_ShadowCascadeSplit1; } }
-            public float shadowCascadeSplit2 { set { m_ShadowCascadeSplit2 = value; OnValidate(); } get { return m_ShadowCascadeSplit2; } }
+            public float shadowMaxDistance      { set { m_ShadowMaxDistance   = value; OnValidate(); } get { return m_ShadowMaxDistance; } }
+            public int   shadowCascadeCount     { set { m_ShadowCascadeCount  = value; OnValidate(); } get { return m_ShadowCascadeCount; } }
+            public float shadowCascadeSplit0    { set { m_ShadowCascadeSplit0 = value; OnValidate(); } get { return m_ShadowCascadeSplit0; } }
+            public float shadowCascadeSplit1    { set { m_ShadowCascadeSplit1 = value; OnValidate(); } get { return m_ShadowCascadeSplit1; } }
+            public float shadowCascadeSplit2    { set { m_ShadowCascadeSplit2 = value; OnValidate(); } get { return m_ShadowCascadeSplit2; } }
+            public float shadowNearPlaneOffset  { set { m_ShadowNearPlaneOffset = value; OnValidate(); } get { return m_ShadowNearPlaneOffset; } }
-                m_ShadowMaxDistance    = Mathf.Max(0.0f, m_ShadowMaxDistance);
-                m_ShadowCascadeCount   = Math.Min(4, Math.Max(1, m_ShadowCascadeCount));
-                m_ShadowCascadeSplit0  = Mathf.Clamp01(m_ShadowCascadeSplit0);
-                m_ShadowCascadeSplit1  = Mathf.Clamp01(m_ShadowCascadeSplit1);
-                m_ShadowCascadeSplit2  = Mathf.Clamp01(m_ShadowCascadeSplit2);
+                m_ShadowMaxDistance     = Mathf.Max(0.0f, m_ShadowMaxDistance);
+                m_ShadowCascadeCount    = Mathf.Min(4, Mathf.Max(1, m_ShadowCascadeCount));
+                m_ShadowCascadeSplit0   = Mathf.Clamp01(m_ShadowCascadeSplit0);
+                m_ShadowCascadeSplit1   = Mathf.Clamp01(m_ShadowCascadeSplit1);
+                m_ShadowCascadeSplit2   = Mathf.Clamp01(m_ShadowCascadeSplit2);
+                m_ShadowNearPlaneOffset = Mathf.Max(0, m_ShadowNearPlaneOffset);
-                m_ShadowMaxDistance    = ShadowSettings.Default.maxShadowDistance,
-                m_ShadowCascadeCount   = ShadowSettings.Default.directionalLightCascadeCount,
-                m_ShadowCascadeSplit0  = ShadowSettings.Default.directionalLightCascades.x,
-                m_ShadowCascadeSplit1  = ShadowSettings.Default.directionalLightCascades.y,
-                m_ShadowCascadeSplit2  = ShadowSettings.Default.directionalLightCascades.z,
+                m_ShadowMaxDistance     = ShadowSettings.Default.maxShadowDistance,
+                m_ShadowCascadeCount    = ShadowSettings.Default.directionalLightCascadeCount,
+                m_ShadowCascadeSplit0   = ShadowSettings.Default.directionalLightCascades.x,
+                m_ShadowCascadeSplit1   = ShadowSettings.Default.directionalLightCascades.y,
+                m_ShadowCascadeSplit2   = ShadowSettings.Default.directionalLightCascades.z,
+                m_ShadowNearPlaneOffset = ShadowSettings.Default.directionalLightNearPlaneOffset,
             };
         }
 

Assets/ScriptableRenderLoop/HDRenderPipeline/SceneSettings/Editor/CommonSettingsEditor.cs

             public readonly int[] shadowsCascadeCountValues = new int[] { 1, 2, 3, 4 };
             public readonly GUIContent shadowsCascades = new GUIContent("Cascade values");
             public readonly GUIContent[] shadowSplits = new GUIContent[] { new GUIContent("Split 0"), new GUIContent("Split 1"), new GUIContent("Split 2") };
+            public readonly GUIContent nearPlaneOffset = new GUIContent("Near plane offset");
         }
 
         private static Styles s_Styles = null;
         private SerializedProperty m_ShadowMaxDistance;
         private SerializedProperty m_ShadowCascadeCount;
         private SerializedProperty[] m_ShadowCascadeSplits = new SerializedProperty[3];
+        private SerializedProperty m_ShadowNearPlaneOffset;
 
         void OnEnable()
         {
             m_ShadowCascadeCount = serializedObject.FindProperty("m_ShadowCascadeCount");
             for (int i = 0; i < 3; ++i)
                 m_ShadowCascadeSplits[i] = serializedObject.FindProperty(string.Format("m_ShadowCascadeSplit{0}", i));
+            m_ShadowNearPlaneOffset = serializedObject.FindProperty("m_ShadowNearPlaneOffset");
 
             m_SkyRendererTypes = Assembly.GetAssembly(typeof(SkyRenderer))
                                             .GetTypes()
                 EditorGUILayout.PropertyField(m_ShadowCascadeSplits[i], styles.shadowSplits[i]);
             }
             EditorGUI.indentLevel--;
+
+            EditorGUILayout.PropertyField(m_ShadowNearPlaneOffset, styles.nearPlaneOffset);            
+
             EditorGUI.indentLevel--;
         }
 

Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs

         public float    maxShadowDistance;
         public int      directionalLightCascadeCount;
         public Vector3  directionalLightCascades;
+        public float    directionalLightNearPlaneOffset;
 
         static ShadowSettings defaultShadowSettings = null;
 
                     defaultShadowSettings.directionalLightCascadeCount = 1;
                     defaultShadowSettings.directionalLightCascades = new Vector3(0.05F, 0.2F, 0.3F);
                     defaultShadowSettings.directionalLightCascadeCount = 4;
+                    defaultShadowSettings.directionalLightNearPlaneOffset = 5;
                     defaultShadowSettings.maxShadowDistance = 1000.0F;
                 }
                 return defaultShadowSettings;
 
                 var lightType = visibleLights[lightIndex].lightType;
                 var lightDirection = visibleLights[lightIndex].light.transform.forward;
-                var shadowNearPlaneOffset = QualitySettings.shadowNearPlaneOffset;
 
                 int shadowSliceIndex = packedShadows.GetShadowSliceIndex(lightIndex, 0);
 
                     {
                         var settings = new DrawShadowsSettings(cullResults, lightIndex);
                         var shadowResolution = shadowSlices[shadowSliceIndex].shadowResolution;
-                        bool needRendering = cullResults.ComputeDirectionalShadowMatricesAndCullingPrimitives(lightIndex, s, shadowSliceCount, splitRatio, shadowResolution, shadowNearPlaneOffset, out view, out proj, out settings.splitData);
+                        bool needRendering = cullResults.ComputeDirectionalShadowMatricesAndCullingPrimitives(lightIndex, s, shadowSliceCount, splitRatio,
+                            shadowResolution, m_Settings.directionalLightNearPlaneOffset, out view, out proj, out settings.splitData);
 
                         packedShadows.directionalShadowSplitSphereSqr[s] = settings.splitData.cullingSphere;
                         packedShadows.directionalShadowSplitSphereSqr[s].w *= packedShadows.directionalShadowSplitSphereSqr[s].w;