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

8 年前 · e8f45e5f
--- a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
+++ b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
 //-----------------------------------------------------------------------------

 // SurfaceData is define in Lit.cs which generate Lit.cs.hlsl
-//TODO: return this original relative path include after fixing a bug in Unity side
-//#include "Lit.cs.hlsl"
-#include "../../Material/Lit/Lit.cs.hlsl"
+#include "Lit.cs.hlsl"

 // In case we pack data uint16 buffer we need to change the output render target format to uint16
 // TODO: Is there a way to automate these output type based on the format declare in lit.cs ?
--- a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LtcData.DisneyDiffuse.cs
+++ b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LtcData.DisneyDiffuse.cs
    {
        public partial class RenderLoop : Object
        {
-			static double[,] s_LtcDisneyDiffuseMatrixData = new double[k_LtcLUTResolution * k_LtcLUTResolution, k_LtcLUTMatrixDim * k_LtcLUTMatrixDim]
+			public static double[,] s_LtcDisneyDiffuseMatrixData = new double[k_LtcLUTResolution * k_LtcLUTResolution, k_LtcLUTMatrixDim * k_LtcLUTMatrixDim]
 			{
 				{1.018309, 0, 0.000000, 0, 1.018309, 0, 0.000000, 0, 1}, 
 				{1.018309, 0, 0.000000, 0, 1.018309, 0, 0.000000, 0, 1}, 
 				{1.106979, 0, 0.286686, 0, 1.061540, 0, -0.391058, 0, 1}
 			};

-			static float[] s_LtcDisneyDiffuseMagnitudeData = new float[k_LtcLUTResolution * k_LtcLUTResolution]
+            public static float[] s_LtcDisneyDiffuseMagnitudeData = new float[k_LtcLUTResolution * k_LtcLUTResolution]
 			{
 				0.978932f, 
 				0.978932f, 
--- a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LtcData.GGX.cs
+++ b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LtcData.GGX.cs
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Rendering;
 using System;


            // This table is precomputed for squared roughness and normalized so that last entry
            // is 1 and thus does not need to be store in a texture.
-            static double[,] s_LtcGGXMatrixData = new double[k_LtcLUTResolution * k_LtcLUTResolution, k_LtcLUTMatrixDim * k_LtcLUTMatrixDim]
+            public static double[,] s_LtcGGXMatrixData = new double[k_LtcLUTResolution * k_LtcLUTResolution, k_LtcLUTMatrixDim * k_LtcLUTMatrixDim]
 			{
 				{499.999756, 0, 0.000000, 0, 499.999756, 0, 0.000000, 0, 1}, 
 				{499.999756, 0, 0.000000, 0, 499.999756, 0, 0.000000, 0, 1}, 
 				{0.609037, 0, -0.053470, 0, 0.607151, 0, 0.031450, 0, 1}
 			};

-			static float[] s_LtcGGXMagnitudeData = new float[k_LtcLUTResolution * k_LtcLUTResolution]
+            public static float[] s_LtcGGXMagnitudeData = new float[k_LtcLUTResolution * k_LtcLUTResolution]
 			{
 				1.000000f, 
 				1.000000f, 
 				0.887423f
 			};

-			static float[] s_LtcGGXFresnelData = new float[k_LtcLUTResolution * k_LtcLUTResolution]
+            public static float[] s_LtcGGXFresnelData = new float[k_LtcLUTResolution * k_LtcLUTResolution]
 			{
 				0.000000f, 
 				0.000000f, 
--- a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Material.hlsl
+++ b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Material.hlsl
 #include "Lit/Lit.hlsl"
 #elif defined(UNITY_MATERIAL_UNLIT)
 #include "Unlit/Unlit.hlsl"
+#elif defined(UNITY_MATERIAL_IRIDESCENCE)
+#include "Iridescence/Iridescence.hlsl"
 #endif

 //-----------------------------------------------------------------------------
--- a/Assets/TestScenes/HDTest/CascadedShadowsTest.unity
+++ b/Assets/TestScenes/HDTest/CascadedShadowsTest.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_EnableBakedLightmaps: 0
    m_EnableRealtimeLightmaps: 0
  m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
    m_Resolution: 2
    m_BakeResolution: 40
    m_TextureWidth: 1024
    m_FinalGatherFiltering: 1
    m_FinalGatherRayCount: 256
    m_ReflectionCompression: 2
-    m_MixedBakeMode: 3
+    m_MixedBakeMode: 2
+    m_PVRDirectSampleCount: 32
    m_PVRSampleCount: 500
    m_PVRBounces: 2
    m_PVRFiltering: 0
    m_PVRFilteringAtrousPositionSigma: 1
  m_LightingDataAsset: {fileID: 112000001, guid: 486568bfdf60faf4ebe9d16745eee81f,
    type: 2}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_ReflectionProbeUsage: 1
  m_Materials:
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
-  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
+  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
+  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
+  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_Father: {fileID: 1072694791}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1479937107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1479937113}
+  - component: {fileID: 1479937112}
+  - component: {fileID: 1479937111}
+  - component: {fileID: 1479937110}
+  - component: {fileID: 1479937109}
+  - component: {fileID: 1479937108}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1479937108
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1479937107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 618b0e3f6c65dd247a4a016150006c57, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LookSpeedController: 120
+  m_LookSpeedMouse: 10
+  m_MoveSpeed: 50
+  m_Turbo: 10
+--- !u!81 &1479937109
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1479937107}
+  m_Enabled: 1
+--- !u!92 &1479937110
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1479937107}
+  m_Enabled: 1
+--- !u!124 &1479937111
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1479937107}
+  m_Enabled: 1
+--- !u!20 &1479937112
+Camera:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1479937107}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+  m_StereoMirrorMode: 0
+--- !u!4 &1479937113
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1479937107}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -41.54449, y: 13.5, z: 6.8429947}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1492665064
 GameObject:
  m_ObjectHideFlags: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  shadowResolution: 1024
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
+  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_Materials:
-  - {fileID: 2100000, guid: 1018c405244bf2a4486e83573f3d173d, type: 2}
  - {fileID: 2100000, guid: 906f2e00230e2a34b832d52909cc5906, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
--- a/Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
+++ b/Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.3199536, g: 0.2875398, b: 0.2644253, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
-  serializedVersion: 9
+  serializedVersion: 11
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_EnableBakedLightmaps: 1
    m_EnableRealtimeLightmaps: 1
  m_LightmapEditorSettings:
-    serializedVersion: 7
+    serializedVersion: 9
    m_Resolution: 2
    m_BakeResolution: 40
    m_TextureWidth: 1024
    m_FinalGatherFiltering: 1
    m_FinalGatherRayCount: 256
    m_ReflectionCompression: 2
-    m_StationaryBakeMode: 0
+    m_MixedBakeMode: 0
+    m_PVRDirectSampleCount: 32
    m_PVRSampleCount: 500
    m_PVRBounces: 2
    m_PVRFiltering: 0
    m_PVRFilteringAtrousPositionSigma: 1
  m_LightingDataAsset: {fileID: 112000022, guid: 3d51fc2c60f333c44b613049001dfba8,
    type: 2}
-  m_RuntimeCPUUsage: 50
-  m_ShadowMaskMode: 0
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
  m_Name: 
  m_EditorClassIdentifier: 
  shadowResolution: 512
+  m_innerSpotPercent: 0
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  m_Name: 
  m_EditorClassIdentifier: 
  shadowResolution: 512
+  m_innerSpotPercent: 0
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  - component: {fileID: 1879932839}
  - component: {fileID: 1879932838}
  - component: {fileID: 1879932843}
+  - component: {fileID: 1879932844}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
  m_Script: {fileID: 11500000, guid: 92bb16b4ee20841929b24d6bd771738d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &1879932844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1879932837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 618b0e3f6c65dd247a4a016150006c57, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LookSpeedController: 120
+  m_LookSpeedMouse: 10
+  m_MoveSpeed: 50
+  m_Turbo: 10
 --- !u!1 &1910068096
 GameObject:
  m_ObjectHideFlags: 0
  m_Script: {fileID: 11500000, guid: bc357c46587fc9d4cb8f311794d7d2f3, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_SkyRendererTypeName: UnityEngine.Experimental.Rendering.HDPipeline.HDRISkyRenderer
-  m_ShadowMaxDistance: 1000
-  m_ShadowCascadeCount: 4
-  m_ShadowCascadeSplit0: 0.05
-  m_ShadowCascadeSplit1: 0.2
-  m_ShadowCascadeSplit2: 0.3
+  m_Settings:
+    m_ShadowMaxDistance: 1000
+    m_ShadowCascadeCount: 4
+    m_ShadowCascadeSplit0: 0.05
+    m_ShadowCascadeSplit1: 0.2
+    m_ShadowCascadeSplit2: 0.3
+    m_ShadowNearPlaneOffset: 5
 --- !u!4 &1944423448
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation
+++ b/Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation
  m_Name: Tessellation - Rock
  m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
  m_ShaderKeywords: _EMISSIVE_COLOR _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _TESSELLATION_DISPLACEMENT
+    _TESSELLATION_DISPLACEMENT _TESSELLATION_TILING_SCALE
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_CustomRenderQueue: -1
    - _TessellationMode: 1
    - _TessellationObjectScale: 0
    - _TessellationShapeFactor: 0.75
+    - _TessellationTilingScale: 1
    - _TexWorldScale: 1
    - _Thickness: 0.5
    - _UVBase: 0
--- a/Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation
+++ b/Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation
  m_Name: Tessellation - Wood
  m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
  m_ShaderKeywords: _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATION_DISPLACEMENT
+    _TESSELLATION_TILING_SCALE
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_CustomRenderQueue: -1
    - _TessellationMode: 1
    - _TessellationObjectScale: 0
    - _TessellationShapeFactor: 0.75
+    - _TessellationTilingScale: 1
    - _TexWorldScale: 1
    - _Thickness: 1
    - _UVBase: 0
--- a/Assets/TestScenes/HDTest/HDRenderLoopTest.unity
+++ b/Assets/TestScenes/HDTest/HDRenderLoopTest.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_EnableBakedLightmaps: 1
    m_EnableRealtimeLightmaps: 1
  m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
    m_Resolution: 2
    m_BakeResolution: 40
    m_TextureWidth: 1024
    m_MixedBakeMode: 1
    m_BakeBackend: 0
    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
    m_PVRSampleCount: 500
    m_PVRBounces: 2
    m_PVRFiltering: 0
    m_PVRFilteringAtrousPositionSigma: 1
  m_LightingDataAsset: {fileID: 112000002, guid: 94f8793cc1c3e0248901e8f336236333,
    type: 2}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 2
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 1
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1226270484}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 10, y: 0, z: -35}
+  m_LocalPosition: {x: 10, y: 1, z: -35}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 399109505}
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  m_Component:
  - component: {fileID: 1634702262}
  m_Layer: 0
-  m_Name: Test - Parallax occlusion mapping - Triplanar (1)
+  m_Name: Test - Parallax occlusion mapping - Triplanar
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 1
  - component: {fileID: 1828470161}
  - component: {fileID: 1828470160}
  - component: {fileID: 1828470165}
+  - component: {fileID: 1828470166}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
  m_Script: {fileID: 11500000, guid: 92bb16b4ee20841929b24d6bd771738d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &1828470166
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1828470159}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 618b0e3f6c65dd247a4a016150006c57, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LookSpeedController: 120
+  m_LookSpeedMouse: 10
+  m_MoveSpeed: 50
+  m_Turbo: 10
 --- !u!1 &1828745839
 GameObject:
  m_ObjectHideFlags: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
--- a/Assets/TestScenes/HDTest/LayeredLitTest.unity
+++ b/Assets/TestScenes/HDTest/LayeredLitTest.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_EnableBakedLightmaps: 1
    m_EnableRealtimeLightmaps: 1
  m_LightmapEditorSettings:
-    serializedVersion: 7
+    serializedVersion: 9
    m_Resolution: 2
    m_BakeResolution: 40
    m_TextureWidth: 1024
    m_FinalGatherFiltering: 1
    m_FinalGatherRayCount: 256
    m_ReflectionCompression: 2
-    m_StationaryBakeMode: 1
+    m_MixedBakeMode: 1
+    m_PVRDirectSampleCount: 32
    m_PVRSampleCount: 500
    m_PVRBounces: 2
    m_PVRFiltering: 0
    m_PVRFilteringAtrousNormalSigma: 1
    m_PVRFilteringAtrousPositionSigma: 1
  m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 0
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0
  - component: {fileID: 1879932839}
  - component: {fileID: 1879932838}
  - component: {fileID: 1879932843}
+  - component: {fileID: 1879932844}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
  m_Script: {fileID: 11500000, guid: 92bb16b4ee20841929b24d6bd771738d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &1879932844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1879932837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 618b0e3f6c65dd247a4a016150006c57, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_LookSpeedController: 120
+  m_LookSpeedMouse: 10
+  m_MoveSpeed: 50
+  m_Turbo: 10
 --- !u!43 &1895850407
 Mesh:
  m_ObjectHideFlags: 0
  shadowResolution: 512
  m_innerSpotPercent: 0
  shadowDimmer: 1
+  lightDimmer: 1
+  fadeDistance: 10000
+  shadowFadeDistance: 10000
  affectDiffuse: 1
  affectSpecular: 1
  archetype: 0