From 1df359cbf982c5c03385a0aaf144cf7a849f0392 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 27 May 2020 09:52:23 +0200 Subject: [PATCH 01/53] WIP for enabling valid graphics tests with Render Graph. Fixed a lot of gcalloc. --- .../Runtime/RenderGraph/RenderGraph.cs | 4 ++-- .../Runtime/RenderGraph/RenderGraphPass.cs | 22 +++++++++++++------ .../RenderGraphResourceRegistry.cs | 6 ++--- .../ScreenSpaceGlobalIllumination.cs | 2 +- .../Shadow/HDShadowManager.RenderGraph.cs | 2 ++ .../RenderPipeline/HDRenderPipeline.Debug.cs | 2 +- .../HDRenderPipeline.Prepass.cs | 4 +++- .../HDRenderPipeline.RenderGraph.cs | 14 ++++++++++++ .../RenderPipeline/HDRenderPipeline.cs | 6 ++++- 9 files changed, 46 insertions(+), 16 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 8cd7f991fbc..1db1db93bc6 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -152,8 +152,8 @@ public void Reset(RenderGraphPass pass) RenderGraphResourceRegistry m_Resources; RenderGraphObjectPool m_RenderGraphPool = new RenderGraphObjectPool(); - List m_RenderPasses = new List(); - List m_RendererLists = new List(); + List m_RenderPasses = new List(64); + List m_RendererLists = new List(32); RenderGraphDebugParams m_DebugParameters = new RenderGraphDebugParams(); RenderGraphLogger m_Logger = new RenderGraphLogger(); RenderGraphDefaultResources m_DefaultResources = new RenderGraphDefaultResources(); diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs index 7a3c5b5ca67..30c59c1377d 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs @@ -32,12 +32,19 @@ public RenderFunc GetExecuteDelegate() List m_BufferWriteList = new List(); List m_UsedRendererListList = new List(); - public IReadOnlyCollection textureReadList { get { return m_TextureReadList; } } - public IReadOnlyCollection textureWriteList { get { return m_TextureWriteList; } } - public IReadOnlyCollection transientTextureList { get { return m_TransientTextureList; } } - public IReadOnlyCollection bufferReadList { get { return m_BufferReadList; } } - public IReadOnlyCollection bufferWriteList { get { return m_BufferWriteList; } } - public IReadOnlyCollection usedRendererListList { get { return m_UsedRendererListList; } } + public List textureReadList { get { return m_TextureReadList; } } + public List textureWriteList { get { return m_TextureWriteList; } } + public List transientTextureList { get { return m_TransientTextureList; } } + public List bufferReadList { get { return m_BufferReadList; } } + public List bufferWriteList { get { return m_BufferWriteList; } } + public List usedRendererListList { get { return m_UsedRendererListList; } } + + //public IReadOnlyCollection textureReadList { get { return m_TextureReadList; } } + //public IReadOnlyCollection textureWriteList { get { return m_TextureWriteList; } } + //public IReadOnlyCollection transientTextureList { get { return m_TransientTextureList; } } + //public IReadOnlyCollection bufferReadList { get { return m_BufferReadList; } } + //public IReadOnlyCollection bufferWriteList { get { return m_BufferWriteList; } } + //public IReadOnlyCollection usedRendererListList { get { return m_UsedRendererListList; } } public void Clear() { @@ -144,7 +151,8 @@ public override void Release(RenderGraphContext renderGraphContext) renderGraphContext.renderGraphPool.Release(data); data = null; renderFunc = null; - renderGraphContext.renderGraphPool.Release(this); + segkhl + renderGraphContext.renderGraphPool.Release>(this); } public override bool HasRenderFunc() diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index c186e92c47f..f68c0e200fb 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -569,7 +569,7 @@ void CreateTextureForPass(ref TextureResource resource) resource.cachedHash = hashCode; } - void SetGlobalTextures(RenderGraphContext rgContext, IReadOnlyCollection textures, bool bindDummyTexture) + void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bindDummyTexture) { foreach (var resource in textures) { @@ -586,12 +586,12 @@ void SetGlobalTextures(RenderGraphContext rgContext, IReadOnlyCollection textures) + internal void PreRenderPassSetGlobalTextures(RenderGraphContext rgContext, List textures) { SetGlobalTextures(rgContext, textures, false); } - internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, IReadOnlyCollection textures) + internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, List textures) { SetGlobalTextures(rgContext, textures, true); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs index 445f66fdd32..09fb0698cca 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs @@ -69,7 +69,7 @@ void BindIndirectDiffuseTexture(CommandBuffer cmd) } // If there is no SSGI, bind a black 1x1 texture - void BindBlackIndirectDiffuseTexture(CommandBuffer cmd) + static void BindBlackIndirectDiffuseTexture(CommandBuffer cmd) { cmd.SetGlobalTexture(HDShaderIDs._IndirectDiffuseTexture, TextureXR.GetBlackTexture()); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs index b63a145def5..fd5a8b35a05 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs @@ -78,6 +78,8 @@ void BindShadowGlobalResources(RenderGraph renderGraph, in ShadowResult shadowRe BindAtlasTexture(ctx, data.shadowResult.punctualShadowResult, HDShaderIDs._ShadowmapAtlas); BindAtlasTexture(ctx, data.shadowResult.directionalShadowResult, HDShaderIDs._ShadowmapCascadeAtlas); BindAtlasTexture(ctx, data.shadowResult.areaShadowResult, HDShaderIDs._ShadowmapAreaAtlas); + BindAtlasTexture(ctx, data.shadowResult.cachedPunctualShadowResult, HDShaderIDs._CachedShadowmapAtlas); + BindAtlasTexture(ctx, data.shadowResult.cachedAreaShadowResult, HDShaderIDs._CachedAreaLightShadowmapAtlas); }); } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs index 125c2c7d095..fb4875e44bc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs @@ -346,7 +346,7 @@ TextureHandle PushColorPickerDebugTexture(RenderGraph renderGraph, TextureHandle builder.SetRenderFunc( (PushFullScreenDebugPassData data, RenderGraphContext ctx) => { - HDUtils.BlitCameraTexture(ctx.cmd, ctx.resources.GetTexture(passData.input), ctx.resources.GetTexture(passData.output)); + HDUtils.BlitCameraTexture(ctx.cmd, ctx.resources.GetTexture(data.input), ctx.resources.GetTexture(data.output)); }); return passData.output; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index c6bafbc3155..d975e73fae3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -549,6 +549,8 @@ class DBufferNormalPatchData public TextureHandle normalBuffer; } + static string[] s_DBufferNames = { "DBuffer0", "DBuffer1", "DBuffer2", "DBuffer3" }; + void SetupDBufferTargets(RenderGraph renderGraph, RenderDBufferPassData passData, bool use4RTs, ref PrepassOutput output, RenderGraphBuilder builder) { GraphicsFormat[] rtFormat; @@ -558,7 +560,7 @@ void SetupDBufferTargets(RenderGraph renderGraph, RenderDBufferPassData passData for (int dbufferIndex = 0; dbufferIndex < passData.dBufferCount; ++dbufferIndex) { passData.mrt[dbufferIndex] = builder.UseColorBuffer(renderGraph.CreateTexture( - new TextureDesc(Vector2.one, true, true) { colorFormat = rtFormat[dbufferIndex], name = string.Format("DBuffer{0}", dbufferIndex) }, HDShaderIDs._DBufferTexture[dbufferIndex]), dbufferIndex); + new TextureDesc(Vector2.one, true, true) { colorFormat = rtFormat[dbufferIndex], name = s_DBufferNames[dbufferIndex] }, HDShaderIDs._DBufferTexture[dbufferIndex]), dbufferIndex); } passData.depthStencilBuffer = builder.UseDepthBuffer(output.resolvedDepthBuffer, DepthAccess.Write); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 2c0c9a1b3fd..432924d8ffa 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -4,8 +4,11 @@ namespace UnityEngine.Rendering.HighDefinition { + public partial class HDRenderPipeline { + class TempPassData { }; + void ExecuteWithRenderGraph( RenderRequest renderRequest, AOVRequestData aovRequest, List aovBuffers, @@ -106,6 +109,17 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, // } //} + // Temporary workaround otherwise the texture is not bound when executing directly with rendergraph + using (var builder = m_RenderGraph.AddRenderPass("TempPass", out var passData)) + { + builder.SetRenderFunc( + (TempPassData data, RenderGraphContext context) => + { + BindBlackIndirectDiffuseTexture(context.cmd); + }); + } + + // TODO RENDERGRAPH //using (new ProfilingSample(cmd, "Render screen space shadows", CustomSamplerId.ScreenSpaceShadows.GetSampler())) //{ diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 47ffa5a4dc9..85d20f30699 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -330,6 +330,7 @@ internal bool showCascade } // RENDER GRAPH + static bool enableRenderGraphTests { get => Array.Exists(Environment.GetCommandLineArgs(), arg => arg == "-rendergraph-tests"); } RenderGraph m_RenderGraph; bool m_EnableRenderGraph; @@ -536,6 +537,9 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset defau InitializeProbeVolumes(); CustomPassUtils.Initialize(); + + if (enableRenderGraphTests) + EnableRenderGraph(true); } #if UNITY_EDITOR @@ -4732,7 +4736,7 @@ static void RenderExposureDebug(in DebugParameters parameters, parameters.debugExposureMaterial.SetTexture(HDShaderIDs._ExposureTexture, currentExposure); parameters.debugExposureMaterial.SetTexture(HDShaderIDs._ExposureWeightMask, exposureSettings.weightTextureMask.value); parameters.debugExposureMaterial.SetBuffer(HDShaderIDs._HistogramBuffer, histogramBuffer); - + int passIndex = 0; if (parameters.debugDisplaySettings.data.lightingDebugSettings.exposureDebugMode == ExposureDebugMode.MeteringWeighted) From 64ef0ca7cc2053cccc7b1f7793746c9370975483 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 28 May 2020 10:23:10 +0200 Subject: [PATCH 02/53] Fixed more GCAlloc and added an option for a test to not be run if render graph is enabled. --- .../Runtime/RenderGraph/RenderGraph.cs | 4 ++-- .../Runtime/RenderGraph/RenderGraphPass.cs | 11 ++++++----- .../RenderGraph/RenderGraphResourceRegistry.cs | 6 +++--- .../RenderPipeline/HDRenderPipeline.LightLoop.cs | 4 ++-- .../RenderPipeline/HDRenderPipeline.RenderGraph.cs | 3 ++- .../HDRenderPipeline.SubsurfaceScattering.cs | 4 ++-- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 2 +- .../TestRunner/HDRP_GraphicTestRunner.cs | 8 ++++++++ .../TestRunner/HDRP_TestSettings.cs | 1 + 9 files changed, 27 insertions(+), 16 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 1db1db93bc6..6b9d231cb63 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -786,12 +786,12 @@ void PostRenderPassExecute(CommandBuffer mainCmd, ref CompiledPassInfo passInfo, foreach (var texture in passInfo.textureReleaseList) m_Resources.ReleaseTexture(rgContext, texture); - - pass.Release(rgContext); } void ClearRenderPasses() { + foreach (var pass in m_RenderPasses) + pass.Release(m_RenderGraphPool); m_RenderPasses.Clear(); } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs index 30c59c1377d..b50e9b31126 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs @@ -12,7 +12,7 @@ public RenderFunc GetExecuteDelegate() where PassData : class, new() => ((RenderGraphPass)this).renderFunc; public abstract void Execute(RenderGraphContext renderGraphContext); - public abstract void Release(RenderGraphContext renderGraphContext); + public abstract void Release(RenderGraphObjectPool pool); public abstract bool HasRenderFunc(); public string name { get; protected set; } @@ -145,14 +145,15 @@ public void Initialize(int passIndex, PassData passData, string passName, Profil customSampler = sampler; } - public override void Release(RenderGraphContext renderGraphContext) + public override void Release(RenderGraphObjectPool pool) { Clear(); - renderGraphContext.renderGraphPool.Release(data); + pool.Release(data); data = null; renderFunc = null; - segkhl - renderGraphContext.renderGraphPool.Release>(this); + + // We need to do the release from here because we need the final type. + pool.Release(this); } public override bool HasRenderFunc() diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index f68c0e200fb..b0ed28394a8 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -447,9 +447,9 @@ internal bool IsTextureImported(TextureHandle handle) internal TextureHandle ImportBackbuffer(RenderTargetIdentifier rt) { if (m_CurrentBackbuffer != null) - m_RTHandleSystem.Release(m_CurrentBackbuffer); - - m_CurrentBackbuffer = m_RTHandleSystem.Alloc(rt); + m_CurrentBackbuffer.SetTexture(rt); + else + m_CurrentBackbuffer = m_RTHandleSystem.Alloc(rt); int newHandle = m_TextureResources.Add(new TextureResource(m_CurrentBackbuffer, 0)); return new TextureHandle(newHandle); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index b17034843db..2caf386b69a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -181,8 +181,8 @@ TextureHandle CreateDiffuseLightingBuffer(RenderGraph renderGraph, bool msaa) { return renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true) { colorFormat = GraphicsFormat.B10G11R11_UFloatPack32, enableRandomWrite = !msaa, - bindTextureMS = msaa, enableMSAA = msaa, clearBuffer = true, clearColor = Color.clear, name = string.Format("CameraSSSDiffuseLighting{0}", msaa ? "MSAA" : "") }); - } + bindTextureMS = msaa, enableMSAA = msaa, clearBuffer = true, clearColor = Color.clear, name = msaa ? "CameraSSSDiffuseLightingMSAA" : "CameraSSSDiffuseLighting" }); + } class DeferredLightingPassData { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 432924d8ffa..e1092a21f7f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -986,7 +986,8 @@ TextureHandle CreateColorBuffer(RenderGraph renderGraph, HDCamera hdCamera, bool enableMSAA = msaa, clearBuffer = NeedClearColorBuffer(hdCamera), clearColor = GetColorBufferClearColor(hdCamera), - name = string.Format("CameraColor{0}", msaa ? "MSAA" : "")}); + name = msaa ? "CameraColorMSAA" : "CameraColor" + }); } class ResolveColorData diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs index 1204288ec02..321cf6a5f5f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs @@ -17,8 +17,8 @@ TextureHandle CreateSSSBuffer(RenderGraph renderGraph, bool msaa) enableMSAA = msaa, clearBuffer = NeedClearGBuffer(), clearColor = Color.clear, - name = string.Format("SSSBuffer{0}", msaa ? "MSAA" : "" ) } - ); + name = msaa ? "SSSBufferMSAA" : "SSSBuffer" + }); } class SubsurfaceScaterringPassData diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 85d20f30699..44a466cfe87 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -330,7 +330,7 @@ internal bool showCascade } // RENDER GRAPH - static bool enableRenderGraphTests { get => Array.Exists(Environment.GetCommandLineArgs(), arg => arg == "-rendergraph-tests"); } + internal static bool enableRenderGraphTests { get => Array.Exists(Environment.GetCommandLineArgs(), arg => arg == "-rendergraph-tests"); } RenderGraph m_RenderGraph; bool m_EnableRenderGraph; diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs index 094e27a628a..db677ae9feb 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs @@ -58,6 +58,14 @@ public IEnumerator Run(GraphicsTestCase testCase) } } + if (HDRenderPipeline.enableRenderGraphTests) + { + if (!settings.renderGraphCompatible) + { + Assert.Ignore("Test scene is not compatible with Render Graph and will be skipped."); + } + } + if (settings.doBeforeTest != null) { settings.doBeforeTest.Invoke(); diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs index fd673a19472..bd2fa578af2 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs @@ -23,6 +23,7 @@ public class HDRP_TestSettings : GraphicsTestSettings [UnityEngine.Range(1.0f, 10.0f)] public float xrThresholdMultiplier = 1.0f; + public bool renderGraphCompatible = true; public bool checkMemoryAllocation = true; From 505924b6967041787c0698b4ede1d158686f990e Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 28 May 2020 10:25:06 +0200 Subject: [PATCH 03/53] First batch of disabled tests. --- .../1x_Materials/1210_Lit_BentNormal.unity | 181 ++- .../1x_Materials/1216_Lit_SSS_MaxRadius.unity | 1239 +++++++++++------ .../1218_Lit_DiffusionProfiles.unity | 109 +- .../1352_Fabric_Env_Convolution.unity | 315 +++-- .../1353_Fabric_Env_NoConvolution.unity | 741 +++++++++- .../Scenes/1x_Materials/1601_TerrainLit.unity | 117 +- .../1603_TerrainLit_BaseMap.unity | 207 +-- 7 files changed, 2108 insertions(+), 801 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity index dd9d966835b..c6a36caaf33 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity @@ -121,6 +121,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -262,7 +264,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -277,7 +279,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -289,6 +291,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -301,6 +304,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -318,8 +324,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -629,7 +635,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -644,7 +650,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -656,6 +662,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -668,6 +675,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -685,8 +695,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -905,6 +915,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1161,6 +1172,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -1234,7 +1246,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -1276,6 +1290,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -1352,6 +1367,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1437,6 +1453,7 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 + m_DataFormat: 1 --- !u!23 &177209792 MeshRenderer: m_ObjectHideFlags: 0 @@ -1452,6 +1469,7 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1654,6 +1672,7 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 + m_DataFormat: 1 --- !u!23 &298191412 MeshRenderer: m_ObjectHideFlags: 0 @@ -1669,6 +1688,7 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1748,6 +1768,8 @@ MonoBehaviour: c_Value_Max: {r: 0, g: 0, b: 0, a: 0} t_Value: {fileID: 0} count: 0 + overideRenderQueue: 0 + renderQueue: 2000 is2D: 1 instanceParameters: - parameter: _ @@ -1829,6 +1851,8 @@ MonoBehaviour: prefabObject: {fileID: 2300000, guid: 6b00bf6acfbd6e94b8c26f6e1e69a09e, type: 3} material: {fileID: 2100000, guid: 239283cad6ebcc8438f73793832d5438, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -2016,7 +2040,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -2031,7 +2055,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -2043,6 +2067,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2055,6 +2080,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2072,8 +2100,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2292,6 +2320,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2385,6 +2414,8 @@ MonoBehaviour: c_Value_Max: {r: 0, g: 0, b: 0, a: 0} t_Value: {fileID: 0} count: 0 + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -2529,6 +2560,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 640 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!114 &749245064 stripped @@ -2670,6 +2706,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -2743,7 +2780,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -2784,6 +2823,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -2846,6 +2886,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 239283cad6ebcc8438f73793832d5438, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -3033,7 +3075,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -3048,7 +3090,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -3060,6 +3102,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -3072,6 +3115,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3089,8 +3135,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -3488,6 +3534,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -3561,7 +3608,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -3602,6 +3651,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -3945,6 +3995,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -4018,7 +4069,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -4059,6 +4112,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4226,7 +4280,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -4241,7 +4295,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -4253,6 +4307,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4265,6 +4320,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4282,8 +4340,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4593,7 +4651,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -4608,7 +4666,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -4620,6 +4678,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4632,6 +4691,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4649,8 +4711,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4869,6 +4931,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5029,6 +5092,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -5102,7 +5166,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -5143,6 +5209,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5299,6 +5366,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -5372,7 +5440,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -5414,6 +5484,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5570,6 +5641,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -5643,7 +5715,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -5684,6 +5758,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5790,6 +5865,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5903,6 +5979,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6084,7 +6161,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -6099,7 +6176,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -6111,6 +6188,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6123,6 +6201,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6140,8 +6221,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6432,6 +6513,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6602,6 +6684,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -6675,7 +6758,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -6717,6 +6802,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -6873,6 +6959,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -6946,7 +7033,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -6988,6 +7077,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7069,6 +7159,7 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 + m_DataFormat: 1 --- !u!23 &1579759340 MeshRenderer: m_ObjectHideFlags: 0 @@ -7084,6 +7175,7 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7205,6 +7297,7 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 + m_DataFormat: 1 --- !u!23 &1602952835 MeshRenderer: m_ObjectHideFlags: 0 @@ -7220,6 +7313,7 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7391,7 +7485,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 0 + m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -7406,7 +7500,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 0 + m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -7418,6 +7512,7 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -7430,6 +7525,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -7447,8 +7545,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -7650,7 +7748,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -7696,6 +7794,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -7728,6 +7829,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7744,6 +7846,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1677600969 Light: m_ObjectHideFlags: 0 @@ -7803,6 +7908,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 5, w: 5.625613} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1677600970 @@ -7889,6 +7995,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8116,6 +8223,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -8189,7 +8297,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -8230,6 +8340,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8320,6 +8431,8 @@ MonoBehaviour: c_Value_Max: {r: 0, g: 0, b: 0, a: 0} t_Value: {fileID: 0} count: 0 + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -8416,6 +8529,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8496,6 +8610,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity index 13170debefa..440666ad01b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity @@ -23,7 +23,7 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 0 + m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} @@ -35,15 +35,15 @@ RenderSettings: m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 - m_ReflectionIntensity: 0 + m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,9 +94,12 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 5e6f0a379985d724cb257cbc1bdab81f, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -109,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -225,11 +237,15 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -265,6 +281,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3e-45 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -283,6 +302,7 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 + - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1.6393442 - _Ior: 1 @@ -311,8 +331,12 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -324,16 +348,20 @@ Material: - _ThicknessMultiplier: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 - _ZTestDepthEqualForOpaque: 4 - _ZTestGBuffer: 3 - _ZTestMode: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -341,6 +369,7 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -350,6 +379,8 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &22486425 GameObject: m_ObjectHideFlags: 0 @@ -419,6 +450,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -430,6 +463,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -442,6 +476,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &22486429 MonoBehaviour: m_ObjectHideFlags: 0 @@ -456,9 +491,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - camera: {fileID: 189121543} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 22486427} - pixelPerfect: 0 --- !u!1001 &189121542 PrefabInstance: m_ObjectHideFlags: 0 @@ -498,11 +534,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: far clip plane - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -515,6 +546,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: far clip plane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: near clip plane @@ -525,14 +561,13 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0.0005 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} ---- !u!20 &189121543 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - m_PrefabInstance: {fileID: 189121542} - m_PrefabAsset: {fileID: 0} --- !u!114 &189121544 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -556,7 +591,6 @@ GameObject: - component: {fileID: 206350329} - component: {fileID: 206350332} - component: {fileID: 206350331} - - component: {fileID: 206350330} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -578,7 +612,7 @@ Transform: m_Father: {fileID: 1270417363} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &206350330 +--- !u!114 &206350331 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -587,86 +621,110 @@ MonoBehaviour: m_GameObject: {fileID: 206350328} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 0.015 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 32 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &206350331 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 206350328} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 0.015 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 100 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 0.015 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 32 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &206350332 Light: m_ObjectHideFlags: 0 @@ -675,12 +733,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 206350328} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 + m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -690,6 +750,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -697,12 +775,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!21 &312606449 @@ -806,11 +888,15 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -846,6 +932,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 0 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableMotionVectorForVertexAnimation: 0 @@ -863,6 +952,7 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 + - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1 - _LinkDetailsWithBase: 1 @@ -884,8 +974,12 @@ Material: - _SmoothnessRemapMin: 0 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -895,14 +989,19 @@ Material: - _Thickness: 1 - _ThicknessMultiplier: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _ZTestDepthEqualForOpaque: 4 - _ZTestMode: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -910,6 +1009,7 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} @@ -918,6 +1018,8 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &340485232 GameObject: m_ObjectHideFlags: 0 @@ -987,6 +1089,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -998,6 +1102,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1010,6 +1115,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &340485236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1024,9 +1130,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - camera: {fileID: 189121543} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 340485234} - pixelPerfect: 0 --- !u!1 &459634894 GameObject: m_ObjectHideFlags: 0 @@ -1038,7 +1145,6 @@ GameObject: - component: {fileID: 459634895} - component: {fileID: 459634898} - component: {fileID: 459634897} - - component: {fileID: 459634896} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1060,7 +1166,7 @@ Transform: m_Father: {fileID: 970005766} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &459634896 +--- !u!114 &459634897 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1069,86 +1175,110 @@ MonoBehaviour: m_GameObject: {fileID: 459634894} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 0.015 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 32 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &459634897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 459634894} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 0.015 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 100 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 0.015 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 32 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &459634898 Light: m_ObjectHideFlags: 0 @@ -1157,12 +1287,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 459634894} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 + m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1172,6 +1304,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1179,12 +1329,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &489376175 @@ -1198,7 +1352,6 @@ GameObject: - component: {fileID: 489376176} - component: {fileID: 489376179} - component: {fileID: 489376178} - - component: {fileID: 489376177} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1220,7 +1373,7 @@ Transform: m_Father: {fileID: 2138293276} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &489376177 +--- !u!114 &489376178 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1229,86 +1382,110 @@ MonoBehaviour: m_GameObject: {fileID: 489376175} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 0.015 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 32 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &489376178 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 489376175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 0.015 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 100 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 0.015 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 32 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &489376179 Light: m_ObjectHideFlags: 0 @@ -1317,12 +1494,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 489376175} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 + m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1332,6 +1511,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1339,12 +1536,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &839916369 @@ -1358,7 +1559,6 @@ GameObject: - component: {fileID: 839916370} - component: {fileID: 839916373} - component: {fileID: 839916372} - - component: {fileID: 839916371} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1380,7 +1580,7 @@ Transform: m_Father: {fileID: 1938649642} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &839916371 +--- !u!114 &839916372 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1389,86 +1589,110 @@ MonoBehaviour: m_GameObject: {fileID: 839916369} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 0.015 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 32 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &839916372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 839916369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 0.015 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 100 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 0.015 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 32 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &839916373 Light: m_ObjectHideFlags: 0 @@ -1477,12 +1701,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 839916369} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 + m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1492,6 +1718,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1499,12 +1743,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &842796397 @@ -1576,6 +1824,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1587,6 +1837,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1599,6 +1850,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &842796401 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1613,9 +1865,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - camera: {fileID: 189121543} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 842796399} - pixelPerfect: 0 --- !u!1 &970005765 GameObject: m_ObjectHideFlags: 0 @@ -1719,6 +1972,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1730,6 +1985,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1742,6 +1998,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1095913860 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1756,9 +2013,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - camera: {fileID: 189121543} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 1095913858} - pixelPerfect: 0 --- !u!1001 &1162708794 PrefabInstance: m_ObjectHideFlags: 0 @@ -1766,6 +2024,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 970005766} m_Modifications: + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1814,18 +2080,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 1421256617} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &1162708795 stripped @@ -1841,6 +2099,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1938649642} m_Modifications: + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1889,18 +2155,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 15578830} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &1211941502 stripped @@ -1950,6 +2208,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2022319265} m_Modifications: + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1998,10 +2260,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 3f7d1f3b5c774bb40bed9ce56cb8cc02, type: 2} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: @@ -2068,6 +2326,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2079,6 +2339,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2091,6 +2352,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1371615027 MeshFilter: m_ObjectHideFlags: 0 @@ -2113,6 +2375,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2124,6 +2388,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2136,6 +2401,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1374876467 GameObject: m_ObjectHideFlags: 0 @@ -2175,6 +2441,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1270417363} m_Modifications: + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Quad + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2219,26 +2493,18 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.25 objectReference: {fileID: 0} + - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90.00001 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: d841572a05d09344a8097c1a2e6b0369, type: 2} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Quad - objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} - - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90.00001 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &1419573399 stripped @@ -2348,11 +2614,15 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -2388,6 +2658,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3e-45 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableMotionVectorForVertexAnimation: 0 @@ -2405,6 +2678,7 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 + - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1 - _LinkDetailsWithBase: 1 @@ -2426,8 +2700,12 @@ Material: - _SmoothnessRemapMin: 0 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -2437,14 +2715,19 @@ Material: - _Thickness: 1 - _ThicknessMultiplier: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _ZTestDepthEqualForOpaque: 4 - _ZTestMode: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -2452,6 +2735,7 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} @@ -2460,6 +2744,8 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1630635259 GameObject: m_ObjectHideFlags: 0 @@ -2529,6 +2815,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2540,6 +2828,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2552,6 +2841,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1630635263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2566,9 +2856,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - camera: {fileID: 189121543} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 1630635261} - pixelPerfect: 0 --- !u!23 &1762557575 MeshRenderer: m_ObjectHideFlags: 0 @@ -2583,6 +2874,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2594,6 +2887,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2606,6 +2900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1763654727 MeshFilter: m_ObjectHideFlags: 0 @@ -2747,11 +3042,15 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -2787,6 +3086,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 0 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableMotionVectorForVertexAnimation: 0 @@ -2804,6 +3106,7 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 + - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1 - _LinkDetailsWithBase: 1 @@ -2825,8 +3128,12 @@ Material: - _SmoothnessRemapMin: 0 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -2836,14 +3143,19 @@ Material: - _Thickness: 1 - _ThicknessMultiplier: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _ZTestDepthEqualForOpaque: 4 - _ZTestMode: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -2851,6 +3163,7 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} @@ -2859,6 +3172,8 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1938649641 GameObject: m_ObjectHideFlags: 0 @@ -2966,6 +3281,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2977,6 +3294,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2989,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1982433801 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3003,9 +3322,10 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - camera: {fileID: 189121543} + targetCamera: {fileID: 0} + forceTargetDimensions: {x: 200, y: 150} + overrideTestSettings: 0 textMesh: {fileID: 1982433799} - pixelPerfect: 0 --- !u!1001 &2022025515 PrefabInstance: m_ObjectHideFlags: 0 @@ -3013,6 +3333,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2138293276} m_Modifications: + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3061,18 +3389,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 1926466934} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &2022025516 stripped @@ -3130,6 +3450,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3141,6 +3463,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3153,6 +3476,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2025743489 MeshFilter: m_ObjectHideFlags: 0 @@ -3168,6 +3492,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1270417363} m_Modifications: + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3216,18 +3548,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 312606449} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &2048782979 stripped @@ -3247,7 +3571,6 @@ GameObject: - component: {fileID: 2070758266} - component: {fileID: 2070758269} - component: {fileID: 2070758268} - - component: {fileID: 2070758267} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -3269,7 +3592,7 @@ Transform: m_Father: {fileID: 2022319265} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &2070758267 +--- !u!114 &2070758268 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3278,86 +3601,110 @@ MonoBehaviour: m_GameObject: {fileID: 2070758265} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.5 - viewBiasMax: 10 - viewBiasScale: 1 - normalBiasMin: 0.2 - normalBiasMax: 4 - normalBiasScale: 1 - sampleBiasScale: 1 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 0.015 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 32 + m_MinFilterSize: 1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &2070758268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070758265} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 - m_Version: 2 - directionalIntensity: 3.1415927 - punctualIntensity: 0.015 - areaIntensity: 200 - enableSpotReflector: 0 - m_InnerSpotPercent: 100 - lightDimmer: 1 - volumetricDimmer: 1 - lightUnit: 0 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - spotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 + useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 0.015 - displayAreaLightEmissiveMesh: 0 - lightLayers: 1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 32 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2070758269 Light: m_ObjectHideFlags: 0 @@ -3366,12 +3713,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2070758265} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 + m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -3381,6 +3730,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -3388,12 +3755,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2138293275 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity index 5ab787346c6..7c4ef45d045 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: ba25e9e6124ce264d9963cc1ee323919, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +171,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -248,6 +252,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -328,6 +333,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -394,6 +400,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -544,6 +551,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -553,6 +565,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -571,6 +584,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -667,6 +683,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -755,6 +772,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -871,6 +889,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &446518737 @@ -899,11 +918,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 6 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 4.2 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -915,12 +937,11 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_LightTypeExtent: 0 - m_SpotLightShape: 0 m_ShapeWidth: 0.5 m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -931,7 +952,21 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -939,10 +974,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -957,10 +991,15 @@ MonoBehaviour: m_Override: 0 m_UseOverride: 1 m_Level: 0 + m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 - m_ConstantBias: 0.15 + m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -977,6 +1016,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &511310414 GameObject: m_ObjectHideFlags: 0 @@ -1047,6 +1089,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1126,8 +1169,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 8afdd1f2c5ad659409e78c9c51a75f4b, type: 2} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &884502727 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1206,6 +1247,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1272,6 +1314,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1326,6 +1369,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 10 @@ -1395,15 +1442,6 @@ PrefabInstance: propertyPath: orthographic size value: 1.8 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: xrLayout - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version @@ -1414,6 +1452,16 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrLayout + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1019925507 stripped @@ -1455,6 +1503,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1535,6 +1584,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1615,6 +1665,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1705,9 +1756,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1431739855 MeshRenderer: @@ -1724,6 +1775,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1804,6 +1856,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1917,9 +1970,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1870647568 MeshRenderer: @@ -1936,6 +1989,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2072,6 +2126,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2081,6 +2140,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2099,6 +2159,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity index 2db502b157a..c7d872a1d63 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 9c1163981ea3fec4bbbafed3ce93fe5b, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +171,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -474,6 +478,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &92922459 GameObject: m_ObjectHideFlags: 0 @@ -521,6 +526,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -834,6 +840,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &104321023 GameObject: m_ObjectHideFlags: 0 @@ -915,6 +922,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -995,6 +1003,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1075,6 +1084,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1155,6 +1165,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1320,6 +1331,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1396,6 +1408,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -1438,6 +1451,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -1468,6 +1482,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &251996186 GameObject: m_ObjectHideFlags: 0 @@ -1515,6 +1530,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1595,6 +1611,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1675,6 +1692,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1840,6 +1858,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1916,6 +1935,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -1958,6 +1978,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -1988,6 +2009,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &423945086 GameObject: m_ObjectHideFlags: 0 @@ -2035,6 +2057,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2115,6 +2138,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2428,6 +2452,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &499153404 GameObject: m_ObjectHideFlags: 0 @@ -2475,6 +2500,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2541,6 +2567,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: a81a4bdd35eb7904e93a07c2aca9f7a7, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -2632,6 +2660,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2712,6 +2741,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2792,6 +2822,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2872,6 +2903,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2952,6 +2984,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3017,9 +3050,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 608548e6f54b0d8409c142f8abf2ca76, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1823796277} - m_SkySettingsFromProfile: {fileID: 114374333047554170, guid: 608548e6f54b0d8409c142f8abf2ca76, - type: 2} --- !u!114 &596340773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3183,6 +3213,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3259,6 +3290,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -3301,6 +3333,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -3331,6 +3364,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &620696772 Material: serializedVersion: 6 @@ -3460,6 +3494,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3536,7 +3571,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3546,6 +3583,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -3575,6 +3613,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -3604,6 +3643,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &645242448 PrefabInstance: m_ObjectHideFlags: 0 @@ -3611,6 +3651,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 6 @@ -3655,26 +3699,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 644 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderPipelineAsset - value: - objectReference: {fileID: 11400000, guid: a93d04db38bac8a4cba18a4c389aa624, - type: 2} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: field of view @@ -3695,6 +3719,27 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 644 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: a93d04db38bac8a4cba18a4c389aa624, + type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &670096462 @@ -3744,6 +3789,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3906,6 +3952,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3982,7 +4029,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3992,6 +4041,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -4021,6 +4071,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4050,6 +4101,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &708402781 GameObject: m_ObjectHideFlags: 0 @@ -4097,6 +4149,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4262,6 +4315,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4338,6 +4392,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -4380,6 +4435,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4410,6 +4466,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &754056538 GameObject: m_ObjectHideFlags: 0 @@ -4457,6 +4514,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4622,6 +4680,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4698,6 +4757,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -4740,6 +4800,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4770,6 +4831,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &796401093 Material: serializedVersion: 6 @@ -5050,6 +5112,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &808018656 GameObject: m_ObjectHideFlags: 0 @@ -5097,6 +5160,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5177,6 +5241,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5339,6 +5404,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5415,7 +5481,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5425,6 +5493,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -5454,6 +5523,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5483,6 +5553,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &876034184 GameObject: m_ObjectHideFlags: 0 @@ -5530,6 +5601,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5692,6 +5764,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5768,7 +5841,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5778,6 +5853,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -5807,6 +5883,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5836,6 +5913,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &963158397 Material: serializedVersion: 6 @@ -5968,6 +6046,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -6044,6 +6123,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -6086,6 +6166,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -6116,6 +6197,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &974217518 GameObject: m_ObjectHideFlags: 0 @@ -6163,6 +6245,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6476,6 +6559,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &978915923 Material: serializedVersion: 6 @@ -6749,6 +6833,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &982114948 GameObject: m_ObjectHideFlags: 0 @@ -6796,6 +6881,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6961,6 +7047,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7037,6 +7124,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -7079,6 +7167,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7109,6 +7198,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1022104772 GameObject: m_ObjectHideFlags: 0 @@ -7156,6 +7246,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7318,6 +7409,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7394,7 +7486,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -7404,6 +7498,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -7433,6 +7528,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7462,6 +7558,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1087665784 Material: serializedVersion: 6 @@ -7594,6 +7691,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7670,6 +7768,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -7712,6 +7811,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7742,6 +7842,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1128082830 GameObject: m_ObjectHideFlags: 0 @@ -7789,6 +7890,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7954,6 +8056,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8030,6 +8133,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -8072,6 +8176,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8102,6 +8207,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1176707769 GameObject: m_ObjectHideFlags: 0 @@ -8149,6 +8255,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8314,6 +8421,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8390,6 +8498,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -8432,6 +8541,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8462,6 +8572,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1249010074 GameObject: m_ObjectHideFlags: 0 @@ -8520,6 +8631,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 9ba3ffc98c51ad942a223546952cbd7c, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _Smoothness @@ -8586,6 +8699,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8748,6 +8862,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8824,7 +8939,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -8834,6 +8951,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -8863,6 +8981,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8892,6 +9011,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1352399838 Material: serializedVersion: 6 @@ -9024,6 +9144,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9100,6 +9221,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -9142,6 +9264,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9172,6 +9295,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1379413269 GameObject: m_ObjectHideFlags: 0 @@ -9219,6 +9343,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9384,6 +9509,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9460,6 +9586,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -9502,6 +9629,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9532,6 +9660,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1414961176 Material: serializedVersion: 6 @@ -9661,6 +9790,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9737,7 +9867,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -9747,6 +9879,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -9776,6 +9909,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9805,6 +9939,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1486517096 Material: serializedVersion: 6 @@ -9937,6 +10072,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10013,6 +10149,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -10055,6 +10192,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -10085,6 +10223,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1487814013 GameObject: m_ObjectHideFlags: 0 @@ -10132,6 +10271,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10294,6 +10434,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10370,7 +10511,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -10380,6 +10523,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -10409,6 +10553,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -10438,6 +10583,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1556361012 GameObject: m_ObjectHideFlags: 0 @@ -10471,6 +10617,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 6e49b7ef330d4884a8d632d30fd7f3fd, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -10562,6 +10710,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10642,6 +10791,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10722,6 +10872,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10802,6 +10953,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10835,82 +10987,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797948919} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1823796277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1832517677 GameObject: m_ObjectHideFlags: 0 @@ -10958,6 +11034,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11024,6 +11101,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 9ba3ffc98c51ad942a223546952cbd7c, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _Smoothness @@ -11200,6 +11279,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11276,6 +11356,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -11318,6 +11399,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -11348,6 +11430,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1913943649 GameObject: m_ObjectHideFlags: 0 @@ -11395,6 +11478,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11560,6 +11644,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11636,6 +11721,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -11678,6 +11764,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -11708,6 +11795,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1928742637 Material: serializedVersion: 6 @@ -11837,6 +11925,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11913,7 +12002,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -11923,6 +12014,7 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -11952,6 +12044,7 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -11981,6 +12074,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1928978657 GameObject: m_ObjectHideFlags: 0 @@ -12028,6 +12122,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12108,6 +12203,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12188,6 +12284,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12353,6 +12450,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -12429,6 +12527,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -12471,6 +12570,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -12501,6 +12601,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2046158920 GameObject: m_ObjectHideFlags: 0 @@ -12548,6 +12649,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12713,6 +12815,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -12789,6 +12892,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -12831,6 +12935,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -12861,6 +12966,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2085978366 GameObject: m_ObjectHideFlags: 0 @@ -12908,6 +13014,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13073,6 +13180,7 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -13149,6 +13257,7 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -13191,6 +13300,7 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -13221,6 +13331,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2136871501 GameObject: m_ObjectHideFlags: 0 @@ -13268,6 +13379,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13348,6 +13460,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity index cbf972af0cf..d459144d04a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.03764126, g: 0.047973316, b: 0.061335944, a: 1} + m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,10 +94,12 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 4aad07370feecf44988845b33b651928, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -110,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -364,6 +375,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &57653119 GameObject: m_ObjectHideFlags: 0 @@ -410,6 +422,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -421,6 +435,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -433,6 +448,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &57653122 MeshFilter: m_ObjectHideFlags: 0 @@ -487,6 +503,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -498,6 +516,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -510,6 +529,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &68786178 MeshFilter: m_ObjectHideFlags: 0 @@ -564,6 +584,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -575,6 +597,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -587,6 +610,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &92922462 MeshFilter: m_ObjectHideFlags: 0 @@ -758,6 +782,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -833,7 +860,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -846,8 +876,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -864,16 +900,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -895,6 +935,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &129937894 Material: serializedVersion: 6 @@ -1162,6 +1203,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &132869821 Material: serializedVersion: 6 @@ -1292,6 +1334,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1367,7 +1412,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -1380,8 +1428,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -1398,16 +1452,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -1429,6 +1487,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &144982759 GameObject: m_ObjectHideFlags: 0 @@ -1475,6 +1534,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1486,6 +1547,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1498,6 +1560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &144982762 MeshFilter: m_ObjectHideFlags: 0 @@ -1552,6 +1615,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1563,6 +1628,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1575,6 +1641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &186810074 MeshFilter: m_ObjectHideFlags: 0 @@ -1629,6 +1696,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1640,6 +1709,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1652,6 +1722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &214084041 MeshFilter: m_ObjectHideFlags: 0 @@ -1790,6 +1861,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1865,7 +1939,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -1878,8 +1955,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -1896,16 +1979,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -1927,6 +2014,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &308686682 GameObject: m_ObjectHideFlags: 0 @@ -1973,6 +2061,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1984,6 +2074,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1996,6 +2087,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &308686685 MeshFilter: m_ObjectHideFlags: 0 @@ -2050,6 +2142,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2061,6 +2155,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2073,6 +2168,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &333051541 MeshFilter: m_ObjectHideFlags: 0 @@ -2211,6 +2307,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -2286,7 +2385,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -2299,8 +2401,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -2317,16 +2425,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -2348,6 +2460,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &420810804 GameObject: m_ObjectHideFlags: 0 @@ -2394,6 +2507,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2405,6 +2520,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2417,6 +2533,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &420810807 MeshFilter: m_ObjectHideFlags: 0 @@ -2471,6 +2588,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2482,6 +2601,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2494,6 +2614,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &428816245 MeshFilter: m_ObjectHideFlags: 0 @@ -2548,6 +2669,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2559,6 +2682,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2571,6 +2695,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &469560312 MeshFilter: m_ObjectHideFlags: 0 @@ -2605,7 +2730,6 @@ MonoBehaviour: m_GameObject: {fileID: 506841454} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 66d6c688291ac8b48adc878e4fc4d29d, type: 3} m_Name: m_EditorClassIdentifier: @@ -2613,6 +2737,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: a81a4bdd35eb7904e93a07c2aca9f7a7, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -2787,6 +2913,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -2862,7 +2991,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -2875,8 +3007,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -2893,16 +3031,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -2924,6 +3066,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &587671381 GameObject: m_ObjectHideFlags: 0 @@ -2970,6 +3113,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2981,6 +3126,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2993,6 +3139,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &587671384 MeshFilter: m_ObjectHideFlags: 0 @@ -3028,12 +3175,11 @@ MonoBehaviour: m_GameObject: {fileID: 596340771} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 441482e8936e35048a1dffac814e3ef8, type: 3} m_Name: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 608548e6f54b0d8409c142f8abf2ca76, type: 2} - m_BakingSkyUniqueID: 2 + m_StaticLightingSkyUniqueID: 2 --- !u!114 &596340773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3043,7 +3189,6 @@ MonoBehaviour: m_GameObject: {fileID: 596340771} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: @@ -3112,6 +3257,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3123,6 +3270,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3135,6 +3283,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &607465902 MeshFilter: m_ObjectHideFlags: 0 @@ -3263,11 +3412,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3279,6 +3433,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -3302,6 +3457,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -3340,7 +3498,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3350,10 +3510,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -3368,23 +3535,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -3394,6 +3570,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1001 &645242448 PrefabInstance: m_ObjectHideFlags: 0 @@ -3454,6 +3631,11 @@ PrefabInstance: propertyPath: field of view value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: ImageComparisonSettings.TargetHeight @@ -3464,9 +3646,9 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 644 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] @@ -3591,11 +3773,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3607,6 +3794,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -3630,6 +3818,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -3668,7 +3859,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3678,10 +3871,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -3696,23 +3896,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -3722,6 +3931,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &754056538 GameObject: m_ObjectHideFlags: 0 @@ -3768,6 +3978,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3779,6 +3991,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3791,6 +4004,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &754056541 MeshFilter: m_ObjectHideFlags: 0 @@ -3845,6 +4059,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3856,6 +4072,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3868,6 +4085,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &771171016 MeshFilter: m_ObjectHideFlags: 0 @@ -3922,6 +4140,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3933,6 +4153,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3945,6 +4166,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &788913698 MeshFilter: m_ObjectHideFlags: 0 @@ -4083,6 +4305,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4158,7 +4383,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -4171,8 +4399,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -4189,16 +4423,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -4220,6 +4458,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &811212999 GameObject: m_ObjectHideFlags: 0 @@ -4266,6 +4505,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4277,6 +4518,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4289,6 +4531,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &811213002 MeshFilter: m_ObjectHideFlags: 0 @@ -4427,6 +4670,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4502,7 +4748,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -4515,8 +4764,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -4533,16 +4788,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -4564,6 +4823,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &843841048 Material: serializedVersion: 6 @@ -4684,11 +4944,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4700,6 +4965,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -4723,6 +4989,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -4761,7 +5030,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -4771,10 +5042,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -4789,23 +5067,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -4815,6 +5102,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &873433697 GameObject: m_ObjectHideFlags: 0 @@ -4861,6 +5149,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4872,6 +5162,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4884,6 +5175,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &873433700 MeshFilter: m_ObjectHideFlags: 0 @@ -5022,6 +5314,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5097,7 +5392,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -5110,8 +5408,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5128,16 +5432,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -5159,6 +5467,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &942495973 Material: serializedVersion: 6 @@ -5289,6 +5598,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5364,7 +5676,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -5377,8 +5692,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5395,16 +5716,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -5426,6 +5751,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &954731873 Material: serializedVersion: 6 @@ -5546,11 +5872,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5562,6 +5893,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -5585,6 +5917,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -5623,7 +5958,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5633,10 +5970,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5651,23 +5995,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -5677,6 +6030,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &961669313 Material: serializedVersion: 6 @@ -5807,6 +6161,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5882,7 +6239,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -5895,8 +6255,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5913,16 +6279,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -5944,6 +6314,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &974217518 GameObject: m_ObjectHideFlags: 0 @@ -5990,6 +6361,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6001,6 +6374,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -6013,6 +6387,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &974217521 MeshFilter: m_ObjectHideFlags: 0 @@ -6272,6 +6647,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &980711210 Material: serializedVersion: 6 @@ -6402,6 +6778,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -6477,7 +6856,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -6490,8 +6872,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -6508,16 +6896,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -6539,6 +6931,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &982114948 GameObject: m_ObjectHideFlags: 0 @@ -6585,6 +6978,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6596,6 +6991,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -6608,6 +7004,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &982114951 MeshFilter: m_ObjectHideFlags: 0 @@ -6736,11 +7133,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -6752,6 +7154,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -6775,6 +7178,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -6813,7 +7219,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -6823,10 +7231,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -6841,23 +7256,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -6867,6 +7291,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1063405362 GameObject: m_ObjectHideFlags: 0 @@ -6913,6 +7338,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6924,6 +7351,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -6936,6 +7364,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1063405365 MeshFilter: m_ObjectHideFlags: 0 @@ -7211,6 +7640,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1078716889 Material: serializedVersion: 6 @@ -7341,6 +7771,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7416,7 +7849,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -7429,8 +7865,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -7447,16 +7889,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -7478,6 +7924,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1086171481 GameObject: m_ObjectHideFlags: 0 @@ -7524,6 +7971,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7535,6 +7984,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -7547,6 +7997,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1086171484 MeshFilter: m_ObjectHideFlags: 0 @@ -7685,6 +8136,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7760,7 +8214,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -7773,8 +8230,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -7791,16 +8254,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -7822,6 +8289,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1170716395 GameObject: m_ObjectHideFlags: 0 @@ -7868,6 +8336,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7879,6 +8349,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -7891,6 +8362,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1170716398 MeshFilter: m_ObjectHideFlags: 0 @@ -7945,6 +8417,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7956,6 +8430,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -7968,6 +8443,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1180738110 MeshFilter: m_ObjectHideFlags: 0 @@ -8096,11 +8572,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8112,6 +8593,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -8135,6 +8617,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -8173,7 +8658,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -8183,10 +8670,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -8201,23 +8695,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -8227,6 +8730,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1359437100 GameObject: m_ObjectHideFlags: 0 @@ -8273,6 +8777,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8284,6 +8790,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -8296,6 +8803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1359437103 MeshFilter: m_ObjectHideFlags: 0 @@ -8424,11 +8932,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8440,6 +8953,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -8463,6 +8977,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -8501,7 +9018,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -8511,10 +9030,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -8529,23 +9055,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -8555,6 +9090,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1474301112 GameObject: m_ObjectHideFlags: 0 @@ -8601,6 +9137,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8612,6 +9150,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -8624,6 +9163,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1474301115 MeshFilter: m_ObjectHideFlags: 0 @@ -8762,6 +9302,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8837,7 +9380,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -8850,8 +9396,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -8868,16 +9420,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -8899,6 +9455,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1525732446 Material: serializedVersion: 6 @@ -9019,11 +9576,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9035,6 +9597,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -9058,6 +9621,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -9096,7 +9662,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -9106,10 +9674,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -9124,23 +9699,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -9150,6 +9734,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1526868522 GameObject: m_ObjectHideFlags: 0 @@ -9196,6 +9781,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9207,6 +9794,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9219,6 +9807,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1526868525 MeshFilter: m_ObjectHideFlags: 0 @@ -9357,6 +9946,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9432,7 +10024,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -9445,8 +10040,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -9463,16 +10064,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -9494,6 +10099,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1556361012 GameObject: m_ObjectHideFlags: 0 @@ -9520,7 +10126,6 @@ MonoBehaviour: m_GameObject: {fileID: 1556361012} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 66d6c688291ac8b48adc878e4fc4d29d, type: 3} m_Name: m_EditorClassIdentifier: @@ -9528,6 +10133,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 6e49b7ef330d4884a8d632d30fd7f3fd, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -9618,6 +10225,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9629,6 +10238,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9641,6 +10251,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1629361942 MeshFilter: m_ObjectHideFlags: 0 @@ -9779,6 +10390,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9854,7 +10468,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -9867,8 +10484,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -9885,16 +10508,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -9916,6 +10543,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1710386578 GameObject: m_ObjectHideFlags: 0 @@ -9962,6 +10590,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9973,6 +10603,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9985,6 +10616,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1710386581 MeshFilter: m_ObjectHideFlags: 0 @@ -10039,6 +10671,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10050,6 +10684,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -10062,6 +10697,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1748023057 MeshFilter: m_ObjectHideFlags: 0 @@ -10337,6 +10973,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1846684368 GameObject: m_ObjectHideFlags: 0 @@ -10363,7 +11000,6 @@ MonoBehaviour: m_GameObject: {fileID: 1846684368} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 66d6c688291ac8b48adc878e4fc4d29d, type: 3} m_Name: m_EditorClassIdentifier: @@ -10371,6 +11007,8 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 9ba3ffc98c51ad942a223546952cbd7c, type: 2} commonParameters: [] + overideRenderQueue: 0 + renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _Smoothness @@ -10545,6 +11183,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10620,7 +11261,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -10633,8 +11277,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -10651,16 +11301,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -10682,6 +11336,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!21 &1928742637 Material: serializedVersion: 6 @@ -10802,11 +11457,16 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10818,6 +11478,7 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -10841,6 +11502,9 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -10879,7 +11543,9 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -10889,10 +11555,17 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -10907,23 +11580,32 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -10933,6 +11615,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1960425366 GameObject: m_ObjectHideFlags: 0 @@ -10979,6 +11662,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10990,6 +11675,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -11002,6 +11688,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1960425369 MeshFilter: m_ObjectHideFlags: 0 @@ -11277,6 +11964,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2085978366 GameObject: m_ObjectHideFlags: 0 @@ -11323,6 +12011,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11334,6 +12024,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -11346,6 +12037,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2085978369 MeshFilter: m_ObjectHideFlags: 0 @@ -11484,6 +12176,9 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11559,7 +12254,10 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 + - _ReceivesSSR: 0 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -11572,8 +12270,14 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -11590,16 +12294,20 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 + - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -11621,6 +12329,7 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2136871501 GameObject: m_ObjectHideFlags: 0 @@ -11667,6 +12376,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11678,6 +12389,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -11690,6 +12402,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136871504 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity index 22569806866..d71da5b5d1c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity @@ -120,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -250,109 +252,13 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} ---- !u!114 &744631047 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 200 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} - enableBackplate: - m_OverrideState: 0 - m_Value: 0 - backplateType: - m_OverrideState: 0 - m_Value: 0 - groundLevel: - m_OverrideState: 0 - m_Value: 0 - scale: - m_OverrideState: 0 - m_Value: {x: 32, y: 32} - projectionDistance: - m_OverrideState: 0 - m_Value: 16 - min: 0.0000001 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 100 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 --- !u!1 &755370651 GameObject: m_ObjectHideFlags: 0 @@ -640,6 +546,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1736369240 @@ -668,7 +575,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -714,7 +621,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -747,6 +656,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -763,6 +673,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!33 &8798469937330876322 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity index e58d455fc45..d970fb1dcf4 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,9 +96,11 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: daaf293807949624aaad0da0667be728, type: 2} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 4fa5d3214e4bc7140a41fc7b55e90721, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -241,12 +245,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -438,6 +442,11 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &822358699 @@ -477,7 +486,7 @@ Terrain: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 822358699} m_Enabled: 1 - serializedVersion: 5 + serializedVersion: 6 m_TerrainData: {fileID: 15600000, guid: 245a04c8ad46a5349bcbaad4da1da133, type: 2} m_TreeDistance: 2000 m_TreeBillboardDistance: 50 @@ -500,6 +509,7 @@ Terrain: m_ScaleInLightmap: 0.0512 m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} m_GroupingID: 0 + m_RenderingLayerMask: 1 m_AllowAutoConnect: 1 --- !u!4 &822358702 Transform: @@ -544,16 +554,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 2 m_Material: {fileID: 2100000, guid: 638b5db2a1568654e998f0152ad27948, type: 2} m_DrawDistance: 1000 m_FadeScale: 0.9 m_UVScale: {x: 1, y: 1} m_UVBias: {x: 0, y: 0} m_AffectsTransparency: 0 - m_Offset: {x: 0, y: 0, z: 0.50000006} + m_Offset: {x: 0, y: 0, z: 4} m_Size: {x: 16, y: 16, z: 8} m_FadeFactor: 1 - m_Version: 1 --- !u!4 &1119739687 Transform: m_ObjectHideFlags: 0 @@ -562,7 +572,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1119739685} m_LocalRotation: {x: 0.46766594, y: 0.32243472, z: -0.17777091, w: 0.8035683} - m_LocalPosition: {x: 48.26, y: 5.06, z: 21.24} + m_LocalPosition: {x: 47.02827, y: 8.091847, z: 19.99873} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -579,7 +589,6 @@ GameObject: - component: {fileID: 1736369240} - component: {fileID: 1736369239} - component: {fileID: 1736369242} - - component: {fileID: 1736369241} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -595,8 +604,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1736369238} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -645,6 +655,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1736369240 @@ -661,7 +672,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 26.558, y: -25.6, z: 0} ---- !u!114 &1736369241 +--- !u!114 &1736369242 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -670,99 +681,107 @@ MonoBehaviour: m_GameObject: {fileID: 1736369238} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 1 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.2 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.15 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0 - 0 - 0 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 3 - shadowPrecision: 0 - shadowData: - format: 0 - data: 000000000000803f - shadowDatas: - - format: 0 - data: 000000000000803f ---- !u!114 &1736369242 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736369238} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 1 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 3 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.2 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 From a6c1f8ec077f544c3351bb96cffc8be34e3a0d75 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 28 May 2020 14:50:45 +0200 Subject: [PATCH 04/53] Fixed decal rendering --- .../HDRenderPipeline.Prepass.cs | 40 +++++++++++++++---- .../HDRenderPipeline.RenderGraph.cs | 18 +++++---- .../RenderPipeline/HDRenderPipeline.cs | 32 ++++++++------- 3 files changed, 61 insertions(+), 29 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index d975e73fae3..f4217a2bc7b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -312,6 +312,7 @@ class GBufferPassData public RendererListHandle rendererList; public TextureHandle[] gbufferRT = new TextureHandle[RenderGraph.kMaxMRTCount]; public TextureHandle depthBuffer; + public DBufferOutput dBuffer; } struct GBufferOutput @@ -359,6 +360,15 @@ void SetupGBufferTargets(RenderGraph renderGraph, HDCamera hdCamera, GBufferPass } } + // TODO RENDERGRAPH: For now we just bind globally for GBuffer/Forward passes. + // We need to find a nice way to invalid this kind of buffers when they should not be used anymore (after the last read). + static void BindDBufferGlobalData(in DBufferOutput dBufferOutput, in RenderGraphContext ctx) + { + for (int i = 0; i < dBufferOutput.dBufferCount; ++i) + ctx.cmd.SetGlobalTexture(HDShaderIDs._DBufferTexture[i], ctx.resources.GetTexture(dBufferOutput.mrt[i])); + ctx.cmd.SetGlobalBuffer(HDShaderIDs._DecalPropertyMaskBufferSRV, ctx.resources.GetComputeBuffer(dBufferOutput.decalPropertyMaskBuffer)); + } + // RenderGBuffer do the gbuffer pass. This is only called with deferred. If we use a depth prepass, then the depth prepass will perform the alpha testing for opaque alpha tested and we don't need to do it anymore // during Gbuffer pass. This is handled in the shader and the depth test (equal and no depth write) is done here. void RenderGBuffer(RenderGraph renderGraph, TextureHandle sssBuffer, ref PrepassOutput prepassOutput, CullingResults cull, HDCamera hdCamera) @@ -378,11 +388,12 @@ void RenderGBuffer(RenderGraph renderGraph, TextureHandle sssBuffer, ref Prepass passData.rendererList = builder.UseRendererList( renderGraph.CreateRendererList(CreateOpaqueRendererListDesc(cull, hdCamera.camera, HDShaderPassNames.s_GBufferName, m_CurrentRendererConfigurationBakedLighting))); - ReadDBuffer(prepassOutput.dbuffer, builder); + passData.dBuffer = ReadDBuffer(prepassOutput.dbuffer, builder); builder.SetRenderFunc( (GBufferPassData data, RenderGraphContext context) => { + BindDBufferGlobalData(data.dBuffer, context); DrawOpaqueRendererList(context, data.frameSettings, context.resources.GetRendererList(data.rendererList)); }); } @@ -534,17 +545,20 @@ class RenderDBufferPassData public int dBufferCount; public RendererListHandle meshDecalsRendererList; public TextureHandle depthStencilBuffer; + public ComputeBufferHandle propertyMaskBuffer; } struct DBufferOutput { - public TextureHandle[] mrt; - public int dBufferCount; + public TextureHandle[] mrt; + public int dBufferCount; + public ComputeBufferHandle decalPropertyMaskBuffer; } class DBufferNormalPatchData { public DBufferNormalPatchParameters parameters; + public DBufferOutput dBuffer; public TextureHandle depthStencilBuffer; public TextureHandle normalBuffer; } @@ -560,24 +574,28 @@ void SetupDBufferTargets(RenderGraph renderGraph, RenderDBufferPassData passData for (int dbufferIndex = 0; dbufferIndex < passData.dBufferCount; ++dbufferIndex) { passData.mrt[dbufferIndex] = builder.UseColorBuffer(renderGraph.CreateTexture( - new TextureDesc(Vector2.one, true, true) { colorFormat = rtFormat[dbufferIndex], name = s_DBufferNames[dbufferIndex] }, HDShaderIDs._DBufferTexture[dbufferIndex]), dbufferIndex); + new TextureDesc(Vector2.one, true, true) { colorFormat = rtFormat[dbufferIndex], name = s_DBufferNames[dbufferIndex] }), dbufferIndex); } passData.depthStencilBuffer = builder.UseDepthBuffer(output.resolvedDepthBuffer, DepthAccess.Write); + passData.propertyMaskBuffer = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_DbufferManager.propertyMaskBuffer)); output.dbuffer.dBufferCount = passData.dBufferCount; for (int i = 0; i < passData.dBufferCount; ++i) { output.dbuffer.mrt[i] = passData.mrt[i]; } + output.dbuffer.decalPropertyMaskBuffer = passData.propertyMaskBuffer; } - static void ReadDBuffer(DBufferOutput dBufferOutput, RenderGraphBuilder builder) + static DBufferOutput ReadDBuffer(DBufferOutput dBufferOutput, RenderGraphBuilder builder) { - // Will bind automatically so no need to track an explicit reference after ReadTexture is called (DBuffer targets have a ShaderTagId associated with them) + // We do the reads "in place" because we don't want to allocate a struct with dynamic arrays each time we do that and we want to keep loops for code sanity. for (int i = 0; i < dBufferOutput.dBufferCount; ++i) - builder.ReadTexture(dBufferOutput.mrt[i]); + dBufferOutput.mrt[i] = builder.ReadTexture(dBufferOutput.mrt[i]); + dBufferOutput.decalPropertyMaskBuffer = builder.ReadComputeBuffer(dBufferOutput.decalPropertyMaskBuffer); + return dBufferOutput; } void RenderDBuffer(RenderGraph renderGraph, HDCamera hdCamera, ref PrepassOutput output, CullingResults cullingResults) @@ -624,6 +642,7 @@ void RenderDBuffer(RenderGraph renderGraph, HDCamera hdCamera, ref PrepassOutput rt, resources.GetTexture(data.depthStencilBuffer), resources.GetRendererList(data.meshDecalsRendererList), + resources.GetComputeBuffer(data.propertyMaskBuffer), context.renderContext, context.cmd); }); @@ -638,7 +657,7 @@ void DecalNormalPatch(RenderGraph renderGraph, HDCamera hdCamera, ref PrepassOut using (var builder = renderGraph.AddRenderPass("DBuffer Normal (forward)", out var passData, ProfilingSampler.Get(HDProfileId.DBufferNormal))) { passData.parameters = PrepareDBufferNormalPatchParameters(hdCamera); - ReadDBuffer(output.dbuffer, builder); + passData.dBuffer = ReadDBuffer(output.dbuffer, builder); passData.normalBuffer = builder.WriteTexture(output.resolvedNormalBuffer); passData.depthStencilBuffer = builder.ReadTexture(output.resolvedDepthBuffer); @@ -646,7 +665,12 @@ void DecalNormalPatch(RenderGraph renderGraph, HDCamera hdCamera, ref PrepassOut builder.SetRenderFunc( (DBufferNormalPatchData data, RenderGraphContext ctx) => { + RTHandle[] mrt = ctx.renderGraphPool.GetTempArray(data.dBuffer.dBufferCount); + for (int i = 0; i < data.dBuffer.dBufferCount; ++i) + mrt[i] = ctx.resources.GetTexture(data.dBuffer.mrt[i]); + DecalNormalPatch( data.parameters, + mrt, ctx.resources.GetTexture(data.depthStencilBuffer), ctx.resources.GetTexture(data.normalBuffer), ctx.cmd); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index e1092a21f7f..d0884977d88 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -356,12 +356,13 @@ class ForwardPassData { public RendererListHandle rendererList; public TextureHandle[] renderTarget = new TextureHandle[3]; - public int renderTargetCount; + public int renderTargetCount; public TextureHandle depthBuffer; - public ComputeBuffer lightListBuffer; - public FrameSettings frameSettings; - public bool decalsEnabled; - public bool renderMotionVecForTransparent; + public ComputeBuffer lightListBuffer; + public FrameSettings frameSettings; + public bool decalsEnabled; + public bool renderMotionVecForTransparent; + public DBufferOutput? dbuffer; } void PrepareForwardPassData(RenderGraph renderGraph, RenderGraphBuilder builder, ForwardPassData data, bool opaque, FrameSettings frameSettings, RendererListDesc rendererListDesc, TextureHandle depthBuffer, ShadowResult shadowResult, DBufferOutput? dbuffer = null) @@ -379,7 +380,7 @@ void PrepareForwardPassData(RenderGraph renderGraph, RenderGraphBuilder builder, HDShadowManager.ReadShadowResult(shadowResult, builder); if (dbuffer != null) - ReadDBuffer(dbuffer.Value, builder); + data.dbuffer = ReadDBuffer(dbuffer.Value, builder); } // Guidelines: In deferred by default there is no opaque in forward. However it is possible to force an opaque material to render in forward @@ -424,11 +425,14 @@ void RenderForwardOpaque( RenderGraph renderGraph, builder.SetRenderFunc( (ForwardPassData data, RenderGraphContext context) => { - // TODO: replace with UseColorBuffer when removing old rendering (SetRenderTarget is called inside RenderForwardRendererList because of that). + // TODO RENDERGRAPH: replace with UseColorBuffer when removing old rendering (SetRenderTarget is called inside RenderForwardRendererList because of that). var mrt = context.renderGraphPool.GetTempArray(data.renderTargetCount); for (int i = 0; i < data.renderTargetCount; ++i) mrt[i] = context.resources.GetTexture(data.renderTarget[i]); + if (data.dbuffer != null) + BindDBufferGlobalData(data.dbuffer.Value, context); + RenderForwardRendererList(data.frameSettings, context.resources.GetRendererList(data.rendererList), mrt, diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 44a466cfe87..7694deed909 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -3453,6 +3453,7 @@ void RenderDBuffer(HDCamera hdCamera, CommandBuffer cmd, ScriptableRenderContext m_DbufferManager.GetRTHandles(), m_SharedRTManager.GetDepthStencilBuffer(), RendererList.Create(PrepareMeshDecalsRendererList(cullingResults, hdCamera, use4RTs)), + m_DbufferManager.propertyMaskBuffer, renderContext, cmd); cmd.SetGlobalBuffer(HDShaderIDs._DecalPropertyMaskBufferSRV, m_DbufferManager.propertyMaskBuffer); @@ -3461,20 +3462,20 @@ void RenderDBuffer(HDCamera hdCamera, CommandBuffer cmd, ScriptableRenderContext } } - void DecalNormalPatch( HDCamera hdCamera, - CommandBuffer cmd) + void DecalNormalPatch(HDCamera hdCamera, CommandBuffer cmd) { if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.Decals) && !hdCamera.frameSettings.IsEnabled(FrameSettingsField.MSAA)) // MSAA not supported { var parameters = PrepareDBufferNormalPatchParameters(hdCamera); - DecalNormalPatch(parameters, m_SharedRTManager.GetDepthStencilBuffer(), m_SharedRTManager.GetNormalBuffer(), cmd); + DecalNormalPatch(parameters, m_DbufferManager.GetRTHandles(), m_SharedRTManager.GetDepthStencilBuffer(), m_SharedRTManager.GetNormalBuffer(), cmd); } } struct DBufferNormalPatchParameters { public Material decalNormalBufferMaterial; + public int dBufferCount; public int stencilRef; public int stencilMask; } @@ -3482,6 +3483,7 @@ struct DBufferNormalPatchParameters DBufferNormalPatchParameters PrepareDBufferNormalPatchParameters(HDCamera hdCamera) { var parameters = new DBufferNormalPatchParameters(); + parameters.dBufferCount = m_Asset.currentPlatformRenderPipelineSettings.decalSettings.perChannelMask ? 4 : 3; parameters.decalNormalBufferMaterial = m_DecalNormalBufferMaterial; switch (hdCamera.frameSettings.litShaderMode) { @@ -3501,21 +3503,24 @@ DBufferNormalPatchParameters PrepareDBufferNormalPatchParameters(HDCamera hdCame } static void DecalNormalPatch( DBufferNormalPatchParameters parameters, + RTHandle[] dBuffer, RTHandle depthStencilBuffer, RTHandle normalBuffer, CommandBuffer cmd) { - using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.DBufferNormal))) - { - parameters.decalNormalBufferMaterial.SetInt(HDShaderIDs._DecalNormalBufferStencilReadMask, parameters.stencilMask); - parameters.decalNormalBufferMaterial.SetInt(HDShaderIDs._DecalNormalBufferStencilRef, parameters.stencilRef); + using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.DBufferNormal))) + { + parameters.decalNormalBufferMaterial.SetInt(HDShaderIDs._DecalNormalBufferStencilReadMask, parameters.stencilMask); + parameters.decalNormalBufferMaterial.SetInt(HDShaderIDs._DecalNormalBufferStencilRef, parameters.stencilRef); + for (int i = 0; i < parameters.dBufferCount; ++i) + parameters.decalNormalBufferMaterial.SetTexture(HDShaderIDs._DBufferTexture[i], dBuffer[i]); CoreUtils.SetRenderTarget(cmd, depthStencilBuffer); cmd.SetRandomWriteTarget(1, normalBuffer); - cmd.DrawProcedural(Matrix4x4.identity, parameters.decalNormalBufferMaterial, 0, MeshTopology.Triangles, 3, 1); - cmd.ClearRandomWriteTargets(); - } + cmd.DrawProcedural(Matrix4x4.identity, parameters.decalNormalBufferMaterial, 0, MeshTopology.Triangles, 3, 1); + cmd.ClearRandomWriteTargets(); } + } RendererListDesc PrepareMeshDecalsRendererList(CullingResults cullingResults, HDCamera hdCamera, bool use4RTs) { @@ -3547,7 +3552,6 @@ void UpdateShaderVariablesGlobalDecal(ref ShaderVariablesGlobal cb, HDCamera hdC struct RenderDBufferParameters { public bool use4RTs; - public ComputeBuffer propertyMaskBuffer; public ComputeShader clearPropertyMaskBufferCS; public int clearPropertyMaskBufferKernel; public int propertyMaskBufferSize; @@ -3557,7 +3561,6 @@ RenderDBufferParameters PrepareRenderDBufferParameters() { var parameters = new RenderDBufferParameters(); parameters.use4RTs = m_Asset.currentPlatformRenderPipelineSettings.decalSettings.perChannelMask; - parameters.propertyMaskBuffer = m_DbufferManager.propertyMaskBuffer; parameters.clearPropertyMaskBufferCS = m_DbufferManager.clearPropertyMaskBufferShader; parameters.clearPropertyMaskBufferKernel = m_DbufferManager.clearPropertyMaskBufferKernel; parameters.propertyMaskBufferSize = m_DbufferManager.propertyMaskBufferSize; @@ -3569,6 +3572,7 @@ static void RenderDBuffer( in RenderDBufferParameters parameters, RTHandle[] rtHandles, RTHandle depthStencilBuffer, RendererList meshDecalsRendererList, + ComputeBuffer propertyMaskBuffer, ScriptableRenderContext renderContext, CommandBuffer cmd) { @@ -3601,9 +3605,9 @@ static void RenderDBuffer( in RenderDBufferParameters parameters, } // clear decal property mask buffer - cmd.SetComputeBufferParam(parameters.clearPropertyMaskBufferCS, parameters.clearPropertyMaskBufferKernel, HDShaderIDs._DecalPropertyMaskBuffer, parameters.propertyMaskBuffer); + cmd.SetComputeBufferParam(parameters.clearPropertyMaskBufferCS, parameters.clearPropertyMaskBufferKernel, HDShaderIDs._DecalPropertyMaskBuffer, propertyMaskBuffer); cmd.DispatchCompute(parameters.clearPropertyMaskBufferCS, parameters.clearPropertyMaskBufferKernel, parameters.propertyMaskBufferSize / 64, 1, 1); - cmd.SetRandomWriteTarget(parameters.use4RTs ? 4 : 3, parameters.propertyMaskBuffer); + cmd.SetRandomWriteTarget(parameters.use4RTs ? 4 : 3, propertyMaskBuffer); HDUtils.DrawRendererList(renderContext, cmd, meshDecalsRendererList); DecalSystem.instance.RenderIntoDBuffer(cmd); From 04d0d20fb1ba0ee0ca0a2e7d601bcb0220745071 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 28 May 2020 17:36:09 +0200 Subject: [PATCH 05/53] Implemented ColorGrading and Uber Post (fixes a lot of small diff due to Color Grading not being 100% neutral) --- .../PostProcessSystem.RenderGraph.cs | 512 +++++++++++------- .../PostProcessing/PostProcessSystem.cs | 394 +++++++++----- .../RenderPipeline/HDRenderPipeline.Debug.cs | 2 +- 3 files changed, 569 insertions(+), 339 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs index 692f3918445..78b069f9bfe 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs @@ -3,8 +3,23 @@ namespace UnityEngine.Rendering.HighDefinition { + partial class PostProcessSystem { + class ColorGradingPassData + { + public ColorGradingParameters parameters; + public TextureHandle logLut; + } + + class UberPostPassData + { + public UberPostParameters parameters; + public TextureHandle source; + public TextureHandle destination; + public TextureHandle logLut; + } + public void Render( RenderGraph renderGraph, HDCamera hdCamera, BlueNoise blueNoise, @@ -17,220 +32,313 @@ public void Render( RenderGraph renderGraph, var dynResHandler = DynamicResolutionHandler.instance; bool isSceneView = hdCamera.camera.cameraType == CameraType.SceneView; - - // TODO: Implement + var source = colorBuffer; TextureHandle alphaTexture = new TextureHandle(); - //// Save the alpha and apply it back into the final pass if working in fp16 - //if (m_KeepAlpha) - //{ - // using (new ProfilingSample(cmd, "Alpha Copy", CustomSamplerId.AlphaCopy.GetSampler())) - // { - // DoCopyAlpha(cmd, hdCamera, colorBuffer); - // } - //} - var source = colorBuffer; + // TODO RENDERGRAPH: Implement + // // Save the alpha and apply it back into the final pass if rendering in fp16 and post-processing in r11g11b10 + // if (m_KeepAlpha) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.AlphaCopy))) + // { + // DoCopyAlpha(cmd, camera, colorBuffer); + // } + // } + // var source = colorBuffer; - //if (m_PostProcessEnabled) - //{ - // Guard bands (also known as "horrible hack") to avoid bleeding previous RTHandle - // content into smaller viewports with some effects like Bloom that rely on bilinear - // filtering and can't use clamp sampler and the likes - // Note: some platforms can't clear a partial render target so we directly draw black triangles - //{ - // int w = hdCamera.actualWidth; - // int h = hdCamera.actualHeight; - // cmd.SetRenderTarget(source, 0, CubemapFace.Unknown, -1); + // if (m_PostProcessEnabled) + // { + // // Guard bands (also known as "horrible hack") to avoid bleeding previous RTHandle + // // content into smaller viewports with some effects like Bloom that rely on bilinear + // // filtering and can't use clamp sampler and the likes + // // Note: some platforms can't clear a partial render target so we directly draw black triangles + // { + // int w = camera.actualWidth; + // int h = camera.actualHeight; + // cmd.SetRenderTarget(source, 0, CubemapFace.Unknown, -1); + + // if (w < source.rt.width || h < source.rt.height) + // { + // cmd.SetViewport(new Rect(w, 0, k_RTGuardBandSize, h)); + // cmd.DrawProcedural(Matrix4x4.identity, m_ClearBlackMaterial, 0, MeshTopology.Triangles, 3, 1); + // cmd.SetViewport(new Rect(0, h, w + k_RTGuardBandSize, k_RTGuardBandSize)); + // cmd.DrawProcedural(Matrix4x4.identity, m_ClearBlackMaterial, 0, MeshTopology.Triangles, 3, 1); + // } + // } + + // // Optional NaN killer before post-processing kicks in + // bool stopNaNs = camera.stopNaNs && m_StopNaNFS; + + //#if UNITY_EDITOR + // if (isSceneView) + // stopNaNs = HDAdditionalSceneViewSettings.sceneViewStopNaNs; + //#endif + + // if (stopNaNs) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.StopNaNs))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoStopNaNs(cmd, camera, source, destination); + // PoolSource(ref source, destination); + // } + // } + // } + + // // Dynamic exposure - will be applied in the next frame + // // Not considered as a post-process so it's not affected by its enabled state + // if (!IsExposureFixed() && m_ExposureControlFS) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.DynamicExposure))) + // { + // if (m_Exposure.mode.value == ExposureMode.AutomaticHistogram) + // { + // DoHistogramBasedExposure(cmd, camera, source); + // } + // else + // { + // DoDynamicExposure(cmd, camera, source); + // } + + // // On reset history we need to apply dynamic exposure immediately to avoid + // // white or black screen flashes when the current exposure isn't anywhere + // // near 0 + // if (camera.resetPostProcessingHistory) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + + // var cs = m_Resources.shaders.applyExposureCS; + // int kernel = cs.FindKernel("KMain"); + + // // Note: we call GetPrevious instead of GetCurrent because the textures + // // are swapped internally as the system expects the texture will be used + // // on the next frame. So the actual "current" for this frame is in + // // "previous". + // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._ExposureTexture, GetPreviousExposureTexture(camera)); + // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._InputTexture, source); + // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._OutputTexture, destination); + // cmd.DispatchCompute(cs, kernel, (camera.actualWidth + 7) / 8, (camera.actualHeight + 7) / 8, camera.viewCount); + + // PoolSource(ref source, destination); + // } + // } + // } + + if (m_PostProcessEnabled) + { + // // Temporal anti-aliasing goes first + // bool taaEnabled = false; + + // if (m_AntialiasingFS) + // { + // taaEnabled = camera.antialiasing == AntialiasingMode.TemporalAntialiasing; + + // if (taaEnabled) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.TemporalAntialiasing))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoTemporalAntialiasing(cmd, camera, source, destination, depthBuffer, depthMipChain); + // PoolSource(ref source, destination); + // } + // } + // else if (camera.antialiasing == AntialiasingMode.SubpixelMorphologicalAntiAliasing) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.SMAA))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoSMAA(cmd, camera, source, destination, depthBuffer); + // PoolSource(ref source, destination); + // } + // } + // } + + // if (camera.frameSettings.IsEnabled(FrameSettingsField.CustomPostProcess)) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.CustomPostProcessBeforePP))) + // { + // foreach (var typeString in HDRenderPipeline.defaultAsset.beforePostProcessCustomPostProcesses) + // RenderCustomPostProcess(cmd, camera, ref source, colorBuffer, Type.GetType(typeString)); + // } + // } - // if (w < source.rt.width || h < source.rt.height) + // // If Path tracing is enabled, then DoF is computed in the path tracer by sampling the lens aperure (when using the physical camera mode) + // bool isDoFPathTraced = (camera.frameSettings.IsEnabled(FrameSettingsField.RayTracing) && + // camera.volumeStack.GetComponent().enable.value && + // camera.camera.cameraType != CameraType.Preview && + // m_DepthOfField.focusMode == DepthOfFieldMode.UsePhysicalCamera); + + // // Depth of Field is done right after TAA as it's easier to just re-project the CoC + // // map rather than having to deal with all the implications of doing it before TAA + // if (m_DepthOfField.IsActive() && !isSceneView && m_DepthOfFieldFS && !isDoFPathTraced) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.DepthOfField))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoDepthOfField(cmd, camera, source, destination, taaEnabled); + // PoolSource(ref source, destination); + // } + // } + + // // Motion blur after depth of field for aesthetic reasons (better to see motion + // // blurred bokeh rather than out of focus motion blur) + // if (m_MotionBlur.IsActive() && m_AnimatedMaterialsEnabled && !camera.resetPostProcessingHistory && m_MotionBlurFS) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.MotionBlur))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoMotionBlur(cmd, camera, source, destination); + // PoolSource(ref source, destination); + // } + // } + + // // Panini projection is done as a fullscreen pass after all depth-based effects are + // // done and before bloom kicks in + // // This is one effect that would benefit from an overscan mode or supersampling in + // // HDRP to reduce the amount of resolution lost at the center of the screen + // if (m_PaniniProjection.IsActive() && !isSceneView && m_PaniniProjectionFS) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.PaniniProjection))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoPaniniProjection(cmd, camera, source, destination); + // PoolSource(ref source, destination); + // } + // } + + // Uber post-process + //// Generate the bloom texture + //bool bloomActive = m_Bloom.IsActive() && m_BloomFS; + + //if (bloomActive) + //{ + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.Bloom))) // { - // cmd.SetViewport(new Rect(w, 0, k_RTGuardBandSize, h)); - // cmd.DrawProcedural(Matrix4x4.identity, m_ClearBlackMaterial, 0, MeshTopology.Triangles, 3, 1); - // cmd.SetViewport(new Rect(0, h, w + k_RTGuardBandSize, k_RTGuardBandSize)); - // cmd.DrawProcedural(Matrix4x4.identity, m_ClearBlackMaterial, 0, MeshTopology.Triangles, 3, 1); + // DoBloom(cmd, camera, source, uberPostParams.uberPostCS, uberPostParams.uberPostKernel); // } //} + //else + //{ + // cmd.SetComputeTextureParam(uberPostParams.uberPostCS, uberPostParams.uberPostKernel, HDShaderIDs._BloomTexture, TextureXR.GetBlackTexture()); + // cmd.SetComputeTextureParam(uberPostParams.uberPostCS, uberPostParams.uberPostKernel, HDShaderIDs._BloomDirtTexture, Texture2D.blackTexture); + // cmd.SetComputeVectorParam(uberPostParams.uberPostCS, HDShaderIDs._BloomParams, Vector4.zero); + //} -// // Optional NaN killer before post-processing kicks in -// bool stopNaNs = hdCamera.stopNaNs && m_StopNaNFS; - -//#if UNITY_EDITOR -// if (isSceneView) -// stopNaNs = HDRenderPipelinePreferences.sceneViewStopNaNs; -//#endif - -// if (stopNaNs) -// { -// using (new ProfilingSample(cmd, "Stop NaNs", CustomSamplerId.StopNaNs.GetSampler())) -// { -// var destination = m_Pool.Get(Vector2.one, k_ColorFormat); -// DoStopNaNs(cmd, hdCamera, source, destination); -// PoolSource(ref source, destination); -// } -// } - //} - - //// Dynamic exposure - will be applied in the next frame - //// Not considered as a post-process so it's not affected by its enabled state - //if (!IsExposureFixed() && m_ExposureControlFS) - //{ - // using (new ProfilingSample(cmd, "Dynamic Exposure", CustomSamplerId.Exposure.GetSampler())) - // { - // DoDynamicExposure(cmd, hdCamera, source); - // } - //} - - //if (m_PostProcessEnabled) - //{ - // // Temporal anti-aliasing goes first - // bool taaEnabled = false; - - // if (m_AntialiasingFS) - // { - // taaEnabled = hdCamera.antialiasing == AntialiasingMode.TemporalAntialiasing; - - // if (taaEnabled) - // { - // using (new ProfilingSample(cmd, "Temporal Anti-aliasing", CustomSamplerId.TemporalAntialiasing.GetSampler())) - // { - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - // DoTemporalAntialiasing(cmd, hdCamera, source, destination, depthBuffer); - // PoolSource(ref source, destination); - // } - // } - // else if (hdCamera.antialiasing == AntialiasingMode.SubpixelMorphologicalAntiAliasing) - // { - // using (new ProfilingSample(cmd, "SMAA", CustomSamplerId.SMAA.GetSampler())) + TextureHandle logLutOutput; + using (var builder = renderGraph.AddRenderPass("Color Grading", out var passData, ProfilingSampler.Get(HDProfileId.ColorGradingLUTBuilder))) + { + TextureHandle logLut = renderGraph.CreateTexture(new TextureDesc(m_LutSize, m_LutSize) + { + name = "Color Grading Log Lut", + dimension = TextureDimension.Tex3D, + slices = m_LutSize, + depthBufferBits = DepthBits.None, + colorFormat = m_LutFormat, + filterMode = FilterMode.Bilinear, + wrapMode = TextureWrapMode.Clamp, + anisoLevel = 0, + useMipMap = false, + enableRandomWrite = true + }); + + passData.parameters = PrepareColorGradingParameters(); + passData.logLut = builder.WriteTexture(logLut); + logLutOutput = passData.logLut; + + builder.SetRenderFunc( + (ColorGradingPassData data, RenderGraphContext ctx) => + { + DoColorGrading(data.parameters, ctx.resources.GetTexture(data.logLut), ctx.cmd); + }); + } + + using (var builder = renderGraph.AddRenderPass("Uber Post", out var passData, ProfilingSampler.Get(HDProfileId.UberPost))) + { + TextureHandle dest = renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true) + { + name = "Uber Post Destination", + colorFormat = m_ColorFormat, + useMipMap = false, + enableRandomWrite = true + }); + + passData.parameters = PrepareUberPostParameters(hdCamera, isSceneView); + passData.source = builder.ReadTexture(source); + passData.logLut = builder.ReadTexture(logLutOutput); + passData.destination = builder.WriteTexture(dest); + + builder.SetRenderFunc( + (UberPostPassData data, RenderGraphContext ctx) => + { + DoUberPostProcess( data.parameters, + ctx.resources.GetTexture(data.source), + ctx.resources.GetTexture(data.destination), + ctx.resources.GetTexture(data.logLut), + ctx.cmd); + }); + + source = passData.destination; + } + + m_HDInstance.PushFullScreenDebugTexture(renderGraph, source, FullScreenDebugMode.ColorLog); + + // if (camera.frameSettings.IsEnabled(FrameSettingsField.CustomPostProcess)) + // { + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.CustomPostProcessAfterPP))) + // { + // foreach (var typeString in HDRenderPipeline.defaultAsset.afterPostProcessCustomPostProcesses) + // RenderCustomPostProcess(cmd, camera, ref source, colorBuffer, Type.GetType(typeString)); + // } + // } + } + + // if (dynResHandler.DynamicResolutionEnabled() && // Dynamic resolution is on. + // camera.antialiasing == AntialiasingMode.FastApproximateAntialiasing && + // m_AntialiasingFS) // { - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - // DoSMAA(cmd, hdCamera, source, destination, depthBuffer); - // PoolSource(ref source, destination); + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.FXAA))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + // DoFXAA(cmd, camera, source, destination); + // PoolSource(ref source, destination); + // } // } - // } - // } - - // if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.CustomPostProcess)) - // { - // using (new ProfilingSample(cmd, "Custom Post Processes Before PP", CustomSamplerId.CustomPostProcessBeforePP.GetSampler())) - // { - // foreach (var typeString in HDRenderPipeline.currentAsset.beforePostProcessCustomPostProcesses) - // RenderCustomPostProcess(cmd, hdCamera, ref source, colorBuffer, Type.GetType(typeString)); - // } - // } - - // // Depth of Field is done right after TAA as it's easier to just re-project the CoC - // // map rather than having to deal with all the implications of doing it before TAA - // if (m_DepthOfField.IsActive() && !isSceneView && m_DepthOfFieldFS) - // { - // using (new ProfilingSample(cmd, "Depth of Field", CustomSamplerId.DepthOfField.GetSampler())) - // { - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - // DoDepthOfField(cmd, hdCamera, source, destination, taaEnabled); - // PoolSource(ref source, destination); - // } - // } - - // // Motion blur after depth of field for aesthetic reasons (better to see motion - // // blurred bokeh rather than out of focus motion blur) - // if (m_MotionBlur.IsActive() && m_AnimatedMaterialsEnabled && !m_ResetHistory && m_MotionBlurFS) - // { - // using (new ProfilingSample(cmd, "Motion Blur", CustomSamplerId.MotionBlur.GetSampler())) - // { - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - // DoMotionBlur(cmd, hdCamera, source, destination); - // PoolSource(ref source, destination); - // } - // } - - // // Panini projection is done as a fullscreen pass after all depth-based effects are - // // done and before bloom kicks in - // // This is one effect that would benefit from an overscan mode or supersampling in - // // HDRP to reduce the amount of resolution lost at the center of the screen - // if (m_PaniniProjection.IsActive() && !isSceneView && m_PaniniProjectionFS) - // { - // using (new ProfilingSample(cmd, "Panini Projection", CustomSamplerId.PaniniProjection.GetSampler())) - // { - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - // DoPaniniProjection(cmd, hdCamera, source, destination); - // PoolSource(ref source, destination); - // } - // } - - // // Combined post-processing stack - always runs if postfx is enabled - // using (new ProfilingSample(cmd, "Uber", CustomSamplerId.UberPost.GetSampler())) - // { - // // Feature flags are passed to all effects and it's their responsibility to check - // // if they are used or not so they can set default values if needed - // var cs = m_Resources.shaders.uberPostCS; - // var featureFlags = GetUberFeatureFlags(isSceneView); - // int kernel = GetUberKernel(cs, featureFlags); - - // // Generate the bloom texture - // bool bloomActive = m_Bloom.IsActive() && m_BloomFS; - - // if (bloomActive) - // { - // using (new ProfilingSample(cmd, "Bloom", CustomSamplerId.Bloom.GetSampler())) + + // // Contrast Adaptive Sharpen Upscaling + // if (dynResHandler.DynamicResolutionEnabled() && + // dynResHandler.filter == DynamicResUpscaleFilter.ContrastAdaptiveSharpen) // { - // DoBloom(cmd, hdCamera, source, cs, kernel); + // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.ContrastAdaptiveSharpen))) + // { + // var destination = m_Pool.Get(Vector2.one, m_ColorFormat); + + // var cs = m_Resources.shaders.contrastAdaptiveSharpenCS; + // int kInit = cs.FindKernel("KInitialize"); + // int kMain = cs.FindKernel("KMain"); + // if (kInit >= 0 && kMain >= 0) + // { + // cmd.SetComputeFloatParam(cs, HDShaderIDs._Sharpness, 1); + // cmd.SetComputeTextureParam(cs, kMain, HDShaderIDs._InputTexture, source); + // cmd.SetComputeVectorParam(cs, HDShaderIDs._InputTextureDimensions, new Vector4(source.rt.width, source.rt.height)); + // cmd.SetComputeTextureParam(cs, kMain, HDShaderIDs._OutputTexture, destination); + // cmd.SetComputeVectorParam(cs, HDShaderIDs._OutputTextureDimensions, new Vector4(destination.rt.width, destination.rt.height)); + + // ValidateComputeBuffer(ref m_ContrastAdaptiveSharpen, 2, sizeof(uint) * 4); + + // cmd.SetComputeBufferParam(cs, kInit, "CasParameters", m_ContrastAdaptiveSharpen); + // cmd.SetComputeBufferParam(cs, kMain, "CasParameters", m_ContrastAdaptiveSharpen); + + // cmd.DispatchCompute(cs, kInit, 1, 1, 1); + + // int dispatchX = (int)System.Math.Ceiling(destination.rt.width / 16.0f); + // int dispatchY = (int)System.Math.Ceiling(destination.rt.height / 16.0f); + + // cmd.DispatchCompute(cs, kMain, dispatchX, dispatchY, camera.viewCount); + // } + + // PoolSource(ref source, destination); + // } // } - // } - // else - // { - // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._BloomTexture, TextureXR.GetBlackTexture()); - // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._BloomDirtTexture, Texture2D.blackTexture); - // cmd.SetComputeVectorParam(cs, HDShaderIDs._BloomParams, Vector4.zero); - // } - - // // Build the color grading lut - // using (new ProfilingSample(cmd, "Color Grading LUT Builder", CustomSamplerId.ColorGradingLUTBuilder.GetSampler())) - // { - // DoColorGrading(cmd, cs, kernel); - // } - - // // Setup the rest of the effects - // DoLensDistortion(cmd, cs, kernel, featureFlags); - // DoChromaticAberration(cmd, cs, kernel, featureFlags); - // DoVignette(cmd, cs, kernel, featureFlags); - - // // Run - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - - // bool outputColorLog = m_HDInstance.m_CurrentDebugDisplaySettings.data.fullScreenDebugMode == FullScreenDebugMode.ColorLog; - // cmd.SetComputeVectorParam(cs, "_DebugFlags", new Vector4(outputColorLog ? 1 : 0, 0, 0, 0)); - // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._InputTexture, source); - // cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._OutputTexture, destination); - // cmd.DispatchCompute(cs, kernel, (hdCamera.actualWidth + 7) / 8, (hdCamera.actualHeight + 7) / 8, hdCamera.viewCount); - // m_HDInstance.PushFullScreenDebugTexture(hdCamera, cmd, destination, FullScreenDebugMode.ColorLog); - - // // Cleanup - // if (bloomActive) m_Pool.Recycle(m_BloomTexture); - // m_BloomTexture = null; - - // PoolSource(ref source, destination); - // } - - // if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.CustomPostProcess)) - // { - // using (new ProfilingSample(cmd, "Custom Post Processes After PP", CustomSamplerId.CustomPostProcessAfterPP.GetSampler())) - // { - // foreach (var typeString in HDRenderPipeline.currentAsset.afterPostProcessCustomPostProcesses) - // RenderCustomPostProcess(cmd, hdCamera, ref source, colorBuffer, Type.GetType(typeString)); - // } - // } - //} - - //if (dynResHandler.DynamicResolutionEnabled() && // Dynamic resolution is on. - // hdCamera.antialiasing == AntialiasingMode.FastApproximateAntialiasing && - // m_AntialiasingFS) - //{ - // using (new ProfilingSample(cmd, "FXAA", CustomSamplerId.FXAA.GetSampler())) - // { - // var destination = m_Pool.Get(Vector2.one, k_ColorFormat); - // DoFXAA(cmd, hdCamera, source, destination); - // PoolSource(ref source, destination); - // } - //} using (var builder = renderGraph.AddRenderPass("Final Pass", out var passData, ProfilingSampler.Get(HDProfileId.FinalPost))) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs index dd7ce91f082..3f3ac48ecf6 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs @@ -40,7 +40,7 @@ private enum SMAAStage Texture2D m_ExposureCurveTexture; RTHandle m_EmptyExposureTexture; // RGHalf - RTHandle m_DebugExposureData; + RTHandle m_DebugExposureData; ComputeBuffer m_HistogramBuffer; readonly int[] m_EmptyHistogram = new int[k_HistogramBins]; @@ -65,6 +65,7 @@ private enum SMAAStage // Color grading data readonly int m_LutSize; + readonly GraphicsFormat m_LutFormat; RTHandle m_InternalLogLut; // ARGBHalf readonly HableCurve m_HableCurve; @@ -161,8 +162,11 @@ public PostProcessSystem(HDRenderPipelineAsset hdAsset, RenderPipelineResources m_UseSafePath = SystemInfo.graphicsDeviceVendor .ToLowerInvariant().Contains("intel"); + // Project-wide LUT size for all grading operations - meaning that internal LUTs and + // user-provided LUTs will have to be this size var postProcessSettings = hdAsset.currentPlatformRenderPipelineSettings.postProcessSettings; m_LutSize = postProcessSettings.lutSize; + m_LutFormat = (GraphicsFormat)postProcessSettings.lutFormat; // Grading specific m_HableCurve = new HableCurve(); @@ -252,12 +256,6 @@ public void InitializeNonRenderGraphResources(HDRenderPipelineAsset hdAsset) { m_NonRenderGraphResourcesAvailable = true; - var settings = hdAsset.currentPlatformRenderPipelineSettings.postProcessSettings; - - // Project-wide LUT size for all grading operations - meaning that internal LUTs and - // user-provided LUTs will have to be this size - var lutFormat = (GraphicsFormat)settings.lutFormat; - m_InternalLogLut = RTHandles.Alloc( name: "Color Grading Log Lut", dimension: TextureDimension.Tex3D, @@ -265,7 +263,7 @@ public void InitializeNonRenderGraphResources(HDRenderPipelineAsset hdAsset) height: m_LutSize, slices: m_LutSize, depthBufferBits: DepthBits.None, - colorFormat: lutFormat, + colorFormat: m_LutFormat, filterMode: FilterMode.Bilinear, wrapMode: TextureWrapMode.Clamp, anisoLevel: 0, @@ -613,16 +611,7 @@ void PoolSource(ref RTHandle src, RTHandle dst) // Combined post-processing stack - always runs if postfx is enabled using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.UberPost))) { - // Feature flags are passed to all effects and it's their responsibility to check - // if they are used or not so they can set default values if needed - var cs = m_Resources.shaders.uberPostCS; - cs.shaderKeywords = null; - var featureFlags = GetUberFeatureFlags(isSceneView); - int kernel = cs.FindKernel("Uber"); - if(m_EnableAlpha) - { - cs.EnableKeyword("ENABLE_ALPHA"); - } + UberPostParameters uberPostParams = PrepareUberPostParameters(camera, isSceneView); // Generate the bloom texture bool bloomActive = m_Bloom.IsActive() && m_BloomFS; @@ -631,35 +620,28 @@ void PoolSource(ref RTHandle src, RTHandle dst) { using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.Bloom))) { - DoBloom(cmd, camera, source, cs, kernel); + DoBloom(cmd, camera, source, uberPostParams.uberPostCS, uberPostParams.uberPostKernel); } } else { - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._BloomTexture, TextureXR.GetBlackTexture()); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._BloomDirtTexture, Texture2D.blackTexture); - cmd.SetComputeVectorParam(cs, HDShaderIDs._BloomParams, Vector4.zero); + cmd.SetComputeTextureParam(uberPostParams.uberPostCS, uberPostParams.uberPostKernel, HDShaderIDs._BloomTexture, TextureXR.GetBlackTexture()); + cmd.SetComputeTextureParam(uberPostParams.uberPostCS, uberPostParams.uberPostKernel, HDShaderIDs._BloomDirtTexture, Texture2D.blackTexture); + cmd.SetComputeVectorParam(uberPostParams.uberPostCS, HDShaderIDs._BloomParams, Vector4.zero); } // Build the color grading lut using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.ColorGradingLUTBuilder))) { - DoColorGrading(cmd, cs, kernel); + var parameters = PrepareColorGradingParameters(); + DoColorGrading(parameters, m_InternalLogLut, cmd); } - // Setup the rest of the effects - DoLensDistortion(cmd, cs, kernel, featureFlags); - DoChromaticAberration(cmd, cs, kernel, featureFlags); - DoVignette(cmd, cs, kernel, featureFlags); - // Run var destination = m_Pool.Get(Vector2.one, m_ColorFormat); - bool outputColorLog = m_HDInstance.m_CurrentDebugDisplaySettings.data.fullScreenDebugMode == FullScreenDebugMode.ColorLog; - cmd.SetComputeVectorParam(cs, "_DebugFlags", new Vector4(outputColorLog ? 1 : 0, 0, 0, 0)); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._InputTexture, source); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._OutputTexture, destination); - cmd.DispatchCompute(cs, kernel, (camera.actualWidth + 7) / 8, (camera.actualHeight + 7) / 8, camera.viewCount); + DoUberPostProcess(uberPostParams, source, destination, m_InternalLogLut, cmd); + m_HDInstance.PushFullScreenDebugTexture(camera, cmd, destination, FullScreenDebugMode.ColorLog); // Cleanup @@ -740,6 +722,94 @@ void PoolSource(ref RTHandle src, RTHandle dst) camera.resetPostProcessingHistory = false; } + struct UberPostParameters + { + public ComputeShader uberPostCS; + public int uberPostKernel; + public bool outputColorLog; + public int width; + public int height; + public int viewCount; + + public Vector4 logLutSettings; + + public Vector4 lensDistortionParams1; + public Vector4 lensDistortionParams2; + + public Texture spectralLut; + public Vector4 chromaticAberrationParameters; + + public Vector4 vignetteParams1; + public Vector4 vignetteParams2; + public Vector4 vignetteColor; + public Texture vignetteMask; + } + + UberPostParameters PrepareUberPostParameters(HDCamera hdCamera, bool isSceneView) + { + var parameters = new UberPostParameters(); + + // Feature flags are passed to all effects and it's their responsibility to check + // if they are used or not so they can set default values if needed + parameters.uberPostCS = m_Resources.shaders.uberPostCS; + parameters.uberPostCS.shaderKeywords = null; + var featureFlags = GetUberFeatureFlags(isSceneView); + parameters.uberPostKernel = parameters.uberPostCS.FindKernel("Uber"); + if (m_EnableAlpha) + { + parameters.uberPostCS.EnableKeyword("ENABLE_ALPHA"); + } + + parameters.outputColorLog = m_HDInstance.m_CurrentDebugDisplaySettings.data.fullScreenDebugMode == FullScreenDebugMode.ColorLog; + parameters.width = hdCamera.actualWidth; + parameters.height = hdCamera.actualHeight; + parameters.viewCount = hdCamera.viewCount; + + // Color grading + // This should be EV100 instead of EV but given that EV100(0) isn't equal to 1, it means + // we can't use 0 as the default neutral value which would be confusing to users + float postExposureLinear = Mathf.Pow(2f, m_ColorAdjustments.postExposure.value); + parameters.logLutSettings = new Vector4(1f / m_LutSize, m_LutSize - 1f, postExposureLinear, 0f); + + // Setup the rest of the effects + PrepareLensDistortionParameters(ref parameters, featureFlags); + PrepareChromaticAberrationParameters(ref parameters, featureFlags); + PrepareVignetteParameters(ref parameters, featureFlags); + + return parameters; + } + + static void DoUberPostProcess( in UberPostParameters parameters, + RTHandle source, + RTHandle destination, + RTHandle logLut, + CommandBuffer cmd) + { + // Color grading + cmd.SetComputeTextureParam(parameters.uberPostCS, parameters.uberPostKernel, HDShaderIDs._LogLut3D, logLut); + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._LogLut3D_Params, parameters.logLutSettings); + + // Lens distortion + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._DistortionParams1, parameters.lensDistortionParams1); + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._DistortionParams2, parameters.lensDistortionParams1); + + // Chromatic aberration + cmd.SetComputeTextureParam(parameters.uberPostCS, parameters.uberPostKernel, HDShaderIDs._ChromaSpectralLut, parameters.spectralLut); + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._ChromaParams, parameters.chromaticAberrationParameters); + + // Vignette + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._VignetteParams1, parameters.vignetteParams1); + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._VignetteParams2, parameters.vignetteParams2); + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._VignetteColor, parameters.vignetteColor); + cmd.SetComputeTextureParam(parameters.uberPostCS, parameters.uberPostKernel, HDShaderIDs._VignetteMask, parameters.vignetteMask); + + // Dispatch uber post + cmd.SetComputeVectorParam(parameters.uberPostCS, "_DebugFlags", new Vector4(parameters.outputColorLog ? 1 : 0, 0, 0, 0)); + cmd.SetComputeTextureParam(parameters.uberPostCS, parameters.uberPostKernel, HDShaderIDs._InputTexture, source); + cmd.SetComputeTextureParam(parameters.uberPostCS, parameters.uberPostKernel, HDShaderIDs._OutputTexture, destination); + cmd.DispatchCompute(parameters.uberPostCS, parameters.uberPostKernel, (parameters.width + 7) / 8, (parameters.height + 7) / 8, parameters.viewCount); + } + // Grabs all active feature flags UberPostFeatureFlags GetUberFeatureFlags(bool isSceneView) { @@ -1011,7 +1081,7 @@ void DoHistogramBasedExposure(CommandBuffer cmd, HDCamera camera, RTHandle sourc Vector4 histogramParams = new Vector4(histScale, histBias, histogramFraction.x, histogramFraction.y); ValidateComputeBuffer(ref m_HistogramBuffer, k_HistogramBins, sizeof(uint)); - m_HistogramBuffer.SetData(m_EmptyHistogram); // Clear the histogram + m_HistogramBuffer.SetData(m_EmptyHistogram); // Clear the histogram cmd.SetComputeVectorParam(cs, HDShaderIDs._HistogramExposureParams, histogramParams); // Generate histogram. @@ -1038,7 +1108,7 @@ void DoHistogramBasedExposure(CommandBuffer cmd, HDCamera camera, RTHandle sourc int totalPixels = camera.actualWidth * camera.actualHeight; cmd.DispatchCompute(cs, kernel, dispatchSizeX, dispatchSizeY, 1); - // Now read the histogram + // Now read the histogram kernel = cs.FindKernel("KHistogramReduce"); cmd.SetComputeVectorParam(cs, HDShaderIDs._ExposureParams, new Vector4(m_Exposure.compensation.value + m_DebugExposureCompensation, m_Exposure.limitMin.value, m_Exposure.limitMax.value, 0f)); cmd.SetComputeVectorParam(cs, HDShaderIDs._AdaptationParams, new Vector4(m_Exposure.adaptationSpeedLightToDark.value, m_Exposure.adaptationSpeedDarkToLight.value, 0f, 0f)); @@ -2324,44 +2394,41 @@ void DispatchWithGuardBands(ComputeShader shader, int kernelId, in Vector2Int si #region Lens Distortion - void DoLensDistortion(CommandBuffer cmd, ComputeShader cs, int kernel, UberPostFeatureFlags flags) + void PrepareLensDistortionParameters(ref UberPostParameters parameters, UberPostFeatureFlags flags) { if ((flags & UberPostFeatureFlags.LensDistortion) != UberPostFeatureFlags.LensDistortion) return; - cs.EnableKeyword("LENS_DISTORTION"); + parameters.uberPostCS.EnableKeyword("LENS_DISTORTION"); float amount = 1.6f * Mathf.Max(Mathf.Abs(m_LensDistortion.intensity.value * 100f), 1f); float theta = Mathf.Deg2Rad * Mathf.Min(160f, amount); float sigma = 2f * Mathf.Tan(theta * 0.5f); var center = m_LensDistortion.center.value * 2f - Vector2.one; - var p1 = new Vector4( + parameters.lensDistortionParams1 = new Vector4( center.x, center.y, Mathf.Max(m_LensDistortion.xMultiplier.value, 1e-4f), Mathf.Max(m_LensDistortion.yMultiplier.value, 1e-4f) ); - var p2 = new Vector4( + parameters.lensDistortionParams2 = new Vector4( m_LensDistortion.intensity.value >= 0f ? theta : 1f / theta, sigma, 1f / m_LensDistortion.scale.value, m_LensDistortion.intensity.value * 100f ); - - cmd.SetComputeVectorParam(cs, HDShaderIDs._DistortionParams1, p1); - cmd.SetComputeVectorParam(cs, HDShaderIDs._DistortionParams2, p2); } #endregion #region Chromatic Aberration - void DoChromaticAberration(CommandBuffer cmd, ComputeShader cs, int kernel, UberPostFeatureFlags flags) + void PrepareChromaticAberrationParameters(ref UberPostParameters parameters, UberPostFeatureFlags flags) { if ((flags & UberPostFeatureFlags.ChromaticAberration) != UberPostFeatureFlags.ChromaticAberration) return; - cs.EnableKeyword("CHROMATIC_ABERRATION"); + parameters.uberPostCS.EnableKeyword("CHROMATIC_ABERRATION"); var spectralLut = m_ChromaticAberration.spectralLut.value; @@ -2392,38 +2459,37 @@ void DoChromaticAberration(CommandBuffer cmd, ComputeShader cs, int kernel, Uber spectralLut = m_InternalSpectralLut; } - var settings = new Vector4(m_ChromaticAberration.intensity.value * 0.05f, m_ChromaticAberration.maxSamples, 0f, 0f); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._ChromaSpectralLut, spectralLut); - cmd.SetComputeVectorParam(cs, HDShaderIDs._ChromaParams, settings); + parameters.spectralLut = spectralLut; + parameters.chromaticAberrationParameters = new Vector4(m_ChromaticAberration.intensity.value * 0.05f, m_ChromaticAberration.maxSamples, 0f, 0f); } #endregion #region Vignette - void DoVignette(CommandBuffer cmd, ComputeShader cs, int kernel, UberPostFeatureFlags flags) + void PrepareVignetteParameters(ref UberPostParameters parameters, UberPostFeatureFlags flags) { if ((flags & UberPostFeatureFlags.Vignette) != UberPostFeatureFlags.Vignette) return; - cs.EnableKeyword("VIGNETTE"); + parameters.uberPostCS.EnableKeyword("VIGNETTE"); if (m_Vignette.mode.value == VignetteMode.Procedural) { float roundness = (1f - m_Vignette.roundness.value) * 6f + m_Vignette.roundness.value; - cmd.SetComputeVectorParam(cs, HDShaderIDs._VignetteParams1, new Vector4(m_Vignette.center.value.x, m_Vignette.center.value.y, 0f, 0f)); - cmd.SetComputeVectorParam(cs, HDShaderIDs._VignetteParams2, new Vector4(m_Vignette.intensity.value * 3f, m_Vignette.smoothness.value * 5f, roundness, m_Vignette.rounded.value ? 1f : 0f)); - cmd.SetComputeVectorParam(cs, HDShaderIDs._VignetteColor, m_Vignette.color.value); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._VignetteMask, Texture2D.blackTexture); + parameters.vignetteParams1 = new Vector4(m_Vignette.center.value.x, m_Vignette.center.value.y, 0f, 0f); + parameters.vignetteParams2 = new Vector4(m_Vignette.intensity.value * 3f, m_Vignette.smoothness.value * 5f, roundness, m_Vignette.rounded.value ? 1f : 0f); + parameters.vignetteColor = m_Vignette.color.value; + parameters.vignetteMask = Texture2D.blackTexture; } else // Masked { var color = m_Vignette.color.value; color.a = Mathf.Clamp01(m_Vignette.opacity.value); - cmd.SetComputeVectorParam(cs, HDShaderIDs._VignetteParams1, new Vector4(0f, 0f, 1f, 0f)); - cmd.SetComputeVectorParam(cs, HDShaderIDs._VignetteColor, color); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._VignetteMask, m_Vignette.mask.value); + parameters.vignetteParams1 = new Vector4(0f, 0f, 1f, 0f); + parameters.vignetteColor = color; + parameters.vignetteMask = m_Vignette.mask.value; } } @@ -2431,119 +2497,175 @@ void DoVignette(CommandBuffer cmd, ComputeShader cs, int kernel, UberPostFeature #region Color Grading - // TODO: User lut support - void DoColorGrading(CommandBuffer cmd, ComputeShader cs, int kernel) + struct ColorGradingParameters + { + public ComputeShader builderCS; + public int builderKernel; + + public int lutSize; + + public Vector4 colorFilter; + public Vector3 lmsColorBalance; + public Vector4 hueSatCon; + public Vector4 channelMixerR; + public Vector4 channelMixerG; + public Vector4 channelMixerB; + public Vector4 shadows; + public Vector4 midtones; + public Vector4 highlights; + public Vector4 shadowsHighlightsLimits; + public Vector4 lift; + public Vector4 gamma; + public Vector4 gain; + public Vector4 splitShadows; + public Vector4 splitHighlights; + + public ColorCurves curves; + public HableCurve hableCurve; + + public Vector4 miscParams; + + public Texture externalLuT; + public float lutContribution; + + public TonemappingMode tonemappingMode; + } + + ColorGradingParameters PrepareColorGradingParameters() { - // Prepare data - var lmsColorBalance = GetColorBalanceCoeffs(m_WhiteBalance.temperature.value, m_WhiteBalance.tint.value); - var hueSatCon = new Vector4(m_ColorAdjustments.hueShift.value / 360f, m_ColorAdjustments.saturation.value / 100f + 1f, m_ColorAdjustments.contrast.value / 100f + 1f, 0f); - var channelMixerR = new Vector4(m_ChannelMixer.redOutRedIn.value / 100f, m_ChannelMixer.redOutGreenIn.value / 100f, m_ChannelMixer.redOutBlueIn.value / 100f, 0f); - var channelMixerG = new Vector4(m_ChannelMixer.greenOutRedIn.value / 100f, m_ChannelMixer.greenOutGreenIn.value / 100f, m_ChannelMixer.greenOutBlueIn.value / 100f, 0f); - var channelMixerB = new Vector4(m_ChannelMixer.blueOutRedIn.value / 100f, m_ChannelMixer.blueOutGreenIn.value / 100f, m_ChannelMixer.blueOutBlueIn.value / 100f, 0f); + var parameters = new ColorGradingParameters(); - ComputeShadowsMidtonesHighlights(out var shadows, out var midtones, out var highlights, out var shadowsHighlightsLimits); - ComputeLiftGammaGain(out var lift, out var gamma, out var gain); - ComputeSplitToning(out var splitShadows, out var splitHighlights); + parameters.tonemappingMode = m_TonemappingFS ? m_Tonemapping.mode.value : TonemappingMode.None; + + parameters.builderCS = m_Resources.shaders.lutBuilder3DCS; + parameters.builderKernel = parameters.builderCS.FindKernel("KBuild"); // Setup lut builder compute & grab the kernel we need - var tonemappingMode = m_TonemappingFS ? m_Tonemapping.mode.value : TonemappingMode.None; - var builderCS = m_Resources.shaders.lutBuilder3DCS; - builderCS.shaderKeywords = null; + parameters.builderCS.shaderKeywords = null; if (m_Tonemapping.IsActive()) { - switch (tonemappingMode) + switch (parameters.tonemappingMode) { - case TonemappingMode.Neutral: builderCS.EnableKeyword("TONEMAPPING_NEUTRAL"); break; - case TonemappingMode.ACES: builderCS.EnableKeyword("TONEMAPPING_ACES"); break; - case TonemappingMode.Custom: builderCS.EnableKeyword("TONEMAPPING_CUSTOM"); break; - case TonemappingMode.External: builderCS.EnableKeyword("TONEMAPPING_EXTERNAL"); break; + case TonemappingMode.Neutral: parameters.builderCS.EnableKeyword("TONEMAPPING_NEUTRAL"); break; + case TonemappingMode.ACES: parameters.builderCS.EnableKeyword("TONEMAPPING_ACES"); break; + case TonemappingMode.Custom: parameters.builderCS.EnableKeyword("TONEMAPPING_CUSTOM"); break; + case TonemappingMode.External: parameters.builderCS.EnableKeyword("TONEMAPPING_EXTERNAL"); break; } } else { - builderCS.EnableKeyword("TONEMAPPING_NONE"); + parameters.builderCS.EnableKeyword("TONEMAPPING_NONE"); } - int builderKernel = builderCS.FindKernel("KBuild"); + parameters.lutSize = m_LutSize; + + //parameters.colorFilter; + parameters.lmsColorBalance = GetColorBalanceCoeffs(m_WhiteBalance.temperature.value, m_WhiteBalance.tint.value); + parameters.hueSatCon = new Vector4(m_ColorAdjustments.hueShift.value / 360f, m_ColorAdjustments.saturation.value / 100f + 1f, m_ColorAdjustments.contrast.value / 100f + 1f, 0f); + parameters.channelMixerR = new Vector4(m_ChannelMixer.redOutRedIn.value / 100f, m_ChannelMixer.redOutGreenIn.value / 100f, m_ChannelMixer.redOutBlueIn.value / 100f, 0f); + parameters.channelMixerG = new Vector4(m_ChannelMixer.greenOutRedIn.value / 100f, m_ChannelMixer.greenOutGreenIn.value / 100f, m_ChannelMixer.greenOutBlueIn.value / 100f, 0f); + parameters.channelMixerB = new Vector4(m_ChannelMixer.blueOutRedIn.value / 100f, m_ChannelMixer.blueOutGreenIn.value / 100f, m_ChannelMixer.blueOutBlueIn.value / 100f, 0f); + + ComputeShadowsMidtonesHighlights(out parameters.shadows, out parameters.midtones, out parameters.highlights, out parameters.shadowsHighlightsLimits); + ComputeLiftGammaGain(out parameters.lift, out parameters.gamma, out parameters.gain); + ComputeSplitToning(out parameters.splitShadows, out parameters.splitHighlights); + + // Be careful, if m_Curves is modified between preparing the render pass and executing it, result will be wrong. + // However this should be fine for now as all updates should happen outisde rendering. + parameters.curves = m_Curves; + + if (parameters.tonemappingMode == TonemappingMode.Custom) + { + parameters.hableCurve = m_HableCurve; + parameters.hableCurve.Init( + m_Tonemapping.toeStrength.value, + m_Tonemapping.toeLength.value, + m_Tonemapping.shoulderStrength.value, + m_Tonemapping.shoulderLength.value, + m_Tonemapping.shoulderAngle.value, + m_Tonemapping.gamma.value + ); + } + else if (parameters.tonemappingMode == TonemappingMode.External) + { + parameters.externalLuT = m_Tonemapping.lutTexture.value; + parameters.lutContribution = m_Tonemapping.lutContribution.value; + } + + parameters.colorFilter = m_ColorAdjustments.colorFilter.value.linear; + parameters.miscParams = new Vector4(m_ColorGradingFS ? 1f : 0f, 0f, 0f, 0f); + + return parameters; + } + + // TODO: User lut support + static void DoColorGrading( in ColorGradingParameters parameters, + RTHandle internalLogLuT, + CommandBuffer cmd) + { + var builderCS = parameters.builderCS; + var builderKernel = parameters.builderKernel; // Fill-in constant buffers & textures - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._OutputTexture, m_InternalLogLut); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Size, new Vector4(m_LutSize, 1f / (m_LutSize - 1f), 0f, 0f)); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ColorBalance, lmsColorBalance); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ColorFilter, m_ColorAdjustments.colorFilter.value.linear); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ChannelMixerRed, channelMixerR); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ChannelMixerGreen, channelMixerG); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ChannelMixerBlue, channelMixerB); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._HueSatCon, hueSatCon); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Lift, lift); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Gamma, gamma); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Gain, gain); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Shadows, shadows); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Midtones, midtones); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Highlights, highlights); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ShaHiLimits, shadowsHighlightsLimits); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._SplitShadows, splitShadows); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._SplitHighlights, splitHighlights); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._OutputTexture, internalLogLuT); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Size, new Vector4(parameters.lutSize, 1f / (parameters.lutSize - 1f), 0f, 0f)); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ColorBalance, parameters.lmsColorBalance); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ColorFilter, parameters.colorFilter); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ChannelMixerRed, parameters.channelMixerR); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ChannelMixerGreen, parameters.channelMixerG); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ChannelMixerBlue, parameters.channelMixerB); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._HueSatCon, parameters.hueSatCon); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Lift, parameters.lift); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Gamma, parameters.gamma); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Gain, parameters.gain); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Shadows, parameters.shadows); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Midtones, parameters.midtones); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Highlights, parameters.highlights); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ShaHiLimits, parameters.shadowsHighlightsLimits); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._SplitShadows, parameters.splitShadows); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._SplitHighlights, parameters.splitHighlights); // YRGB - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveMaster, m_Curves.master.value.GetTexture()); - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveRed, m_Curves.red.value.GetTexture()); - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveGreen, m_Curves.green.value.GetTexture()); - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveBlue, m_Curves.blue.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveMaster, parameters.curves.master.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveRed, parameters.curves.red.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveGreen, parameters.curves.green.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveBlue, parameters.curves.blue.value.GetTexture()); // Secondary curves - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveHueVsHue, m_Curves.hueVsHue.value.GetTexture()); - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveHueVsSat, m_Curves.hueVsSat.value.GetTexture()); - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveLumVsSat, m_Curves.lumVsSat.value.GetTexture()); - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveSatVsSat, m_Curves.satVsSat.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveHueVsHue, parameters.curves.hueVsHue.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveHueVsSat, parameters.curves.hueVsSat.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveLumVsSat, parameters.curves.lumVsSat.value.GetTexture()); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._CurveSatVsSat, parameters.curves.satVsSat.value.GetTexture()); // Artist-driven tonemap curve - if (tonemappingMode == TonemappingMode.Custom) - { - m_HableCurve.Init( - m_Tonemapping.toeStrength.value, - m_Tonemapping.toeLength.value, - m_Tonemapping.shoulderStrength.value, - m_Tonemapping.shoulderLength.value, - m_Tonemapping.shoulderAngle.value, - m_Tonemapping.gamma.value - ); - - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._CustomToneCurve, m_HableCurve.uniforms.curve); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ToeSegmentA, m_HableCurve.uniforms.toeSegmentA); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ToeSegmentB, m_HableCurve.uniforms.toeSegmentB); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._MidSegmentA, m_HableCurve.uniforms.midSegmentA); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._MidSegmentB, m_HableCurve.uniforms.midSegmentB); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ShoSegmentA, m_HableCurve.uniforms.shoSegmentA); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ShoSegmentB, m_HableCurve.uniforms.shoSegmentB); + if (parameters.tonemappingMode == TonemappingMode.Custom) + { + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._CustomToneCurve, parameters.hableCurve.uniforms.curve); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ToeSegmentA, parameters.hableCurve.uniforms.toeSegmentA); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ToeSegmentB, parameters.hableCurve.uniforms.toeSegmentB); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._MidSegmentA, parameters.hableCurve.uniforms.midSegmentA); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._MidSegmentB, parameters.hableCurve.uniforms.midSegmentB); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ShoSegmentA, parameters.hableCurve.uniforms.shoSegmentA); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._ShoSegmentB, parameters.hableCurve.uniforms.shoSegmentB); } - else if (tonemappingMode == TonemappingMode.External) + else if (parameters.tonemappingMode == TonemappingMode.External) { - cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._LogLut3D, m_Tonemapping.lutTexture.value); - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._LogLut3D_Params, new Vector4(1f / m_LutSize, m_LutSize - 1f, m_Tonemapping.lutContribution.value, 0f)); + cmd.SetComputeTextureParam(builderCS, builderKernel, HDShaderIDs._LogLut3D, parameters.externalLuT); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._LogLut3D_Params, new Vector4(1f / parameters.lutSize, parameters.lutSize - 1f, parameters.lutContribution, 0f)); } // Misc parameters - cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Params, new Vector4(m_ColorGradingFS ? 1f : 0f, 0f, 0f, 0f)); + cmd.SetComputeVectorParam(builderCS, HDShaderIDs._Params, parameters.miscParams); // Generate the lut // See the note about Metal & Intel in LutBuilder3D.compute builderCS.GetKernelThreadGroupSizes(builderKernel, out uint threadX, out uint threadY, out uint threadZ); cmd.DispatchCompute(builderCS, builderKernel, - (int)((m_LutSize + threadX - 1u) / threadX), - (int)((m_LutSize + threadY - 1u) / threadY), - (int)((m_LutSize + threadZ - 1u) / threadZ) + (int)((parameters.lutSize + threadX - 1u) / threadX), + (int)((parameters.lutSize + threadY - 1u) / threadY), + (int)((parameters.lutSize + threadZ - 1u) / threadZ) ); - - // This should be EV100 instead of EV but given that EV100(0) isn't equal to 1, it means - // we can't use 0 as the default neutral value which would be confusing to users - float postExposureLinear = Mathf.Pow(2f, m_ColorAdjustments.postExposure.value); - - // Setup the uber shader - var logLutSettings = new Vector4(1f / m_LutSize, m_LutSize - 1f, postExposureLinear, 0f); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._LogLut3D, m_InternalLogLut); - cmd.SetComputeVectorParam(cs, HDShaderIDs._LogLut3D_Params, logLutSettings); } // Returns color balance coefficients in the LMS space diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs index fb4875e44bc..57f0b89069c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs @@ -291,7 +291,7 @@ void PushFullScreenLightingDebugTexture(RenderGraph renderGraph, TextureHandle i } } - void PushFullScreenDebugTexture(RenderGraph renderGraph, TextureHandle input, FullScreenDebugMode debugMode) + internal void PushFullScreenDebugTexture(RenderGraph renderGraph, TextureHandle input, FullScreenDebugMode debugMode) { if (debugMode == m_CurrentDebugDisplaySettings.data.fullScreenDebugMode) { From 4934ab91957590e0a0e15011068b430ea7dc576e Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 28 May 2020 17:36:36 +0200 Subject: [PATCH 06/53] Revert "First batch of disabled tests." This reverts commit 505924b6967041787c0698b4ede1d158686f990e. --- .../1x_Materials/1210_Lit_BentNormal.unity | 181 +-- .../1x_Materials/1216_Lit_SSS_MaxRadius.unity | 1239 ++++++----------- .../1218_Lit_DiffusionProfiles.unity | 109 +- .../1352_Fabric_Env_Convolution.unity | 315 ++--- .../1353_Fabric_Env_NoConvolution.unity | 741 +--------- .../Scenes/1x_Materials/1601_TerrainLit.unity | 117 +- .../1603_TerrainLit_BaseMap.unity | 207 ++- 7 files changed, 801 insertions(+), 2108 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity index c6a36caaf33..dd9d966835b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal.unity @@ -121,8 +121,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -264,7 +262,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -279,7 +277,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -291,7 +289,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -304,9 +301,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -324,8 +318,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -635,7 +629,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -650,7 +644,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -662,7 +656,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -675,9 +668,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -695,8 +685,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -915,7 +905,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1172,7 +1161,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -1246,9 +1234,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -1290,7 +1276,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -1367,7 +1352,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1453,7 +1437,6 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 - m_DataFormat: 1 --- !u!23 &177209792 MeshRenderer: m_ObjectHideFlags: 0 @@ -1469,7 +1452,6 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1672,7 +1654,6 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 - m_DataFormat: 1 --- !u!23 &298191412 MeshRenderer: m_ObjectHideFlags: 0 @@ -1688,7 +1669,6 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1768,8 +1748,6 @@ MonoBehaviour: c_Value_Max: {r: 0, g: 0, b: 0, a: 0} t_Value: {fileID: 0} count: 0 - overideRenderQueue: 0 - renderQueue: 2000 is2D: 1 instanceParameters: - parameter: _ @@ -1851,8 +1829,6 @@ MonoBehaviour: prefabObject: {fileID: 2300000, guid: 6b00bf6acfbd6e94b8c26f6e1e69a09e, type: 3} material: {fileID: 2100000, guid: 239283cad6ebcc8438f73793832d5438, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -2040,7 +2016,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -2055,7 +2031,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -2067,7 +2043,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2080,9 +2055,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2100,8 +2072,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2320,7 +2292,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2414,8 +2385,6 @@ MonoBehaviour: c_Value_Max: {r: 0, g: 0, b: 0, a: 0} t_Value: {fileID: 0} count: 0 - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -2560,11 +2529,6 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 640 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!114 &749245064 stripped @@ -2706,7 +2670,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -2780,9 +2743,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -2823,7 +2784,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -2886,8 +2846,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 239283cad6ebcc8438f73793832d5438, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -3075,7 +3033,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -3090,7 +3048,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -3102,7 +3060,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -3115,9 +3072,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3135,8 +3089,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -3534,7 +3488,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -3608,9 +3561,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -3651,7 +3602,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -3995,7 +3945,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -4069,9 +4018,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -4112,7 +4059,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4280,7 +4226,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -4295,7 +4241,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -4307,7 +4253,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4320,9 +4265,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4340,8 +4282,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4651,7 +4593,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -4666,7 +4608,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -4678,7 +4620,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4691,9 +4632,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4711,8 +4649,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4931,7 +4869,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5092,7 +5029,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -5166,9 +5102,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -5209,7 +5143,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5366,7 +5299,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -5440,9 +5372,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -5484,7 +5414,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5641,7 +5570,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -5715,9 +5643,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -5758,7 +5684,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5865,7 +5790,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5979,7 +5903,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6161,7 +6084,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -6176,7 +6099,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -6188,7 +6111,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6201,9 +6123,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6221,8 +6140,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6513,7 +6432,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6684,7 +6602,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -6758,9 +6675,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -6802,7 +6717,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -6959,7 +6873,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -7033,9 +6946,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -7077,7 +6988,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7159,7 +7069,6 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 - m_DataFormat: 1 --- !u!23 &1579759340 MeshRenderer: m_ObjectHideFlags: 0 @@ -7175,7 +7084,6 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7297,7 +7205,6 @@ LightProbeProxyVolume: m_ProbePositionMode: 0 m_RefreshMode: 0 m_QualityMode: 1 - m_DataFormat: 1 --- !u!23 &1602952835 MeshRenderer: m_ObjectHideFlags: 0 @@ -7313,7 +7220,6 @@ MeshRenderer: m_LightProbeUsage: 2 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7485,7 +7391,7 @@ MonoBehaviour: m_EditorAdvancedModeEnabled: 0 m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 + m_Version: 0 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 0 @@ -7500,7 +7406,7 @@ MonoBehaviour: m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 + m_CSVersion: 0 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 @@ -7512,7 +7418,6 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolution: 512 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -7525,9 +7430,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -7545,8 +7447,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -7748,7 +7650,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -7794,9 +7696,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -7829,7 +7728,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7846,9 +7744,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1677600969 Light: m_ObjectHideFlags: 0 @@ -7908,7 +7803,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 5, w: 5.625613} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1677600970 @@ -7995,7 +7889,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8223,7 +8116,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatCoverage: 1 @@ -8297,9 +8189,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -8340,7 +8230,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8431,8 +8320,6 @@ MonoBehaviour: c_Value_Max: {r: 0, g: 0, b: 0, a: 0} t_Value: {fileID: 0} count: 0 - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _BentNormalMap @@ -8529,7 +8416,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8610,7 +8496,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity index 440666ad01b..13170debefa 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius.unity @@ -23,7 +23,7 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 0 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} @@ -35,15 +35,15 @@ RenderSettings: m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 + m_ReflectionIntensity: 0 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 12 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,7 +62,6 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,16 +76,10 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -94,12 +87,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 5e6f0a379985d724cb257cbc1bdab81f, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +109,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -237,15 +225,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -281,9 +265,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3e-45 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -302,7 +283,6 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 - - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1.6393442 - _Ior: 1 @@ -331,12 +311,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -348,20 +324,16 @@ Material: - _ThicknessMultiplier: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - - _UseEmissiveIntensity: 0 - _ZTestDepthEqualForOpaque: 4 - _ZTestGBuffer: 3 - _ZTestMode: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -369,7 +341,6 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -379,8 +350,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &22486425 GameObject: m_ObjectHideFlags: 0 @@ -450,8 +419,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -463,7 +430,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -476,7 +442,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &22486429 MonoBehaviour: m_ObjectHideFlags: 0 @@ -491,10 +456,9 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - targetCamera: {fileID: 0} - forceTargetDimensions: {x: 200, y: 150} - overrideTestSettings: 0 + camera: {fileID: 189121543} textMesh: {fileID: 22486427} + pixelPerfect: 0 --- !u!1001 &189121542 PrefabInstance: m_ObjectHideFlags: 0 @@ -534,6 +498,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: far clip plane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -546,11 +515,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: far clip plane - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: near clip plane @@ -561,13 +525,14 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0.0005 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} +--- !u!20 &189121543 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + m_PrefabInstance: {fileID: 189121542} + m_PrefabAsset: {fileID: 0} --- !u!114 &189121544 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -591,6 +556,7 @@ GameObject: - component: {fileID: 206350329} - component: {fileID: 206350332} - component: {fileID: 206350331} + - component: {fileID: 206350330} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -612,7 +578,7 @@ Transform: m_Father: {fileID: 1270417363} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &206350331 +--- !u!114 &206350330 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -621,110 +587,86 @@ MonoBehaviour: m_GameObject: {fileID: 206350328} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 0.015 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 100 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 0 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 32 - m_MinFilterSize: 1 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.5 + viewBiasMax: 10 + viewBiasScale: 1 + normalBiasMin: 0.2 + normalBiasMax: 4 + normalBiasScale: 1 + sampleBiasScale: 1 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &206350331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206350328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 + m_Version: 2 + directionalIntensity: 3.1415927 + punctualIntensity: 0.015 + areaIntensity: 200 + enableSpotReflector: 0 + m_InnerSpotPercent: 100 + lightDimmer: 1 + volumetricDimmer: 1 + lightUnit: 0 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + spotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 1 + applyRangeAttenuation: 1 useOldInspector: 0 - useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 0.015 + displayAreaLightEmissiveMesh: 0 + lightLayers: 1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 32 --- !u!108 &206350332 Light: m_ObjectHideFlags: 0 @@ -733,14 +675,12 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 206350328} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 8 m_Type: 0 - m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 - m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -750,24 +690,6 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -775,16 +697,12 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!21 &312606449 @@ -888,15 +806,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -932,9 +846,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 0 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableMotionVectorForVertexAnimation: 0 @@ -952,7 +863,6 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 - - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1 - _LinkDetailsWithBase: 1 @@ -974,12 +884,8 @@ Material: - _SmoothnessRemapMin: 0 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -989,19 +895,14 @@ Material: - _Thickness: 1 - _ThicknessMultiplier: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - - _UseEmissiveIntensity: 0 - - _ZTestDepthEqualForOpaque: 4 - _ZTestMode: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -1009,7 +910,6 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} @@ -1018,8 +918,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &340485232 GameObject: m_ObjectHideFlags: 0 @@ -1089,8 +987,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1102,7 +998,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1115,7 +1010,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &340485236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1130,10 +1024,9 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - targetCamera: {fileID: 0} - forceTargetDimensions: {x: 200, y: 150} - overrideTestSettings: 0 + camera: {fileID: 189121543} textMesh: {fileID: 340485234} + pixelPerfect: 0 --- !u!1 &459634894 GameObject: m_ObjectHideFlags: 0 @@ -1145,6 +1038,7 @@ GameObject: - component: {fileID: 459634895} - component: {fileID: 459634898} - component: {fileID: 459634897} + - component: {fileID: 459634896} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1166,7 +1060,7 @@ Transform: m_Father: {fileID: 970005766} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &459634897 +--- !u!114 &459634896 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1175,110 +1069,86 @@ MonoBehaviour: m_GameObject: {fileID: 459634894} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 0.015 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 100 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 0 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 32 - m_MinFilterSize: 1 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.5 + viewBiasMax: 10 + viewBiasScale: 1 + normalBiasMin: 0.2 + normalBiasMax: 4 + normalBiasScale: 1 + sampleBiasScale: 1 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &459634897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459634894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 + m_Version: 2 + directionalIntensity: 3.1415927 + punctualIntensity: 0.015 + areaIntensity: 200 + enableSpotReflector: 0 + m_InnerSpotPercent: 100 + lightDimmer: 1 + volumetricDimmer: 1 + lightUnit: 0 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + spotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 1 + applyRangeAttenuation: 1 useOldInspector: 0 - useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 0.015 + displayAreaLightEmissiveMesh: 0 + lightLayers: 1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 32 --- !u!108 &459634898 Light: m_ObjectHideFlags: 0 @@ -1287,14 +1157,12 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 459634894} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 8 m_Type: 0 - m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 - m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1304,24 +1172,6 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1329,16 +1179,12 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &489376175 @@ -1352,6 +1198,7 @@ GameObject: - component: {fileID: 489376176} - component: {fileID: 489376179} - component: {fileID: 489376178} + - component: {fileID: 489376177} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1373,7 +1220,7 @@ Transform: m_Father: {fileID: 2138293276} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &489376178 +--- !u!114 &489376177 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1382,110 +1229,86 @@ MonoBehaviour: m_GameObject: {fileID: 489376175} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 0.015 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 100 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 0 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 32 - m_MinFilterSize: 1 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.5 + viewBiasMax: 10 + viewBiasScale: 1 + normalBiasMin: 0.2 + normalBiasMax: 4 + normalBiasScale: 1 + sampleBiasScale: 1 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &489376178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 489376175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 + m_Version: 2 + directionalIntensity: 3.1415927 + punctualIntensity: 0.015 + areaIntensity: 200 + enableSpotReflector: 0 + m_InnerSpotPercent: 100 + lightDimmer: 1 + volumetricDimmer: 1 + lightUnit: 0 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + spotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 1 + applyRangeAttenuation: 1 useOldInspector: 0 - useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 0.015 + displayAreaLightEmissiveMesh: 0 + lightLayers: 1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 32 --- !u!108 &489376179 Light: m_ObjectHideFlags: 0 @@ -1494,14 +1317,12 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 489376175} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 8 m_Type: 0 - m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 - m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1511,24 +1332,6 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1536,16 +1339,12 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &839916369 @@ -1559,6 +1358,7 @@ GameObject: - component: {fileID: 839916370} - component: {fileID: 839916373} - component: {fileID: 839916372} + - component: {fileID: 839916371} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -1580,7 +1380,7 @@ Transform: m_Father: {fileID: 1938649642} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &839916372 +--- !u!114 &839916371 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1589,110 +1389,86 @@ MonoBehaviour: m_GameObject: {fileID: 839916369} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 0.015 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 100 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 0 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 32 - m_MinFilterSize: 1 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.5 + viewBiasMax: 10 + viewBiasScale: 1 + normalBiasMin: 0.2 + normalBiasMax: 4 + normalBiasScale: 1 + sampleBiasScale: 1 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &839916372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839916369} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 + m_Version: 2 + directionalIntensity: 3.1415927 + punctualIntensity: 0.015 + areaIntensity: 200 + enableSpotReflector: 0 + m_InnerSpotPercent: 100 + lightDimmer: 1 + volumetricDimmer: 1 + lightUnit: 0 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + spotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 1 + applyRangeAttenuation: 1 useOldInspector: 0 - useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 0.015 + displayAreaLightEmissiveMesh: 0 + lightLayers: 1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 32 --- !u!108 &839916373 Light: m_ObjectHideFlags: 0 @@ -1701,14 +1477,12 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 839916369} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 8 m_Type: 0 - m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 - m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1718,24 +1492,6 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1743,16 +1499,12 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &842796397 @@ -1824,8 +1576,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1837,7 +1587,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1850,7 +1599,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &842796401 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1865,10 +1613,9 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - targetCamera: {fileID: 0} - forceTargetDimensions: {x: 200, y: 150} - overrideTestSettings: 0 + camera: {fileID: 189121543} textMesh: {fileID: 842796399} + pixelPerfect: 0 --- !u!1 &970005765 GameObject: m_ObjectHideFlags: 0 @@ -1972,8 +1719,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1985,7 +1730,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1998,7 +1742,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1095913860 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2013,10 +1756,9 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - targetCamera: {fileID: 0} - forceTargetDimensions: {x: 200, y: 150} - overrideTestSettings: 0 + camera: {fileID: 189121543} textMesh: {fileID: 1095913858} + pixelPerfect: 0 --- !u!1001 &1162708794 PrefabInstance: m_ObjectHideFlags: 0 @@ -2024,14 +1766,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 970005766} m_Modifications: - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2080,10 +1814,18 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 1421256617} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &1162708795 stripped @@ -2099,14 +1841,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1938649642} m_Modifications: - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2155,10 +1889,18 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 15578830} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &1211941502 stripped @@ -2208,10 +1950,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2022319265} m_Modifications: - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2260,6 +1998,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 3f7d1f3b5c774bb40bed9ce56cb8cc02, type: 2} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: @@ -2326,8 +2068,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2339,7 +2079,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2352,7 +2091,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1371615027 MeshFilter: m_ObjectHideFlags: 0 @@ -2375,8 +2113,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2388,7 +2124,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2401,7 +2136,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1374876467 GameObject: m_ObjectHideFlags: 0 @@ -2441,14 +2175,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1270417363} m_Modifications: - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Quad - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2493,18 +2219,26 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90.00001 - objectReference: {fileID: 0} - target: {fileID: 2300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: d841572a05d09344a8097c1a2e6b0369, type: 2} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Quad + objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} + - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90.00001 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &1419573399 stripped @@ -2614,15 +2348,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -2658,9 +2388,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3e-45 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableMotionVectorForVertexAnimation: 0 @@ -2678,7 +2405,6 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 - - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1 - _LinkDetailsWithBase: 1 @@ -2700,12 +2426,8 @@ Material: - _SmoothnessRemapMin: 0 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -2715,19 +2437,14 @@ Material: - _Thickness: 1 - _ThicknessMultiplier: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - - _UseEmissiveIntensity: 0 - - _ZTestDepthEqualForOpaque: 4 - _ZTestMode: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -2735,7 +2452,6 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} @@ -2744,8 +2460,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1630635259 GameObject: m_ObjectHideFlags: 0 @@ -2815,8 +2529,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2828,7 +2540,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2841,7 +2552,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1630635263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2856,10 +2566,9 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - targetCamera: {fileID: 0} - forceTargetDimensions: {x: 200, y: 150} - overrideTestSettings: 0 + camera: {fileID: 189121543} textMesh: {fileID: 1630635261} + pixelPerfect: 0 --- !u!23 &1762557575 MeshRenderer: m_ObjectHideFlags: 0 @@ -2874,8 +2583,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2887,7 +2594,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2900,7 +2606,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1763654727 MeshFilter: m_ObjectHideFlags: 0 @@ -3042,15 +2747,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 1 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 1 @@ -3086,9 +2787,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 0 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableMotionVectorForVertexAnimation: 0 @@ -3106,7 +2804,6 @@ Material: - _HeightTessAmplitude: 2 - _HeightTessCenter: 0.5 - _IOR: 1 - - _IncludeIndirectLighting: 1 - _InitialBend: 1 - _InvTilingScale: 1 - _LinkDetailsWithBase: 1 @@ -3128,12 +2825,8 @@ Material: - _SmoothnessRemapMin: 0 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 2 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -3143,19 +2836,14 @@ Material: - _Thickness: 1 - _ThicknessMultiplier: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - - _UseEmissiveIntensity: 0 - - _ZTestDepthEqualForOpaque: 4 - _ZTestMode: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -3163,7 +2851,6 @@ Material: - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} @@ -3172,8 +2859,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1938649641 GameObject: m_ObjectHideFlags: 0 @@ -3281,8 +2966,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3294,7 +2977,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3307,7 +2989,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1982433801 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3322,10 +3003,9 @@ MonoBehaviour: m_EditorClassIdentifier: pixelSize: 8 testSettings: {fileID: 189121544} - targetCamera: {fileID: 0} - forceTargetDimensions: {x: 200, y: 150} - overrideTestSettings: 0 + camera: {fileID: 189121543} textMesh: {fileID: 1982433799} + pixelPerfect: 0 --- !u!1001 &2022025515 PrefabInstance: m_ObjectHideFlags: 0 @@ -3333,14 +3013,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2138293276} m_Modifications: - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3389,10 +3061,18 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 1926466934} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &2022025516 stripped @@ -3450,8 +3130,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3463,7 +3141,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3476,7 +3153,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2025743489 MeshFilter: m_ObjectHideFlags: 0 @@ -3492,14 +3168,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1270417363} m_Modifications: - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_Name - value: Grid - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3548,10 +3216,18 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 312606449} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_Name + value: Grid + objectReference: {fileID: 0} - target: {fileID: 3300000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 4300000, guid: 623687a12a1939644907378f2656f176, type: 3} + - target: {fileID: 100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d03de02188b88428c03d8dca44f18e, type: 3} --- !u!4 &2048782979 stripped @@ -3571,6 +3247,7 @@ GameObject: - component: {fileID: 2070758266} - component: {fileID: 2070758269} - component: {fileID: 2070758268} + - component: {fileID: 2070758267} m_Layer: 0 m_Name: Spot Light m_TagString: Untagged @@ -3592,7 +3269,7 @@ Transform: m_Father: {fileID: 2022319265} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &2070758268 +--- !u!114 &2070758267 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3601,110 +3278,86 @@ MonoBehaviour: m_GameObject: {fileID: 2070758265} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 0.015 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 100 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 0 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 32 - m_MinFilterSize: 1 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.5 + viewBiasMax: 10 + viewBiasScale: 1 + normalBiasMin: 0.2 + normalBiasMax: 4 + normalBiasScale: 1 + sampleBiasScale: 1 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &2070758268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070758265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 + m_Version: 2 + directionalIntensity: 3.1415927 + punctualIntensity: 0.015 + areaIntensity: 200 + enableSpotReflector: 0 + m_InnerSpotPercent: 100 + lightDimmer: 1 + volumetricDimmer: 1 + lightUnit: 0 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + spotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 1 + applyRangeAttenuation: 1 useOldInspector: 0 - useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 0.015 + displayAreaLightEmissiveMesh: 0 + lightLayers: 1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 32 --- !u!108 &2070758269 Light: m_ObjectHideFlags: 0 @@ -3713,14 +3366,12 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2070758265} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 8 m_Type: 0 - m_Shape: 0 m_Color: {r: 0.698, g: 0.698, b: 0.698, a: 1} m_Intensity: 0.001193662 m_Range: 0.02 m_SpotAngle: 90 - m_InnerSpotAngle: 71.41338 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -3730,24 +3381,6 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -3755,16 +3388,12 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2138293275 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity index 7c4ef45d045..5ab787346c6 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: ba25e9e6124ce264d9963cc1ee323919, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -171,7 +168,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -252,7 +248,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -333,7 +328,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -400,7 +394,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -551,11 +544,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -565,7 +553,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -584,9 +571,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -683,7 +667,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -772,7 +755,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -889,7 +871,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &446518737 @@ -918,14 +899,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 6 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 4.2 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -937,11 +915,12 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 + m_LightTypeExtent: 0 + m_SpotLightShape: 0 m_ShapeWidth: 0.5 m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -952,21 +931,7 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -974,9 +939,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -991,15 +957,10 @@ MonoBehaviour: m_Override: 0 m_UseOverride: 1 m_Level: 0 - m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 - m_SlopeBias: 0.5 + m_ConstantBias: 0.15 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1016,9 +977,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &511310414 GameObject: m_ObjectHideFlags: 0 @@ -1089,7 +1047,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1169,6 +1126,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 8afdd1f2c5ad659409e78c9c51a75f4b, type: 2} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &884502727 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1247,7 +1206,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1314,7 +1272,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1369,10 +1326,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 10 @@ -1442,6 +1395,15 @@ PrefabInstance: propertyPath: orthographic size value: 1.8 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrLayout + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version @@ -1452,16 +1414,6 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: xrLayout - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1019925507 stripped @@ -1503,7 +1455,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1584,7 +1535,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1665,7 +1615,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1756,9 +1705,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1431739855 MeshRenderer: @@ -1775,7 +1724,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1856,7 +1804,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1970,9 +1917,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1870647568 MeshRenderer: @@ -1989,7 +1936,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2126,11 +2072,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2140,7 +2081,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2159,9 +2099,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity index c7d872a1d63..2db502b157a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env_Convolution.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 9c1163981ea3fec4bbbafed3ce93fe5b, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -171,7 +168,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -478,7 +474,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &92922459 GameObject: m_ObjectHideFlags: 0 @@ -526,7 +521,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -840,7 +834,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &104321023 GameObject: m_ObjectHideFlags: 0 @@ -922,7 +915,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1003,7 +995,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1084,7 +1075,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1165,7 +1155,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1331,7 +1320,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1408,7 +1396,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -1451,7 +1438,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -1482,7 +1468,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &251996186 GameObject: m_ObjectHideFlags: 0 @@ -1530,7 +1515,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1611,7 +1595,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1692,7 +1675,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1858,7 +1840,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1935,7 +1916,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -1978,7 +1958,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -2009,7 +1988,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &423945086 GameObject: m_ObjectHideFlags: 0 @@ -2057,7 +2035,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2138,7 +2115,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2452,7 +2428,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &499153404 GameObject: m_ObjectHideFlags: 0 @@ -2500,7 +2475,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2567,8 +2541,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: a81a4bdd35eb7904e93a07c2aca9f7a7, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -2660,7 +2632,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2741,7 +2712,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2822,7 +2792,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2903,7 +2872,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2984,7 +2952,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3050,6 +3017,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 608548e6f54b0d8409c142f8abf2ca76, type: 2} m_StaticLightingSkyUniqueID: 2 + m_SkySettings: {fileID: 1823796277} + m_SkySettingsFromProfile: {fileID: 114374333047554170, guid: 608548e6f54b0d8409c142f8abf2ca76, + type: 2} --- !u!114 &596340773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3213,7 +3183,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3290,7 +3259,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -3333,7 +3301,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -3364,7 +3331,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &620696772 Material: serializedVersion: 6 @@ -3494,7 +3460,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3571,9 +3536,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3583,7 +3546,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -3613,7 +3575,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -3643,7 +3604,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1001 &645242448 PrefabInstance: m_ObjectHideFlags: 0 @@ -3651,10 +3611,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 6 @@ -3699,6 +3655,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 644 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: a93d04db38bac8a4cba18a4c389aa624, + type: 2} + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: field of view @@ -3719,27 +3695,6 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 644 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderPipelineAsset - value: - objectReference: {fileID: 11400000, guid: a93d04db38bac8a4cba18a4c389aa624, - type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &670096462 @@ -3789,7 +3744,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3952,7 +3906,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4029,9 +3982,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -4041,7 +3992,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -4071,7 +4021,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4101,7 +4050,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &708402781 GameObject: m_ObjectHideFlags: 0 @@ -4149,7 +4097,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4315,7 +4262,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4392,7 +4338,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -4435,7 +4380,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4466,7 +4410,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &754056538 GameObject: m_ObjectHideFlags: 0 @@ -4514,7 +4457,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4680,7 +4622,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4757,7 +4698,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -4800,7 +4740,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -4831,7 +4770,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &796401093 Material: serializedVersion: 6 @@ -5112,7 +5050,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &808018656 GameObject: m_ObjectHideFlags: 0 @@ -5160,7 +5097,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5241,7 +5177,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5404,7 +5339,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5481,9 +5415,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5493,7 +5425,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -5523,7 +5454,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5553,7 +5483,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &876034184 GameObject: m_ObjectHideFlags: 0 @@ -5601,7 +5530,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5764,7 +5692,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5841,9 +5768,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5853,7 +5778,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -5883,7 +5807,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -5913,7 +5836,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &963158397 Material: serializedVersion: 6 @@ -6046,7 +5968,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -6123,7 +6044,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -6166,7 +6086,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -6197,7 +6116,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &974217518 GameObject: m_ObjectHideFlags: 0 @@ -6245,7 +6163,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6559,7 +6476,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &978915923 Material: serializedVersion: 6 @@ -6833,7 +6749,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &982114948 GameObject: m_ObjectHideFlags: 0 @@ -6881,7 +6796,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7047,7 +6961,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7124,7 +7037,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -7167,7 +7079,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7198,7 +7109,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1022104772 GameObject: m_ObjectHideFlags: 0 @@ -7246,7 +7156,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7409,7 +7318,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7486,9 +7394,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -7498,7 +7404,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -7528,7 +7433,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7558,7 +7462,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1087665784 Material: serializedVersion: 6 @@ -7691,7 +7594,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7768,7 +7670,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -7811,7 +7712,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -7842,7 +7742,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1128082830 GameObject: m_ObjectHideFlags: 0 @@ -7890,7 +7789,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8056,7 +7954,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8133,7 +8030,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -8176,7 +8072,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8207,7 +8102,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1176707769 GameObject: m_ObjectHideFlags: 0 @@ -8255,7 +8149,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8421,7 +8314,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8498,7 +8390,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -8541,7 +8432,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -8572,7 +8462,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1249010074 GameObject: m_ObjectHideFlags: 0 @@ -8631,8 +8520,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 9ba3ffc98c51ad942a223546952cbd7c, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _Smoothness @@ -8699,7 +8586,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8862,7 +8748,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8939,9 +8824,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -8951,7 +8834,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -8981,7 +8863,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9011,7 +8892,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1352399838 Material: serializedVersion: 6 @@ -9144,7 +9024,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9221,7 +9100,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -9264,7 +9142,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9295,7 +9172,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1379413269 GameObject: m_ObjectHideFlags: 0 @@ -9343,7 +9219,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9509,7 +9384,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9586,7 +9460,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -9629,7 +9502,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9660,7 +9532,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1414961176 Material: serializedVersion: 6 @@ -9790,7 +9661,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9867,9 +9737,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -9879,7 +9747,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -9909,7 +9776,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -9939,7 +9805,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1486517096 Material: serializedVersion: 6 @@ -10072,7 +9937,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10149,7 +10013,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -10192,7 +10055,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -10223,7 +10085,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1487814013 GameObject: m_ObjectHideFlags: 0 @@ -10271,7 +10132,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10434,7 +10294,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10511,9 +10370,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -10523,7 +10380,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -10553,7 +10409,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -10583,7 +10438,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1556361012 GameObject: m_ObjectHideFlags: 0 @@ -10617,8 +10471,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 6e49b7ef330d4884a8d632d30fd7f3fd, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -10710,7 +10562,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10791,7 +10642,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10872,7 +10722,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10953,7 +10802,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10987,6 +10835,82 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797948919} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1823796277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + sunSize: + m_OverrideState: 0 + m_Value: 0.04 + min: 0 + max: 1 + sunSizeConvergence: + m_OverrideState: 0 + m_Value: 5 + min: 1 + max: 10 + atmosphereThickness: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 5 + skyTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + groundColor: + m_OverrideState: 0 + m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + enableSunDisk: + m_OverrideState: 0 + m_Value: 1 --- !u!1 &1832517677 GameObject: m_ObjectHideFlags: 0 @@ -11034,7 +10958,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11101,8 +11024,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 9ba3ffc98c51ad942a223546952cbd7c, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _Smoothness @@ -11279,7 +11200,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11356,7 +11276,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -11399,7 +11318,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -11430,7 +11348,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1913943649 GameObject: m_ObjectHideFlags: 0 @@ -11478,7 +11395,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11644,7 +11560,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11721,7 +11636,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -11764,7 +11678,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -11795,7 +11708,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1928742637 Material: serializedVersion: 6 @@ -11925,7 +11837,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -12002,9 +11913,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -12014,7 +11923,6 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -12044,7 +11952,6 @@ Material: - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -12074,7 +11981,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1928978657 GameObject: m_ObjectHideFlags: 0 @@ -12122,7 +12028,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12203,7 +12108,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12284,7 +12188,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12450,7 +12353,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -12527,7 +12429,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -12570,7 +12471,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -12601,7 +12501,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &2046158920 GameObject: m_ObjectHideFlags: 0 @@ -12649,7 +12548,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12815,7 +12713,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -12892,7 +12789,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -12935,7 +12831,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -12966,7 +12861,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &2085978366 GameObject: m_ObjectHideFlags: 0 @@ -13014,7 +12908,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13180,7 +13073,6 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -13257,7 +13149,6 @@ Material: - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 @@ -13300,7 +13191,6 @@ Material: - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 @@ -13331,7 +13221,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &2136871501 GameObject: m_ObjectHideFlags: 0 @@ -13379,7 +13268,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13460,7 +13348,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity index d459144d04a..cbf972af0cf 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1353_Fabric_Env_NoConvolution.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1} + m_IndirectSpecularColor: {r: 0.03764126, g: 0.047973316, b: 0.061335944, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 12 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,7 +62,6 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,16 +76,10 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -94,12 +87,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 4aad07370feecf44988845b33b651928, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +110,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -375,7 +364,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &57653119 GameObject: m_ObjectHideFlags: 0 @@ -422,8 +410,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -435,7 +421,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -448,7 +433,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &57653122 MeshFilter: m_ObjectHideFlags: 0 @@ -503,8 +487,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -516,7 +498,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -529,7 +510,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &68786178 MeshFilter: m_ObjectHideFlags: 0 @@ -584,8 +564,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -597,7 +575,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -610,7 +587,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &92922462 MeshFilter: m_ObjectHideFlags: 0 @@ -782,9 +758,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -860,10 +833,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -876,14 +846,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -900,20 +864,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -935,7 +895,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &129937894 Material: serializedVersion: 6 @@ -1203,7 +1162,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &132869821 Material: serializedVersion: 6 @@ -1334,9 +1292,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1412,10 +1367,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -1428,14 +1380,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -1452,20 +1398,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -1487,7 +1429,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &144982759 GameObject: m_ObjectHideFlags: 0 @@ -1534,8 +1475,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1547,7 +1486,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1560,7 +1498,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &144982762 MeshFilter: m_ObjectHideFlags: 0 @@ -1615,8 +1552,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1628,7 +1563,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1641,7 +1575,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &186810074 MeshFilter: m_ObjectHideFlags: 0 @@ -1696,8 +1629,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1709,7 +1640,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1722,7 +1652,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &214084041 MeshFilter: m_ObjectHideFlags: 0 @@ -1861,9 +1790,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -1939,10 +1865,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -1955,14 +1878,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -1979,20 +1896,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -2014,7 +1927,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &308686682 GameObject: m_ObjectHideFlags: 0 @@ -2061,8 +1973,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2074,7 +1984,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2087,7 +1996,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &308686685 MeshFilter: m_ObjectHideFlags: 0 @@ -2142,8 +2050,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2155,7 +2061,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2168,7 +2073,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &333051541 MeshFilter: m_ObjectHideFlags: 0 @@ -2307,9 +2211,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -2385,10 +2286,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -2401,14 +2299,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -2425,20 +2317,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -2460,7 +2348,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &420810804 GameObject: m_ObjectHideFlags: 0 @@ -2507,8 +2394,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2520,7 +2405,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2533,7 +2417,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &420810807 MeshFilter: m_ObjectHideFlags: 0 @@ -2588,8 +2471,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2601,7 +2482,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2614,7 +2494,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &428816245 MeshFilter: m_ObjectHideFlags: 0 @@ -2669,8 +2548,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2682,7 +2559,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2695,7 +2571,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &469560312 MeshFilter: m_ObjectHideFlags: 0 @@ -2730,6 +2605,7 @@ MonoBehaviour: m_GameObject: {fileID: 506841454} m_Enabled: 1 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 66d6c688291ac8b48adc878e4fc4d29d, type: 3} m_Name: m_EditorClassIdentifier: @@ -2737,8 +2613,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: a81a4bdd35eb7904e93a07c2aca9f7a7, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -2913,9 +2787,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -2991,10 +2862,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -3007,14 +2875,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -3031,20 +2893,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -3066,7 +2924,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &587671381 GameObject: m_ObjectHideFlags: 0 @@ -3113,8 +2970,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3126,7 +2981,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3139,7 +2993,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &587671384 MeshFilter: m_ObjectHideFlags: 0 @@ -3175,11 +3028,12 @@ MonoBehaviour: m_GameObject: {fileID: 596340771} m_Enabled: 1 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 441482e8936e35048a1dffac814e3ef8, type: 3} m_Name: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 608548e6f54b0d8409c142f8abf2ca76, type: 2} - m_StaticLightingSkyUniqueID: 2 + m_BakingSkyUniqueID: 2 --- !u!114 &596340773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3189,6 +3043,7 @@ MonoBehaviour: m_GameObject: {fileID: 596340771} m_Enabled: 1 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: @@ -3257,8 +3112,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3270,7 +3123,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3283,7 +3135,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &607465902 MeshFilter: m_ObjectHideFlags: 0 @@ -3412,16 +3263,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3433,7 +3279,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -3457,9 +3302,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -3498,9 +3340,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3510,17 +3350,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -3535,32 +3368,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -3570,7 +3394,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1001 &645242448 PrefabInstance: m_ObjectHideFlags: 0 @@ -3631,11 +3454,6 @@ PrefabInstance: propertyPath: field of view value: 40 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: clearColorMode - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: ImageComparisonSettings.TargetHeight @@ -3646,9 +3464,9 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 644 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible + propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] @@ -3773,16 +3591,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -3794,7 +3607,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -3818,9 +3630,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -3859,9 +3668,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -3871,17 +3678,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -3896,32 +3696,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -3931,7 +3722,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &754056538 GameObject: m_ObjectHideFlags: 0 @@ -3978,8 +3768,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3991,7 +3779,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4004,7 +3791,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &754056541 MeshFilter: m_ObjectHideFlags: 0 @@ -4059,8 +3845,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4072,7 +3856,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4085,7 +3868,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &771171016 MeshFilter: m_ObjectHideFlags: 0 @@ -4140,8 +3922,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4153,7 +3933,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4166,7 +3945,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &788913698 MeshFilter: m_ObjectHideFlags: 0 @@ -4305,9 +4083,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4383,10 +4158,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -4399,14 +4171,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -4423,20 +4189,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -4458,7 +4220,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &811212999 GameObject: m_ObjectHideFlags: 0 @@ -4505,8 +4266,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4518,7 +4277,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4531,7 +4289,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &811213002 MeshFilter: m_ObjectHideFlags: 0 @@ -4670,9 +4427,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4748,10 +4502,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -4764,14 +4515,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -4788,20 +4533,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -4823,7 +4564,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &843841048 Material: serializedVersion: 6 @@ -4944,16 +4684,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -4965,7 +4700,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -4989,9 +4723,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -5030,9 +4761,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5042,17 +4771,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5067,32 +4789,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -5102,7 +4815,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &873433697 GameObject: m_ObjectHideFlags: 0 @@ -5149,8 +4861,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5162,7 +4872,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -5175,7 +4884,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &873433700 MeshFilter: m_ObjectHideFlags: 0 @@ -5314,9 +5022,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5392,10 +5097,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -5408,14 +5110,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5432,20 +5128,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -5467,7 +5159,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &942495973 Material: serializedVersion: 6 @@ -5598,9 +5289,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5676,10 +5364,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -5692,14 +5377,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5716,20 +5395,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -5751,7 +5426,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &954731873 Material: serializedVersion: 6 @@ -5872,16 +5546,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -5893,7 +5562,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -5917,9 +5585,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -5958,9 +5623,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -5970,17 +5633,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -5995,32 +5651,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -6030,7 +5677,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &961669313 Material: serializedVersion: 6 @@ -6161,9 +5807,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -6239,10 +5882,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -6255,14 +5895,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -6279,20 +5913,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -6314,7 +5944,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &974217518 GameObject: m_ObjectHideFlags: 0 @@ -6361,8 +5990,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6374,7 +6001,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -6387,7 +6013,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &974217521 MeshFilter: m_ObjectHideFlags: 0 @@ -6647,7 +6272,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &980711210 Material: serializedVersion: 6 @@ -6778,9 +6402,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -6856,10 +6477,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -6872,14 +6490,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -6896,20 +6508,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -6931,7 +6539,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &982114948 GameObject: m_ObjectHideFlags: 0 @@ -6978,8 +6585,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6991,7 +6596,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -7004,7 +6608,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &982114951 MeshFilter: m_ObjectHideFlags: 0 @@ -7133,16 +6736,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7154,7 +6752,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -7178,9 +6775,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -7219,9 +6813,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -7231,17 +6823,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -7256,32 +6841,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -7291,7 +6867,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1063405362 GameObject: m_ObjectHideFlags: 0 @@ -7338,8 +6913,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7351,7 +6924,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -7364,7 +6936,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1063405365 MeshFilter: m_ObjectHideFlags: 0 @@ -7640,7 +7211,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1078716889 Material: serializedVersion: 6 @@ -7771,9 +7341,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -7849,10 +7416,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -7865,14 +7429,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -7889,20 +7447,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -7924,7 +7478,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1086171481 GameObject: m_ObjectHideFlags: 0 @@ -7971,8 +7524,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7984,7 +7535,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -7997,7 +7547,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1086171484 MeshFilter: m_ObjectHideFlags: 0 @@ -8136,9 +7685,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8214,10 +7760,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -8230,14 +7773,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -8254,20 +7791,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -8289,7 +7822,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1170716395 GameObject: m_ObjectHideFlags: 0 @@ -8336,8 +7868,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8349,7 +7879,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -8362,7 +7891,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1170716398 MeshFilter: m_ObjectHideFlags: 0 @@ -8417,8 +7945,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8430,7 +7956,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -8443,7 +7968,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1180738110 MeshFilter: m_ObjectHideFlags: 0 @@ -8572,16 +8096,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8593,7 +8112,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -8617,9 +8135,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -8658,9 +8173,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -8670,17 +8183,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -8695,32 +8201,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -8730,7 +8227,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1359437100 GameObject: m_ObjectHideFlags: 0 @@ -8777,8 +8273,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8790,7 +8284,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -8803,7 +8296,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1359437103 MeshFilter: m_ObjectHideFlags: 0 @@ -8932,16 +8424,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -8953,7 +8440,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -8977,9 +8463,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -9018,9 +8501,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -9030,17 +8511,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -9055,32 +8529,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -9090,7 +8555,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1474301112 GameObject: m_ObjectHideFlags: 0 @@ -9137,8 +8601,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9150,7 +8612,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9163,7 +8624,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1474301115 MeshFilter: m_ObjectHideFlags: 0 @@ -9302,9 +8762,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9380,10 +8837,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -9396,14 +8850,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -9420,20 +8868,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -9455,7 +8899,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1525732446 Material: serializedVersion: 6 @@ -9576,16 +9019,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -9597,7 +9035,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -9621,9 +9058,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -9662,9 +9096,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -9674,17 +9106,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -9699,32 +9124,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -9734,7 +9150,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1526868522 GameObject: m_ObjectHideFlags: 0 @@ -9781,8 +9196,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9794,7 +9207,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9807,7 +9219,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1526868525 MeshFilter: m_ObjectHideFlags: 0 @@ -9946,9 +9357,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10024,10 +9432,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -10040,14 +9445,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -10064,20 +9463,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -10099,7 +9494,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1556361012 GameObject: m_ObjectHideFlags: 0 @@ -10126,6 +9520,7 @@ MonoBehaviour: m_GameObject: {fileID: 1556361012} m_Enabled: 1 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 66d6c688291ac8b48adc878e4fc4d29d, type: 3} m_Name: m_EditorClassIdentifier: @@ -10133,8 +9528,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 6e49b7ef330d4884a8d632d30fd7f3fd, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _SmoothnessMax @@ -10225,8 +9618,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10238,7 +9629,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -10251,7 +9641,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1629361942 MeshFilter: m_ObjectHideFlags: 0 @@ -10390,9 +9779,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -10468,10 +9854,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -10484,14 +9867,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -10508,20 +9885,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -10543,7 +9916,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1710386578 GameObject: m_ObjectHideFlags: 0 @@ -10590,8 +9962,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10603,7 +9973,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -10616,7 +9985,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1710386581 MeshFilter: m_ObjectHideFlags: 0 @@ -10671,8 +10039,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10684,7 +10050,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -10697,7 +10062,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1748023057 MeshFilter: m_ObjectHideFlags: 0 @@ -10973,7 +10337,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1846684368 GameObject: m_ObjectHideFlags: 0 @@ -11000,6 +10363,7 @@ MonoBehaviour: m_GameObject: {fileID: 1846684368} m_Enabled: 1 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 66d6c688291ac8b48adc878e4fc4d29d, type: 3} m_Name: m_EditorClassIdentifier: @@ -11007,8 +10371,6 @@ MonoBehaviour: type: 3} material: {fileID: 2100000, guid: 9ba3ffc98c51ad942a223546952cbd7c, type: 2} commonParameters: [] - overideRenderQueue: 0 - renderQueue: 2000 is2D: 0 instanceParameters: - parameter: _Smoothness @@ -11183,9 +10545,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11261,10 +10620,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -11277,14 +10633,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -11301,20 +10651,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -11336,7 +10682,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!21 &1928742637 Material: serializedVersion: 6 @@ -11457,16 +10802,11 @@ Material: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - _AlbedoAffectEmissive: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -11478,7 +10818,6 @@ Material: - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 @@ -11502,9 +10841,6 @@ Material: - _DstBlend: 0 - _EditorExpendedAreas: 3.85e-43 - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 @@ -11543,9 +10879,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _RayTracing: 0 - _ReceivesSSR: 1 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 @@ -11555,17 +10889,10 @@ Material: - _SmoothnessRemapMin: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -11580,32 +10907,23 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -11615,7 +10933,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskThread: {r: 1, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1960425366 GameObject: m_ObjectHideFlags: 0 @@ -11662,8 +10979,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11675,7 +10990,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -11688,7 +11002,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1960425369 MeshFilter: m_ObjectHideFlags: 0 @@ -11964,7 +11277,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &2085978366 GameObject: m_ObjectHideFlags: 0 @@ -12011,8 +11323,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12024,7 +11334,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -12037,7 +11346,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2085978369 MeshFilter: m_ObjectHideFlags: 0 @@ -12176,9 +11484,6 @@ Material: - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -12254,10 +11559,7 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _PreRefractionPass: 0 - - _ReceivesSSR: 0 - - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _RequireSplitLighting: 0 - _SSRefractionProjectionModel: 0 - _ShiverDirectionality: 0.5 - _ShiverDrag: 0.2 @@ -12270,14 +11572,8 @@ Material: - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - _StencilWriteMaskMV: 128 - _Stiffness: 1 - _SubsurfaceMask: 1 @@ -12294,20 +11590,16 @@ Material: - _ThreadSmoothnessScale: 1 - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 - - _TransparentZWrite: 0 - _UVBase: 0 - _UVDetail: 0 - _UVEmissive: 0 - _UVThread: 0 - - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - _ZWrite: 1 - _useThreadMap: 0 m_Colors: @@ -12329,7 +11621,6 @@ Material: - _uvBaseST: {r: 1, g: 1, b: 0, a: 0} - _uvThreadMask: {r: 1, g: 0, b: 0, a: 0} - _uvThreadST: {r: 1, g: 1, b: 0, a: 0} - m_BuildTextureStacks: [] --- !u!1 &2136871501 GameObject: m_ObjectHideFlags: 0 @@ -12376,8 +11667,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12389,7 +11678,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -12402,7 +11690,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136871504 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity index d71da5b5d1c..22569806866 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit.unity @@ -120,8 +120,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -252,13 +250,109 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} +--- !u!114 &744631047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 200 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + hdriSky: + m_OverrideState: 0 + m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + enableBackplate: + m_OverrideState: 0 + m_Value: 0 + backplateType: + m_OverrideState: 0 + m_Value: 0 + groundLevel: + m_OverrideState: 0 + m_Value: 0 + scale: + m_OverrideState: 0 + m_Value: {x: 32, y: 32} + projectionDistance: + m_OverrideState: 0 + m_Value: 16 + min: 0.0000001 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 100 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 --- !u!1 &755370651 GameObject: m_ObjectHideFlags: 0 @@ -546,7 +640,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1736369240 @@ -575,7 +668,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -621,9 +714,7 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -656,7 +747,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -673,9 +763,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!33 &8798469937330876322 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity index d970fb1dcf4..e58d455fc45 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1603_TerrainLit_BaseMap.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,11 +96,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: daaf293807949624aaad0da0667be728, type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: 4fa5d3214e4bc7140a41fc7b55e90721, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -120,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -245,12 +241,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69284264410909 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -442,11 +438,6 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &822358699 @@ -486,7 +477,7 @@ Terrain: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 822358699} m_Enabled: 1 - serializedVersion: 6 + serializedVersion: 5 m_TerrainData: {fileID: 15600000, guid: 245a04c8ad46a5349bcbaad4da1da133, type: 2} m_TreeDistance: 2000 m_TreeBillboardDistance: 50 @@ -509,7 +500,6 @@ Terrain: m_ScaleInLightmap: 0.0512 m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} m_GroupingID: 0 - m_RenderingLayerMask: 1 m_AllowAutoConnect: 1 --- !u!4 &822358702 Transform: @@ -554,16 +544,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 2 m_Material: {fileID: 2100000, guid: 638b5db2a1568654e998f0152ad27948, type: 2} m_DrawDistance: 1000 m_FadeScale: 0.9 m_UVScale: {x: 1, y: 1} m_UVBias: {x: 0, y: 0} m_AffectsTransparency: 0 - m_Offset: {x: 0, y: 0, z: 4} + m_Offset: {x: 0, y: 0, z: 0.50000006} m_Size: {x: 16, y: 16, z: 8} m_FadeFactor: 1 + m_Version: 1 --- !u!4 &1119739687 Transform: m_ObjectHideFlags: 0 @@ -572,7 +562,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1119739685} m_LocalRotation: {x: 0.46766594, y: 0.32243472, z: -0.17777091, w: 0.8035683} - m_LocalPosition: {x: 47.02827, y: 8.091847, z: 19.99873} + m_LocalPosition: {x: 48.26, y: 5.06, z: 21.24} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -589,6 +579,7 @@ GameObject: - component: {fileID: 1736369240} - component: {fileID: 1736369239} - component: {fileID: 1736369242} + - component: {fileID: 1736369241} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -604,9 +595,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1736369238} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 9 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -655,7 +645,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1736369240 @@ -672,7 +661,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 26.558, y: -25.6, z: 0} ---- !u!114 &1736369242 +--- !u!114 &1736369241 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -681,107 +670,99 @@ MonoBehaviour: m_GameObject: {fileID: 1736369238} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 3.1415927 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 2 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 1 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.2 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + volumetricShadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.2 + viewBiasMax: 100 + viewBiasScale: 1 + normalBiasMin: 0.5 + normalBiasMax: 0.5 + normalBiasScale: 1 + sampleBiasScale: 0 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.15 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0 - 0 - 0 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 3 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 3 + shadowPrecision: 0 + shadowData: + format: 0 + data: 000000000000803f + shadowDatas: + - format: 0 + data: 000000000000803f +--- !u!114 &1736369242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736369238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 + m_Version: 4 + directionalIntensity: 3.1415927 + punctualIntensity: 600 + areaIntensity: 200 + enableSpotReflector: 0 + luxAtDistance: 1 + m_InnerSpotPercent: 0 + lightDimmer: 1 + m_VolumetricDimmer: 1 + lightUnit: 2 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + m_SpotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 1 + applyRangeAttenuation: 1 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 3.1415927 + displayAreaLightEmissiveMesh: 0 + areaLightCookie: {fileID: 0} + areaLightShadowCone: 120 + evsmExponent: 15 + evsmLightLeakBias: 0 + evsmVarianceBias: 0.00001 + evsmBlurPasses: 0 + lightLayers: 1 + shadowNearPlane: 0.2 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 16 + minFilterSize: 0.00001 + kernelSize: 5 + lightAngle: 1 + maxDepthBias: 0.001 From 0dd42d80431b53cdd869e369fab78ea5f4baf533 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 28 May 2020 18:17:19 +0200 Subject: [PATCH 07/53] Temp "texture not bound" error fix until bloom is implemented. --- .../Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs index 78b069f9bfe..c9a2fcbf883 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs @@ -270,6 +270,12 @@ public void Render( RenderGraph renderGraph, builder.SetRenderFunc( (UberPostPassData data, RenderGraphContext ctx) => { + // Temp until bloom is implemented. + ctx.cmd.SetComputeTextureParam(data.parameters.uberPostCS, data.parameters.uberPostKernel, HDShaderIDs._BloomTexture, TextureXR.GetBlackTexture()); + ctx.cmd.SetComputeTextureParam(data.parameters.uberPostCS, data.parameters.uberPostKernel, HDShaderIDs._BloomDirtTexture, Texture2D.blackTexture); + ctx.cmd.SetComputeVectorParam(data.parameters.uberPostCS, HDShaderIDs._BloomParams, Vector4.zero); + + DoUberPostProcess( data.parameters, ctx.resources.GetTexture(data.source), ctx.resources.GetTexture(data.destination), From 027a5c58e93cd9abcd240c0acea810332e97be0d Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Tue, 2 Jun 2020 11:25:34 +0200 Subject: [PATCH 08/53] Fixed an error when using a stale invalid renderer list handle. Reduced error message spam when encountering an execution error. --- .../Runtime/RenderGraph/RenderGraph.cs | 27 ++++++++++++++----- .../RenderGraphResourceRegistry.cs | 10 ++++--- .../PostProcessSystem.RenderGraph.cs | 2 +- .../HDRenderPipeline.RenderGraph.cs | 4 +-- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 6b9d231cb63..5025f9eba80 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -158,6 +158,7 @@ public void Reset(RenderGraphPass pass) RenderGraphLogger m_Logger = new RenderGraphLogger(); RenderGraphDefaultResources m_DefaultResources = new RenderGraphDefaultResources(); Dictionary m_DefaultProfilingSamplers = new Dictionary(); + bool m_ExecutionExceptionWasRaised; // Compiled Render Graph info. DynamicArray m_CompiledTextureInfos = new DynamicArray(); @@ -334,6 +335,8 @@ public ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) /// Render Graph execution parameters. public void Execute(ScriptableRenderContext renderContext, CommandBuffer cmd, in RenderGraphExecuteParams parameters) { + m_ExecutionExceptionWasRaised = false; + try { m_Logger.Initialize(); @@ -348,6 +351,7 @@ public void Execute(ScriptableRenderContext renderContext, CommandBuffer cmd, in } catch (Exception e) { + m_ExecutionExceptionWasRaised = true; Debug.LogError("Render Graph Execution error"); Debug.LogException(e); } @@ -373,7 +377,7 @@ private RenderGraph() void ClearCompiledGraph() { ClearRenderPasses(); - m_Resources.Clear(); + m_Resources.Clear(m_ExecutionExceptionWasRaised); m_DefaultResources.Clear(); m_RendererLists.Clear(); m_CompiledBufferInfos.Clear(); @@ -675,16 +679,25 @@ void ExecuteRenderGraph(ScriptableRenderContext renderContext, CommandBuffer cmd throw new InvalidOperationException(string.Format("RenderPass {0} was not provided with an execute function.", passInfo.pass.name)); } - using (new ProfilingScope(rgContext.cmd, passInfo.pass.customSampler)) + try { - LogRenderPassBegin(passInfo); - using (new RenderGraphLogIndent(m_Logger)) + using (new ProfilingScope(rgContext.cmd, passInfo.pass.customSampler)) { - PreRenderPassExecute(passInfo, ref rgContext); - passInfo.pass.Execute(rgContext); - PostRenderPassExecute(cmd, ref passInfo, ref rgContext); + LogRenderPassBegin(passInfo); + using (new RenderGraphLogIndent(m_Logger)) + { + PreRenderPassExecute(passInfo, ref rgContext); + passInfo.pass.Execute(rgContext); + PostRenderPassExecute(cmd, ref passInfo, ref rgContext); + } } } + catch (Exception e) + { + m_ExecutionExceptionWasRaised = true; + Debug.LogError($"Render Graph Execution error at pass {passInfo.pass.name} ({passIndex})"); + Debug.LogException(e); + } } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index b0ed28394a8..42de2059392 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -392,7 +392,7 @@ public RTHandle GetTexture(in TextureHandle handle) /// The Renderer List associated with the provided resource handle or an invalid renderer list if the handle is invalid. public RendererList GetRendererList(in RendererListHandle handle) { - if (!handle.IsValid()) + if (!handle.IsValid() || handle >= m_RendererListResources.size) return RendererList.nullRendererList; return m_RendererListResources[handle].rendererList; @@ -714,7 +714,7 @@ internal void CreateRendererLists(List rendererLists) } } - internal void Clear() + internal void Clear(bool onException) { LogResources(); @@ -723,7 +723,7 @@ internal void Clear() m_ComputeBufferResources.Clear(); #if DEVELOPMENT_BUILD || UNITY_EDITOR - if (m_AllocatedTextures.Count != 0) + if (m_AllocatedTextures.Count != 0 && !onException) { string logMessage = "RenderGraph: Not all textures were released."; @@ -736,6 +736,10 @@ internal void Clear() Debug.LogWarning(logMessage); } + + // If an error occurred during execution, it's expected that textures are not all release so we clear the trakcing list. + if (onException) + m_AllocatedTextures.Clear(); #endif } diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs index c9a2fcbf883..b6102417d0c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs @@ -27,7 +27,7 @@ public void Render( RenderGraph renderGraph, TextureHandle afterPostProcessTexture, TextureHandle depthBuffer, TextureHandle finalRT, - bool flipY) + bool flipY) { var dynResHandler = DynamicResolutionHandler.instance; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index d0884977d88..7c20d732434 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -936,12 +936,12 @@ TextureHandle AccumulateDistortion( RenderGraph renderGraph, class RenderDistortionPassData { - public Material applyDistortionMaterial; + public Material applyDistortionMaterial; public TextureHandle colorPyramidBuffer; public TextureHandle distortionBuffer; public TextureHandle colorBuffer; public TextureHandle depthStencilBuffer; - public Vector4 size; + public Vector4 size; } void RenderDistortion( RenderGraph renderGraph, From 349a273340ed7752d195936f9e9ca6784d01f9c4 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Tue, 2 Jun 2020 14:00:37 +0200 Subject: [PATCH 09/53] Add some debug info to compiled passes and removed wrong refCount++ on passes. --- .../Runtime/RenderGraph/RenderGraph.cs | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 5025f9eba80..d495de8fe41 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -129,6 +129,12 @@ internal struct CompiledPassInfo public bool enableAsyncCompute { get { return pass.enableAsyncCompute; } } +#if DEVELOPMENT_BUILD || UNITY_EDITOR + // This members are only here to ease debugging. + public List debugTextureReads; + public List debugTextureWrites; +#endif + public void Reset(RenderGraphPass pass) { this.pass = pass; @@ -137,6 +143,11 @@ public void Reset(RenderGraphPass pass) { textureCreateList = new List(); textureReleaseList = new List(); + +#if DEVELOPMENT_BUILD || UNITY_EDITOR + debugTextureReads = new List(); + debugTextureWrites = new List(); +#endif } textureCreateList.Clear(); @@ -147,6 +158,11 @@ public void Reset(RenderGraphPass pass) syncToPassIndex = -1; syncFromPassIndex = -1; needGraphicsFence = false; + +#if DEVELOPMENT_BUILD || UNITY_EDITOR + debugTextureReads.Clear(); + debugTextureWrites.Clear(); +#endif } } @@ -409,6 +425,10 @@ void CountReferences() { ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; info.refCount++; + +#if DEVELOPMENT_BUILD || UNITY_EDITOR + passInfo.debugTextureReads.Add(m_Resources.GetTextureResourceDesc(texture).name); +#endif } var textureWrite = passInfo.pass.textureWriteList; @@ -421,6 +441,10 @@ void CountReferences() // Writing to an imported texture is considered as a side effect because we don't know what users will do with it outside of render graph. if (m_Resources.IsTextureImported(texture)) passInfo.hasSideEffect = true; + +#if DEVELOPMENT_BUILD || UNITY_EDITOR + passInfo.debugTextureWrites.Add(m_Resources.GetTextureResourceDesc(texture).name); +#endif } // Can't share the code with a generic func as TextureHandle and ComputeBufferHandle are both struct and can't inherit from a common struct with a shared API (thanks C#) @@ -576,7 +600,6 @@ void UpdateResourceAllocationAndSynchronization() resourceInfo.firstWritePassIndex = Math.Min(resourceInfo.firstWritePassIndex, passIndex); passInfo.textureCreateList.Add(texture); } - passInfo.refCount++; UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, resourceInfo); } From 3eb0eb69883742bd9f6a7626108eac0163229b2e Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 12:19:20 +0200 Subject: [PATCH 10/53] Added possibility to disallow pass pruning Fixed a number of pass pruning issues. --- .../Runtime/RenderGraph/RenderGraph.cs | 187 ++++++++++++------ .../Runtime/RenderGraph/RenderGraphBuilder.cs | 12 ++ .../Runtime/RenderGraph/RenderGraphPass.cs | 61 +++--- .../Tests/Editor/RenderGraphTests.cs | 96 +++++++++ .../Shadow/HDShadowManager.RenderGraph.cs | 1 + .../HDRenderPipeline.RenderGraph.cs | 3 +- 6 files changed, 270 insertions(+), 90 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 7d595be1bb3..39185cb5368 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using System.Collections.Generic; using UnityEngine.Rendering; @@ -96,24 +97,25 @@ public class RenderGraph internal struct CompiledResourceInfo { public List producers; + public List consumers; public bool resourceCreated; - public int lastReadPassIndex; - public int firstWritePassIndex; public int refCount; public void Reset() { if (producers == null) producers = new List(); + if (consumers == null) + consumers = new List(); producers.Clear(); + consumers.Clear(); resourceCreated = false; - lastReadPassIndex = -1; - firstWritePassIndex = int.MaxValue; refCount = 0; } } + [DebuggerDisplay("RenderPass: {pass.name} (Index:{pass.index} Async:{enableAsyncCompute})")] internal struct CompiledPassInfo { public RenderGraphPass pass; @@ -128,6 +130,7 @@ internal struct CompiledPassInfo public GraphicsFence fence; public bool enableAsyncCompute { get { return pass.enableAsyncCompute; } } + public bool allowPassPruning { get { return pass.allowPassPruning; } } #if DEVELOPMENT_BUILD || UNITY_EDITOR // This members are only here to ease debugging. @@ -428,6 +431,7 @@ void CountReferences() foreach (TextureHandle texture in textureRead) { ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; + info.consumers.Add(passIndex); info.refCount++; #if DEVELOPMENT_BUILD || UNITY_EDITOR @@ -451,11 +455,20 @@ void CountReferences() #endif } + foreach (TextureHandle texture in passInfo.pass.transientTextureList) + { + ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; + info.refCount++; + info.consumers.Add(passIndex); + info.producers.Add(passIndex); + } + // Can't share the code with a generic func as TextureHandle and ComputeBufferHandle are both struct and can't inherit from a common struct with a shared API (thanks C#) var bufferRead = passInfo.pass.bufferReadList; foreach (ComputeBufferHandle buffer in bufferRead) { ref CompiledResourceInfo info = ref m_CompiledBufferInfos[buffer]; + info.consumers.Add(passIndex); info.refCount++; } @@ -480,7 +493,8 @@ void PruneOutputlessPasses() for (int i = 0; i < m_CompiledPassInfos.size; ++i) { ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[i]; - if (passInfo.refCount == 0 && !passInfo.hasSideEffect) + + if (passInfo.refCount == 0 && !passInfo.hasSideEffect && passInfo.allowPassPruning) { // Producer is not necessary as it produces zero resources // Prune it and decrement refCount of all the resources it reads. @@ -500,8 +514,10 @@ void PruneOutputlessPasses() } } - void PruneUnusedPasses(DynamicArray resourceUsageList) + void PruneUnusedPasses(bool textureResources) { + DynamicArray resourceUsageList = textureResources ? m_CompiledTextureInfos : m_CompiledBufferInfos; + // Gather resources that are never read. m_PruningStack.Clear(); for (int i = 0; i < resourceUsageList.size; ++i) @@ -519,18 +535,35 @@ void PruneUnusedPasses(DynamicArray resourceUsageList) { ref var producerInfo = ref m_CompiledPassInfos[producerIndex]; producerInfo.refCount--; - if (producerInfo.refCount == 0 && !producerInfo.hasSideEffect) + if (producerInfo.refCount == 0 && !producerInfo.hasSideEffect && producerInfo.allowPassPruning) { // Producer is not necessary anymore as it produces zero resources // Prune it and decrement refCount of all the textures it reads. producerInfo.pruned = true; - foreach (var textureIndex in producerInfo.pass.textureReadList) + + // Once again, can't share code because C# (can't have struct inheritance) + // Making all those List could help but we lose a lot of explicitness in the API... + if (textureResources) { - ref CompiledResourceInfo resourceInfo = ref resourceUsageList[textureIndex]; - resourceInfo.refCount--; - // If a texture is not used anymore, add it to the stack to be processed in subsequent iteration. - if (resourceInfo.refCount == 0) - m_PruningStack.Push(textureIndex); + foreach (var textureIndex in producerInfo.pass.textureReadList) + { + ref CompiledResourceInfo resourceInfo = ref resourceUsageList[textureIndex]; + resourceInfo.refCount--; + // If a resource is not used anymore, add it to the stack to be processed in subsequent iteration. + if (resourceInfo.refCount == 0) + m_PruningStack.Push(textureIndex); + } + } + else + { + foreach (var bufferIndex in producerInfo.pass.bufferReadList) + { + ref CompiledResourceInfo resourceInfo = ref resourceUsageList[bufferIndex]; + resourceInfo.refCount--; + // If a resource is not used anymore, add it to the stack to be processed in subsequent iteration. + if (resourceInfo.refCount == 0) + m_PruningStack.Push(bufferIndex); + } } } } @@ -539,29 +572,16 @@ void PruneUnusedPasses(DynamicArray resourceUsageList) void PruneUnusedPasses() { + // This will prune passes with no outputs. PruneOutputlessPasses(); - PruneUnusedPasses(m_CompiledTextureInfos); - PruneUnusedPasses(m_CompiledBufferInfos); - LogPrunedPasses(); - } - int GetLatestProducerIndex(int passIndex, in CompiledResourceInfo info) - { - // We want to know the highest pass index below the current pass that writes to the resource. - int result = -1; - foreach (var producer in info.producers) - { - // producers are by construction in increasing order. - if (producer < passIndex) - result = producer; - else - return result; - } + // This will prune all passes that produce resource that are never read. + PruneUnusedPasses(textureResources: true); + PruneUnusedPasses(textureResources: false); - return result; + LogPrunedPasses(); } - void UpdatePassSynchronization(ref CompiledPassInfo currentPassInfo, ref CompiledPassInfo producerPassInfo, int currentPassIndex, int lastProducer, ref int intLastSyncIndex) { // Current pass needs to wait for pass index lastProducer @@ -606,6 +626,68 @@ void UpdateResourceSynchronization(ref int lastGraphicsPipeSync, ref int lastCom } } + int GetLatestProducerIndex(int passIndex, in CompiledResourceInfo info) + { + // We want to know the highest pass index below the current pass that writes to the resource. + int result = -1; + foreach (var producer in info.producers) + { + // producers are by construction in increasing order. + if (producer < passIndex) + result = producer; + else + return result; + } + + return result; + } + + int GetLatestValidReadIndex(in CompiledResourceInfo info) + { + if (info.consumers.Count == 0) + return -1; + + var consumers = info.consumers; + for (int i = consumers.Count - 1; i >= 0; --i) + { + if (!m_CompiledPassInfos[consumers[i]].pruned) + return consumers[i]; + } + + return -1; + } + + int GetFirstValidWriteIndex(in CompiledResourceInfo info) + { + if (info.producers.Count == 0) + return -1; + + var producers = info.producers; + for (int i = 0; i < producers.Count; i++) + { + if (!m_CompiledPassInfos[producers[i]].pruned) + return producers[i]; + } + + return -1; + } + + int GetLatestValidWriteIndex(in CompiledResourceInfo info) + { + if (info.producers.Count == 0) + return -1; + + var producers = info.producers; + for (int i = producers.Count - 1; i >= 0; --i) + { + if (!m_CompiledPassInfos[producers[i]].pruned) + return producers[i]; + } + + return -1; + } + + void UpdateResourceAllocationAndSynchronization() { int lastGraphicsPipeSync = -1; @@ -624,20 +706,12 @@ void UpdateResourceAllocationAndSynchronization() foreach (TextureHandle texture in passInfo.pass.textureReadList) { - ref CompiledResourceInfo resourceInfo = ref m_CompiledTextureInfos[texture]; - resourceInfo.lastReadPassIndex = Math.Max(resourceInfo.lastReadPassIndex, passIndex); - UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, resourceInfo); + UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledTextureInfos[texture]); } foreach (TextureHandle texture in passInfo.pass.textureWriteList) { - ref CompiledResourceInfo resourceInfo = ref m_CompiledTextureInfos[texture]; - if (resourceInfo.firstWritePassIndex == int.MaxValue) - { - resourceInfo.firstWritePassIndex = Math.Min(resourceInfo.firstWritePassIndex, passIndex); - passInfo.textureCreateList.Add(texture); - } - UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, resourceInfo); + UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledTextureInfos[texture]); } foreach (ComputeBufferHandle texture in passInfo.pass.bufferReadList) @@ -649,15 +723,6 @@ void UpdateResourceAllocationAndSynchronization() UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledBufferInfos[texture]); } - // Add transient resources that are only used during this pass. - foreach (TextureHandle texture in passInfo.pass.transientTextureList) - { - passInfo.textureCreateList.Add(texture); - - ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; - info.lastReadPassIndex = passIndex; - } - // Gather all renderer lists m_RendererLists.AddRange(passInfo.pass.usedRendererListList); } @@ -666,13 +731,25 @@ void UpdateResourceAllocationAndSynchronization() for (int i = 0; i < m_CompiledTextureInfos.size; ++i) { CompiledResourceInfo textureInfo = m_CompiledTextureInfos[i]; - if (textureInfo.lastReadPassIndex != -1) + + // Texture creation + int firstWriteIndex = GetFirstValidWriteIndex(textureInfo); + // This can happen for imported textures (for example an imported dummy black texture will never be written to but does not need creation anyway) + if (firstWriteIndex != -1) + m_CompiledPassInfos[firstWriteIndex].textureCreateList.Add(new TextureHandle(i)); + + // Texture release + // Sometimes, a texture can be written by a pass after the last pass that reads it. + // In this case, we need to extend its lifetime to this pass otherwise the pass would get an invalid texture. + int lastReadPassIndex = Math.Max(GetLatestValidReadIndex(textureInfo), GetLatestValidWriteIndex(textureInfo)); + + if (lastReadPassIndex != -1) { // In case of async passes, we need to extend lifetime of resource to the first pass on the graphics pipeline that wait for async passes to be over. // Otherwise, if we freed the resource right away during an async pass, another non async pass could reuse the resource even though the async pipe is not done. - if (m_CompiledPassInfos[textureInfo.lastReadPassIndex].enableAsyncCompute) + if (m_CompiledPassInfos[lastReadPassIndex].enableAsyncCompute) { - int currentPassIndex = textureInfo.lastReadPassIndex; + int currentPassIndex = lastReadPassIndex; int firstWaitingPassIndex = m_CompiledPassInfos[currentPassIndex].syncFromPassIndex; // Find the first async pass that is synchronized by the graphics pipeline (ie: passInfo.syncFromPassIndex != -1) while (firstWaitingPassIndex == -1 && currentPassIndex < m_CompiledPassInfos.size) @@ -689,13 +766,13 @@ void UpdateResourceAllocationAndSynchronization() // Fail safe in case render graph is badly formed. if (currentPassIndex == m_CompiledPassInfos.size) { - RenderGraphPass invalidPass = m_RenderPasses[textureInfo.lastReadPassIndex]; + RenderGraphPass invalidPass = m_RenderPasses[lastReadPassIndex]; throw new InvalidOperationException($"Asynchronous pass {invalidPass.name} was never synchronized on the graphics pipeline."); } } else { - ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[textureInfo.lastReadPassIndex]; + ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[lastReadPassIndex]; passInfo.textureReleaseList.Add(new TextureHandle(i)); } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs index 404565f4297..98426fb9ef5 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs @@ -148,6 +148,18 @@ public void EnableAsyncCompute(bool value) m_RenderPass.EnableAsyncCompute(value); } + /// + /// Allow or not pass pruning + /// By default all passes can be pruned out if the render graph detects it's not actually used. + /// In some cases, a pass may not write or read any texture but rather do something with side effects (like setting a global texture parameter for example). + /// This function can be used to tell the system that it should not prune this pass. + /// + /// + public void AllowPassPruning(bool value) + { + m_RenderPass.AllowPassPruning(value); + } + /// /// Dispose the RenderGraphBuilder instance. /// diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs index b50e9b31126..0d282cc3713 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs @@ -19,45 +19,33 @@ public RenderFunc GetExecuteDelegate() public int index { get; protected set; } public ProfilingSampler customSampler { get; protected set; } public bool enableAsyncCompute { get; protected set; } + public bool allowPassPruning { get; protected set; } public TextureHandle depthBuffer { get; protected set; } public TextureHandle[] colorBuffers { get; protected set; } = new TextureHandle[RenderGraph.kMaxMRTCount]; public int colorBufferMaxIndex { get; protected set; } = -1; public int refCount { get; protected set; } - List m_TextureReadList = new List(); - List m_TextureWriteList = new List(); - List m_TransientTextureList = new List(); - List m_BufferReadList = new List(); - List m_BufferWriteList = new List(); - List m_UsedRendererListList = new List(); - - public List textureReadList { get { return m_TextureReadList; } } - public List textureWriteList { get { return m_TextureWriteList; } } - public List transientTextureList { get { return m_TransientTextureList; } } - public List bufferReadList { get { return m_BufferReadList; } } - public List bufferWriteList { get { return m_BufferWriteList; } } - public List usedRendererListList { get { return m_UsedRendererListList; } } - - //public IReadOnlyCollection textureReadList { get { return m_TextureReadList; } } - //public IReadOnlyCollection textureWriteList { get { return m_TextureWriteList; } } - //public IReadOnlyCollection transientTextureList { get { return m_TransientTextureList; } } - //public IReadOnlyCollection bufferReadList { get { return m_BufferReadList; } } - //public IReadOnlyCollection bufferWriteList { get { return m_BufferWriteList; } } - //public IReadOnlyCollection usedRendererListList { get { return m_UsedRendererListList; } } + public List textureReadList = new List(); + public List textureWriteList = new List(); + public List transientTextureList = new List(); + public List bufferReadList = new List(); + public List bufferWriteList = new List(); + public List usedRendererListList = new List(); public void Clear() { name = ""; index = -1; customSampler = null; - m_TextureReadList.Clear(); - m_TextureWriteList.Clear(); - m_BufferReadList.Clear(); - m_BufferWriteList.Clear(); - m_TransientTextureList.Clear(); - m_UsedRendererListList.Clear(); + textureReadList.Clear(); + textureWriteList.Clear(); + bufferReadList.Clear(); + bufferWriteList.Clear(); + transientTextureList.Clear(); + usedRendererListList.Clear(); enableAsyncCompute = false; + allowPassPruning = true; refCount = 0; // Invalidate everything @@ -71,34 +59,34 @@ public void Clear() public void AddTextureWrite(TextureHandle texture) { - m_TextureWriteList.Add(texture); + textureWriteList.Add(texture); refCount++; } public void AddTextureRead(TextureHandle texture) { - m_TextureReadList.Add(texture); + textureReadList.Add(texture); } public void AddBufferWrite(ComputeBufferHandle buffer) { - m_BufferWriteList.Add(buffer); + bufferWriteList.Add(buffer); refCount++; } public void AddTransientTexture(TextureHandle texture) { - m_TransientTextureList.Add(texture); + transientTextureList.Add(texture); } public void AddBufferRead(ComputeBufferHandle buffer) { - m_BufferReadList.Add(buffer); + bufferReadList.Add(buffer); } public void UseRendererList(RendererListHandle rendererList) { - m_UsedRendererListList.Add(rendererList); + usedRendererListList.Add(rendererList); } public void EnableAsyncCompute(bool value) @@ -106,6 +94,11 @@ public void EnableAsyncCompute(bool value) enableAsyncCompute = value; } + public void AllowPassPruning(bool value) + { + allowPassPruning = value; + } + public void SetColorBuffer(TextureHandle resource, int index) { Debug.Assert(index < RenderGraph.kMaxMRTCount && index >= 0); @@ -117,9 +110,9 @@ public void SetColorBuffer(TextureHandle resource, int index) public void SetDepthBuffer(TextureHandle resource, DepthAccess flags) { depthBuffer = resource; - if ((flags | DepthAccess.Read) != 0) + if ((flags & DepthAccess.Read) != 0) AddTextureRead(resource); - if ((flags | DepthAccess.Write) != 0) + if ((flags & DepthAccess.Write) != 0) AddTextureWrite(resource); } } diff --git a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs index 30d1c798c42..8d1e7c804e0 100644 --- a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs +++ b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs @@ -162,6 +162,69 @@ public void PrunePassWithBufferDependenciesAndNoProduct() Assert.AreEqual(true, compiledPasses[1].pruned); } + [Test] + public void PassWriteResourcePartialNotReadAfterNotPruned() + { + // If a pass writes to a resource that is not unused globally by the graph but not read ever AFTER the pass then the pass should be pruned unless it writes to another used resource. + TextureHandle texture0; + using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) + { + texture0 = builder.WriteTexture(m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm })); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + TextureHandle texture1; + using (var builder = m_RenderGraph.AddRenderPass("TestPass1", out var passData)) + { + builder.ReadTexture(texture0); + texture1 = builder.WriteTexture(m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm })); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + // This pass writes to texture0 which is used so will not be pruned out. + // Since texture0 is never read after this pass, we should decrement refCount for this pass and potentially prune it. + // However, it also writes to texture1 which is used in the last pass so we musn't prune it. + using (var builder = m_RenderGraph.AddRenderPass("TestPass2", out var passData)) + { + builder.WriteTexture(texture0); + builder.WriteTexture(texture1); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + using (var builder = m_RenderGraph.AddRenderPass("TestPass3", out var passData)) + { + builder.ReadTexture(texture1); + builder.WriteTexture(m_RenderGraph.ImportBackbuffer(0)); // Needed for the passes to not be pruned + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + m_RenderGraph.CompileRenderGraph(); + + var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); + Assert.AreEqual(4, compiledPasses.size); + Assert.AreEqual(false, compiledPasses[0].pruned); + Assert.AreEqual(false, compiledPasses[1].pruned); + Assert.AreEqual(false, compiledPasses[2].pruned); + Assert.AreEqual(false, compiledPasses[3].pruned); + } + + [Test] + public void PassDisallowPruningNotPruned() + { + // This pass does nothing so should be pruned but we explicitly disallow it. + using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) + { + builder.AllowPassPruning(false); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + m_RenderGraph.CompileRenderGraph(); + + var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); + Assert.AreEqual(1, compiledPasses.size); + Assert.AreEqual(false, compiledPasses[0].pruned); + } + // First pass produces two textures and second pass only read one of the two. Pass one should not be pruned. [Test] public void PartialUnusedProductNotPruned() @@ -336,6 +399,39 @@ public void AsyncPassReleaseTextureOnGraphicsPipe() Assert.Contains(texture2, compiledPasses[4].textureReleaseList); } + [Test] + public void TransientResourceNotPruned() + { + TextureHandle texture0; + using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) + { + texture0 = builder.WriteTexture(m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm })); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + using (var builder = m_RenderGraph.AddRenderPass("TestPass1", out var passData)) + { + builder.CreateTransientTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm }); + builder.WriteTexture(texture0); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + // Graphics pass that reads texture1. This will request a sync with compute pipe. The previous pass should be the one releasing async textures. + using (var builder = m_RenderGraph.AddRenderPass("TestPass5", out var passData)) + { + builder.ReadTexture(texture0); + builder.WriteTexture(m_RenderGraph.ImportBackbuffer(0)); // Needed for the passes to not be pruned + builder.EnableAsyncCompute(false); + builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + } + + m_RenderGraph.CompileRenderGraph(); + + var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); + Assert.AreEqual(3, compiledPasses.size); + Assert.AreEqual(false, compiledPasses[1].pruned); + } + [Test] public void AsyncPassWriteWaitOnGraphcisPipe() { diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs index fd5a8b35a05..1cd6513a0bf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.RenderGraph.cs @@ -72,6 +72,7 @@ void BindShadowGlobalResources(RenderGraph renderGraph, in ShadowResult shadowRe using (var builder = renderGraph.AddRenderPass("BindShadowGlobalResources", out var passData)) { passData.shadowResult = ReadShadowResult(shadowResult, builder); + builder.AllowPassPruning(false); builder.SetRenderFunc( (BindShadowGlobalResourcesPassData data, RenderGraphContext ctx) => { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 7c20d732434..0bfb3c88045 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -112,6 +112,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, // Temporary workaround otherwise the texture is not bound when executing directly with rendergraph using (var builder = m_RenderGraph.AddRenderPass("TempPass", out var passData)) { + builder.AllowPassPruning(false); builder.SetRenderFunc( (TempPassData data, RenderGraphContext context) => { @@ -920,7 +921,7 @@ TextureHandle AccumulateDistortion( RenderGraph renderGraph, passData.frameSettings = hdCamera.frameSettings; passData.distortionBuffer = builder.UseColorBuffer(renderGraph.CreateTexture( new TextureDesc(Vector2.one, true, true) { colorFormat = Builtin.GetDistortionBufferFormat(), clearBuffer = true, clearColor = Color.clear, name = "Distortion" }), 0); - passData.depthStencilBuffer = builder.UseDepthBuffer(depthStencilBuffer, DepthAccess.Write); + passData.depthStencilBuffer = builder.UseDepthBuffer(depthStencilBuffer, DepthAccess.Read); passData.distortionRendererList = builder.UseRendererList(renderGraph.CreateRendererList( CreateTransparentRendererListDesc(cullResults, hdCamera.camera, HDShaderPassNames.s_DistortionVectorsName))); From e1f9e0827e3f338f124fbea38a297147c79f3a2d Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 15:23:05 +0200 Subject: [PATCH 11/53] Small fixes --- .../Runtime/RenderGraph/RenderGraphBuilder.cs | 2 +- .../Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs index 98426fb9ef5..fa44c72f73e 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs @@ -187,7 +187,7 @@ void Dispose(bool disposing) void CheckTransientTexture(TextureHandle input) { - if (input.transientPassIndex != -1 && input.transientPassIndex != m_RenderPass.index) + if (input.IsValid() && input.transientPassIndex != -1 && input.transientPassIndex != m_RenderPass.index) { throw new ArgumentException($"Trying to use a transient texture (pass index {input.transientPassIndex}) in a different pass (pass index {m_RenderPass.index}."); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 0bfb3c88045..2545d5366b8 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -1064,7 +1064,7 @@ TextureHandle ResolveMotionVector(RenderGraph renderGraph, HDCamera hdCamera, Te passData.passIndex = SampleCountToPassIndex(m_MSAASamples); builder.SetRenderFunc( - (ResolveColorData data, RenderGraphContext context) => + (ResolveMotionVectorData data, RenderGraphContext context) => { var res = context.resources; var mpb = context.renderGraphPool.GetTempMaterialPropertyBlock(); From 121351169229ce15d932caeb7480fb8e94ae4d55 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 16:53:06 +0200 Subject: [PATCH 12/53] temporarily removed pruning of passes without product --- .../Runtime/RenderGraph/RenderGraph.cs | 4 +- .../Tests/Editor/RenderGraphTests.cs | 149 +++++++++--------- 2 files changed, 78 insertions(+), 75 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 39185cb5368..35eda53f4a8 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -572,8 +572,10 @@ void PruneUnusedPasses(bool textureResources) void PruneUnusedPasses() { + // TODO RENDERGRAPH: temporarily remove pruning of passes without product. + // Many passes are used just to set global variables so we don't want to force users to disallow pruning on those explicitly every time. // This will prune passes with no outputs. - PruneOutputlessPasses(); + //PruneOutputlessPasses(); // This will prune all passes that produce resource that are never read. PruneUnusedPasses(textureResources: true); diff --git a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs index 8d1e7c804e0..65f1c853130 100644 --- a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs +++ b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs @@ -87,80 +87,81 @@ public void WriteToImportedComputeBufferNotPruned() Assert.AreEqual(false, compiledPasses[0].pruned); } - // A pass not writing to anything is useless and should be pruned. - [Test] - public void PrunePassWithNoProduct() - { - // This pass reads an input but does not produce anything (no writes) so it should be pruned. - TextureHandle texture = m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm }); - using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) - { - builder.ReadTexture(texture); - builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); - } - - m_RenderGraph.CompileRenderGraph(); - - var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); - Assert.AreEqual(1, compiledPasses.size); - Assert.AreEqual(true, compiledPasses[0].pruned); - } - - // A series of passes with no final product should be pruned. - [Test] - public void PrunePassWithTextureDependenciesAndNoProduct() - { - // First pass produces an output that is read by second pass. - // Second pass does not produce anything so it should be pruned as well as all its unused dependencies. - TextureHandle texture; - using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) - { - texture = builder.WriteTexture(m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm })); - builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); - } - - using (var builder = m_RenderGraph.AddRenderPass("TestPass1", out var passData)) - { - builder.ReadTexture(texture); - builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); - } - - m_RenderGraph.CompileRenderGraph(); - - var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); - Assert.AreEqual(2, compiledPasses.size); - Assert.AreEqual(true, compiledPasses[0].pruned); - Assert.AreEqual(true, compiledPasses[1].pruned); - } - - // A series of passes with no final product should be pruned. - // Here first pass is not pruned because Compute Buffer is imported. - // TODO: Add test where compute buffer is created instead of imported once the API exists. - [Test] - public void PrunePassWithBufferDependenciesAndNoProduct() - { - // First pass produces an output that is read by second pass. - // Second pass does not produce anything so it should be pruned as well as all its unused dependencies. - ComputeBufferHandle computeBuffer; - using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) - { - computeBuffer = builder.WriteComputeBuffer(m_RenderGraph.ImportComputeBuffer(null)); - builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); - } - - using (var builder = m_RenderGraph.AddRenderPass("TestPass1", out var passData)) - { - builder.ReadComputeBuffer(computeBuffer); - builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); - } - - m_RenderGraph.CompileRenderGraph(); - - var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); - Assert.AreEqual(2, compiledPasses.size); - Assert.AreEqual(false, compiledPasses[0].pruned); // Not pruned because writing to an imported resource is a side effect. - Assert.AreEqual(true, compiledPasses[1].pruned); - } + // TODO RENDERGRAPH : Temporarily removed. See RenderGraph.cs pass pruning + //// A pass not writing to anything is useless and should be pruned. + //[Test] + //public void PrunePassWithNoProduct() + //{ + // // This pass reads an input but does not produce anything (no writes) so it should be pruned. + // TextureHandle texture = m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm }); + // using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) + // { + // builder.ReadTexture(texture); + // builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + // } + + // m_RenderGraph.CompileRenderGraph(); + + // var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); + // Assert.AreEqual(1, compiledPasses.size); + // Assert.AreEqual(true, compiledPasses[0].pruned); + //} + + //// A series of passes with no final product should be pruned. + //[Test] + //public void PrunePassWithTextureDependenciesAndNoProduct() + //{ + // // First pass produces an output that is read by second pass. + // // Second pass does not produce anything so it should be pruned as well as all its unused dependencies. + // TextureHandle texture; + // using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) + // { + // texture = builder.WriteTexture(m_RenderGraph.CreateTexture(new TextureDesc(Vector2.one) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm })); + // builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + // } + + // using (var builder = m_RenderGraph.AddRenderPass("TestPass1", out var passData)) + // { + // builder.ReadTexture(texture); + // builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + // } + + // m_RenderGraph.CompileRenderGraph(); + + // var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); + // Assert.AreEqual(2, compiledPasses.size); + // Assert.AreEqual(true, compiledPasses[0].pruned); + // Assert.AreEqual(true, compiledPasses[1].pruned); + //} + + //// A series of passes with no final product should be pruned. + //// Here first pass is not pruned because Compute Buffer is imported. + //// TODO: Add test where compute buffer is created instead of imported once the API exists. + //[Test] + //public void PrunePassWithBufferDependenciesAndNoProduct() + //{ + // // First pass produces an output that is read by second pass. + // // Second pass does not produce anything so it should be pruned as well as all its unused dependencies. + // ComputeBufferHandle computeBuffer; + // using (var builder = m_RenderGraph.AddRenderPass("TestPass0", out var passData)) + // { + // computeBuffer = builder.WriteComputeBuffer(m_RenderGraph.ImportComputeBuffer(null)); + // builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + // } + + // using (var builder = m_RenderGraph.AddRenderPass("TestPass1", out var passData)) + // { + // builder.ReadComputeBuffer(computeBuffer); + // builder.SetRenderFunc((RenderGraphTestPassData data, RenderGraphContext context) => { }); + // } + + // m_RenderGraph.CompileRenderGraph(); + + // var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); + // Assert.AreEqual(2, compiledPasses.size); + // Assert.AreEqual(false, compiledPasses[0].pruned); // Not pruned because writing to an imported resource is a side effect. + // Assert.AreEqual(true, compiledPasses[1].pruned); + //} [Test] public void PassWriteResourcePartialNotReadAfterNotPruned() From 95952b08e785daef2bbf7788849c5f661b9eb1fc Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 17:00:18 +0200 Subject: [PATCH 13/53] Fixed HDRP asset for test 5009 --- .../GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 790cabb29f8..51c3bdbdc9c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -283,7 +283,7 @@ PrefabInstance: type: 3} propertyPath: renderPipelineAsset value: - objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, + objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 1d97a4488d749771b8740d653d563efeeabb1bb6 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 17:42:11 +0200 Subject: [PATCH 14/53] Implement alpha copy for post processes --- .../PostProcessSystem.RenderGraph.cs | 44 ++++++++++++++----- .../PostProcessing/PostProcessSystem.cs | 29 +++++++++--- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs index b6102417d0c..86749373f9a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs @@ -20,6 +20,13 @@ class UberPostPassData public TextureHandle logLut; } + class AlphaCopyPassData + { + public DoCopyAlphaParameters parameters; + public TextureHandle source; + public TextureHandle outputAlpha; + } + public void Render( RenderGraph renderGraph, HDCamera hdCamera, BlueNoise blueNoise, @@ -33,19 +40,32 @@ public void Render( RenderGraph renderGraph, bool isSceneView = hdCamera.camera.cameraType == CameraType.SceneView; var source = colorBuffer; - TextureHandle alphaTexture = new TextureHandle(); + TextureHandle alphaTexture = renderGraph.defaultResources.whiteTextureXR; - // TODO RENDERGRAPH: Implement - // // Save the alpha and apply it back into the final pass if rendering in fp16 and post-processing in r11g11b10 - // if (m_KeepAlpha) - // { - // using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.AlphaCopy))) - // { - // DoCopyAlpha(cmd, camera, colorBuffer); - // } - // } - // var source = colorBuffer; + // Save the alpha and apply it back into the final pass if rendering in fp16 and post-processing in r11g11b10 + if (m_KeepAlpha) + { + using (var builder = renderGraph.AddRenderPass("Alpha Copy", out var passData, ProfilingSampler.Get(HDProfileId.AlphaCopy))) + { + passData.parameters = PrepareCopyAlphaParameters(hdCamera); + passData.source = builder.ReadTexture(source); + passData.outputAlpha = builder.WriteTexture(renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true) + { name = "Alpha Channel Copy", colorFormat = GraphicsFormat.R16_SFloat, enableRandomWrite = true })); + + builder.SetRenderFunc( + (AlphaCopyPassData data, RenderGraphContext ctx) => + { + DoCopyAlpha( data.parameters, + ctx.resources.GetTexture(data.source), + ctx.resources.GetTexture(data.outputAlpha), + ctx.cmd); + }); + alphaTexture = passData.outputAlpha; + } + } + + // TODO RENDERGRAPH: Implement // if (m_PostProcessEnabled) // { // // Guard bands (also known as "horrible hack") to avoid bleeding previous RTHandle @@ -351,7 +371,7 @@ public void Render( RenderGraph renderGraph, passData.parameters = PrepareFinalPass(hdCamera, blueNoise, flipY); passData.source = builder.ReadTexture(source); passData.afterPostProcessTexture = builder.ReadTexture(afterPostProcessTexture); - passData.alphaTexture = builder.ReadTexture(m_KeepAlpha ? alphaTexture : renderGraph.defaultResources.whiteTextureXR); + passData.alphaTexture = builder.ReadTexture(alphaTexture); passData.destination = builder.WriteTexture(finalRT); builder.SetRenderFunc( diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs index 3f3ac48ecf6..ff9b87e4328 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs @@ -443,7 +443,7 @@ void PoolSource(ref RTHandle src, RTHandle dst) { using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.AlphaCopy))) { - DoCopyAlpha(cmd, camera, colorBuffer); + DoCopyAlpha(PrepareCopyAlphaParameters(camera), colorBuffer, m_AlphaTexture, cmd); } } var source = colorBuffer; @@ -856,13 +856,28 @@ void DoStopNaNs(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle de #region Copy Alpha - void DoCopyAlpha(CommandBuffer cmd, HDCamera camera, RTHandle source) + DoCopyAlphaParameters PrepareCopyAlphaParameters(HDCamera hdCamera) { - var cs = m_Resources.shaders.copyAlphaCS; - int kernel = cs.FindKernel("KMain"); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._InputTexture, source); - cmd.SetComputeTextureParam(cs, kernel, HDShaderIDs._OutputTexture, m_AlphaTexture); - cmd.DispatchCompute(cs, kernel, (camera.actualWidth + 7) / 8, (camera.actualHeight + 7) / 8, camera.viewCount); + var parameters = new DoCopyAlphaParameters(); + parameters.hdCamera = hdCamera; + parameters.copyAlphaCS = m_Resources.shaders.copyAlphaCS; + parameters.copyAlphaKernel = parameters.copyAlphaCS.FindKernel("KMain"); + + return parameters; + } + + struct DoCopyAlphaParameters + { + public ComputeShader copyAlphaCS; + public int copyAlphaKernel; + public HDCamera hdCamera; + } + + static void DoCopyAlpha(in DoCopyAlphaParameters parameters, RTHandle source, RTHandle outputAlphaTexture, CommandBuffer cmd) + { + cmd.SetComputeTextureParam(parameters.copyAlphaCS, parameters.copyAlphaKernel, HDShaderIDs._InputTexture, source); + cmd.SetComputeTextureParam(parameters.copyAlphaCS, parameters.copyAlphaKernel, HDShaderIDs._OutputTexture, outputAlphaTexture); + cmd.DispatchCompute(parameters.copyAlphaCS, parameters.copyAlphaKernel, (parameters.hdCamera.actualWidth + 7) / 8, (parameters.hdCamera.actualHeight + 7) / 8, parameters.hdCamera.viewCount); } #endregion From 0c62ef7416024abe94db89fe86d82513bf8bdaec Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 18:19:29 +0200 Subject: [PATCH 15/53] Small render graph error fix for motion vector pass. --- .../Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index f4217a2bc7b..05bc44ace30 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -144,7 +144,7 @@ PrepassOutput RenderPrepass(RenderGraph renderGraph, TextureHandle sssBuffer, Cu bool needCameraMVBeforeResolve = hdCamera.frameSettings.IsEnabled(FrameSettingsField.MSAA); if (needCameraMVBeforeResolve) { - RenderCameraMotionVectors(renderGraph, hdCamera, result.depthPyramidTexture, result.resolvedMotionVectorsBuffer); + RenderCameraMotionVectors(renderGraph, hdCamera, result.depthPyramidTexture, result.motionVectorsBuffer); } // TODO RENDERGRAPH From 84467f6956c1f14d0d0d302bdf6f8d220c5f9026 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 11:04:34 +0200 Subject: [PATCH 16/53] Disabled for render graph tests that are currently broken. --- .../2x_Lighting/2402_Area_Rect_Shadow.unity | 178 +-- .../Scenes/2x_Lighting/2501_LightLayers.unity | 178 +-- .../2x_Lighting/2601_SSAO_HalfRes.unity | 254 ++-- .../2x_Lighting/2602_SSAO_FullRes.unity | 253 ++-- .../2x_Lighting/2701_TransparentSSR.unity | 41 +- .../3x_DebugView/3002_DebugLightLayers.unity | 41 +- .../4011_MotionBlur_PerObject.unity | 275 ++-- .../4013_TransparentMotionVector.unity | 282 ++-- .../4021_LensDistortion.unity | 20 +- .../4022_PaniniProjection.unity | 20 +- .../Scenes/4x_PostProcessing/4051_SMAA.unity | 380 ++++-- .../Scenes/4x_PostProcessing/4052_TAA.unity | 31 +- .../4053_TAA-FP16Alpha.unity | 5 + .../4060_CustomPostProcess.unity | 20 +- .../4x_PostProcessing/4080_DepthOfField.unity | 19 +- .../4081_DepthOfField-FP16Alpha.unity | 30 +- .../5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 5 + .../8x_ShaderGraph/8103_PrePostPass.unity | 40 +- .../8106_UnlitShadowMatte.unity | 259 ++-- .../9x_Other/9401_MSAAForwardBoth.unity | 59 +- .../9x_Other/9401_MSAAForwardOnly.unity | 59 +- .../9x_Other/9402_AlphaToMask-Graph.unity | 12 +- .../9x_Other/9402_AlphaToMask-HDRP.unity | 12 +- .../Scenes/9x_Other/9500_LightScripting.unity | 29 +- .../9601_SkinnedMeshBatching-Off.unity | 163 ++- .../9602_SkinnedMeshBatching-On.unity | 176 ++- .../9603_MeshRendererBatching-Off.unity | 1191 ++++++++++++----- .../9604_MeshRendererBatching-On.unity | 1149 +++++++++++----- .../9x_Other/9700_CustomPass_FullScreen.unity | 5 + .../9701_CustomPass_DrawRenderers.unity | 21 +- .../Scenes/9x_Other/9901_AOV_buffers.unity | 43 +- 31 files changed, 3485 insertions(+), 1765 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity index 868997590c3..f957e14a6e1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: d1e6b80487b4523419f8b0808a8fe032, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -128,11 +131,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (2) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -193,6 +191,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (2) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &189362331 @@ -225,11 +228,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 6 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 1024 m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 200 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -241,12 +247,11 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_LightTypeExtent: 1 - m_SpotLightShape: 0 m_ShapeWidth: 0.5 m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -257,7 +262,21 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15.5 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -265,10 +284,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -280,13 +298,18 @@ MonoBehaviour: m_VolumetricShadowDimmer: 1 m_ShadowFadeDistance: 10000 m_UseContactShadow: - m_Level: 0 - m_UseOverride: 1 m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 - m_ConstantBias: 0.15 + m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -303,6 +326,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &189362334 Light: m_ObjectHideFlags: 0 @@ -362,6 +388,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 10} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &189362335 @@ -385,11 +412,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (3) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -450,84 +472,13 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (3) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} ---- !u!114 &557812783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1001 &972798640 PrefabInstance: m_ObjectHideFlags: 0 @@ -535,11 +486,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (1) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -600,6 +546,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (1) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1001 &1071061321 @@ -609,11 +560,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -674,6 +620,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &1126674573 @@ -708,9 +659,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: a435593e8df5fec4ab2279b9647b1816, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 557812783} - m_SkySettingsFromProfile: {fileID: -8584095877685573462, guid: a435593e8df5fec4ab2279b9647b1816, - type: 2} --- !u!114 &1126674575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,6 +761,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2115918006 @@ -844,9 +797,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2115918008 MeshRenderer: @@ -863,6 +816,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity index 32b374d9d61..fd382b4c0df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity @@ -358,7 +358,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -406,6 +406,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -438,6 +439,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -456,6 +458,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &58980334 Light: m_ObjectHideFlags: 0 @@ -515,6 +518,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.7318046} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &65356095 @@ -561,7 +565,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -609,6 +613,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -641,6 +646,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -659,6 +665,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &65356099 Light: m_ObjectHideFlags: 0 @@ -718,6 +725,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.6893601} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &96461834 @@ -1811,7 +1819,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1859,6 +1867,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1891,6 +1900,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1909,6 +1919,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &253966103 Light: m_ObjectHideFlags: 0 @@ -1968,6 +1979,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &266337115 @@ -2146,107 +2158,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274728986} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &306112926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 200 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} - enableBackplate: - m_OverrideState: 0 - m_Value: 0 - backplateType: - m_OverrideState: 0 - m_Value: 0 - groundLevel: - m_OverrideState: 0 - m_Value: 0 - scale: - m_OverrideState: 0 - m_Value: {x: 32, y: 32} - projectionDistance: - m_OverrideState: 0 - m_Value: 16 - min: 0.0000001 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 100 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 --- !u!1 &331787933 GameObject: m_ObjectHideFlags: 0 @@ -2732,7 +2643,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2780,6 +2691,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2812,6 +2724,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2830,6 +2743,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &677342031 Light: m_ObjectHideFlags: 0 @@ -2889,6 +2803,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &698110940 @@ -3308,6 +3223,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4190,7 +4108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4238,6 +4156,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4270,6 +4189,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4288,6 +4208,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &985985205 Light: m_ObjectHideFlags: 0 @@ -4347,6 +4268,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &990865355 @@ -5679,7 +5601,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5727,6 +5649,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5759,6 +5682,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5777,6 +5701,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386441945 Light: m_ObjectHideFlags: 0 @@ -5836,6 +5761,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1422636729 @@ -5882,7 +5808,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5930,6 +5856,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5962,6 +5889,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5980,6 +5908,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1422636733 Light: m_ObjectHideFlags: 0 @@ -6039,6 +5968,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 1.441993, w: 3.2154703} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1433395784 @@ -6664,7 +6594,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6712,6 +6642,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6744,6 +6675,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6762,6 +6694,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1687167846 Light: m_ObjectHideFlags: 0 @@ -6821,6 +6754,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1730395417 @@ -7271,6 +7205,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -7687,6 +7626,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -8951,6 +8893,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -8960,6 +8907,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -8978,6 +8926,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9055,6 +9006,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -9064,6 +9020,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -9082,6 +9039,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity index ac782911aea..68d9cc8b2ae 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: a5b7c221c4f9f984c9dfa998b2f282ce, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -257,15 +261,42 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264148765 + value: 70005818654557 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -477,32 +508,15 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 + propertyPath: checkMemoryAllocation + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +552,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -562,6 +578,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820961446 MeshFilter: m_ObjectHideFlags: 0 @@ -630,6 +647,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -654,6 +673,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1832587852 MeshFilter: m_ObjectHideFlags: 0 @@ -722,6 +742,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -746,6 +768,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1873845493 MeshFilter: m_ObjectHideFlags: 0 @@ -779,7 +802,6 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} - - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -787,7 +809,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700540 +--- !u!114 &2023700541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -796,98 +818,110 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 ---- !u!114 &2023700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023700539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 - m_Version: 5 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - lightlayersMask: 1 - linkShadowLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -896,8 +930,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -946,6 +981,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity index 65d9f609cd2..fdb0950f687 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 87f2cf15e682aa241982fc3c774314bc, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -257,15 +261,42 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264148765 + value: 70005818654557 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -477,32 +508,10 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +547,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -562,6 +573,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &908551374 MeshFilter: m_ObjectHideFlags: 0 @@ -630,6 +642,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -654,6 +668,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1063449301 MeshFilter: m_ObjectHideFlags: 0 @@ -722,6 +737,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -746,6 +763,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1931848246 MeshFilter: m_ObjectHideFlags: 0 @@ -779,7 +797,6 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} - - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -787,7 +804,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700540 +--- !u!114 &2023700541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -796,98 +813,110 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 ---- !u!114 &2023700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023700539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 - m_Version: 5 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - lightlayersMask: 1 - linkShadowLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -896,8 +925,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -946,6 +976,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity index c06dd265b91..c5d8ab351eb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -164,7 +166,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -470,7 +472,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -518,6 +520,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -550,6 +553,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -566,6 +570,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &280720572 Light: m_ObjectHideFlags: 0 @@ -625,6 +632,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &280720573 @@ -779,7 +787,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -896,8 +904,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &491657228 Transform: m_ObjectHideFlags: 1 @@ -1401,7 +1407,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1625,7 +1631,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1850,7 +1856,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2520,7 +2526,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2711,7 +2717,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2807,7 +2813,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2903,7 +2909,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2985,7 +2991,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3095,7 +3101,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3224,7 +3230,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3548,6 +3554,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 3558f110980f9af48b96167a74d9bf69, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2024456295 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity index f7f9b1a295d..e68822c81df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity @@ -121,7 +121,7 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 maxJobWorkers: 0 - keepTiles: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -155,7 +155,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -203,6 +203,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -235,6 +236,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -251,6 +253,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &16453702 Light: m_ObjectHideFlags: 0 @@ -310,6 +315,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &16453703 @@ -356,7 +362,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -404,6 +410,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -436,6 +443,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -452,6 +460,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &83800134 Light: m_ObjectHideFlags: 0 @@ -511,6 +522,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.34} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &83800135 @@ -653,8 +665,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -856,6 +866,11 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: DebugViewController, Unity.RenderPipelines.HighDefinition-Tests.Runtime objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &719009298 @@ -1359,7 +1374,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1407,6 +1422,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1439,6 +1455,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1455,6 +1472,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1629224201 Light: m_ObjectHideFlags: 0 @@ -1514,6 +1534,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1629224202 @@ -2093,6 +2114,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0.53 --- !u!4 &2035111235 @@ -2121,7 +2143,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 2 m_ObsoleteUseShadowQualitySettings: 1 m_ObsoleteCustomShadowResolution: 1024 @@ -2169,6 +2191,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2201,6 +2224,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.005 - 0.015 @@ -2217,6 +2241,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &2132904863 GameObject: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity index e95f3cfdc26..7871e0c33d1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c35a6f302d21bc0409b93c78214222e3, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -174,6 +178,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -198,6 +204,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &102126622 Transform: m_ObjectHideFlags: 0 @@ -267,31 +274,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -315,12 +297,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -512,6 +494,41 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteRenderingPath + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &177840196 stripped @@ -596,6 +613,8 @@ MeshRenderer: m_MotionVectors: 0 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -620,6 +639,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -706,6 +726,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -730,6 +752,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &428956473 MeshFilter: m_ObjectHideFlags: 0 @@ -816,6 +839,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -840,6 +865,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &710282033 MeshFilter: m_ObjectHideFlags: 0 @@ -873,7 +899,6 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} - - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -881,7 +906,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016620 +--- !u!114 &795016621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -890,100 +915,110 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &795016621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795016619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -992,8 +1027,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -1042,6 +1078,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &795016623 @@ -1122,6 +1159,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1146,6 +1185,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1071859215 MeshFilter: m_ObjectHideFlags: 0 @@ -1222,6 +1262,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1246,6 +1288,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1316705464 Transform: m_ObjectHideFlags: 0 @@ -1387,6 +1430,8 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1411,6 +1456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1934046221 MeshFilter: m_ObjectHideFlags: 0 @@ -1487,6 +1533,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1511,6 +1559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &2058568487 Transform: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity index cc313b94bbd..7c0300c865a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 65750d7cf7c87af4bb393c06fcbc9907, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -175,41 +179,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 320 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 180 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -233,12 +202,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -430,6 +399,51 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteRenderingPath + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &309473258 @@ -496,6 +510,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -520,6 +536,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -553,7 +570,6 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} - - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -561,7 +577,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016620 +--- !u!114 &795016621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -570,100 +586,110 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &795016621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795016619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -672,8 +698,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -722,6 +749,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &795016623 @@ -830,9 +858,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1483280835 MeshRenderer: @@ -848,6 +876,8 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -872,6 +902,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1483280836 MeshFilter: m_ObjectHideFlags: 0 @@ -932,6 +963,7 @@ MonoBehaviour: settingType: 1 gBuffer: 0 fullScreenDebugMode: 14 + lightlayers: 0 --- !u!114 &1618510980 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index 733a1cfd5be..6cb43095307 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 1219cfc7625a6e34e9b81f20088b6c94, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,6 +204,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -224,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -314,12 +321,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -521,5 +528,10 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity index 8f377bac91c..bc8bd1f9681 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 1dea28949d52d764fa2f6f75a37f742c, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,6 +204,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -224,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -319,12 +326,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -526,5 +533,10 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity index 590ae2d5a80..8944b649e7b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8dc0d3965082d3b44a051ebc67373c24, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -180,6 +184,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -204,6 +210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &40006672 MeshFilter: m_ObjectHideFlags: 0 @@ -328,6 +335,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -352,6 +361,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158095357 MeshFilter: m_ObjectHideFlags: 0 @@ -420,6 +430,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -444,6 +456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172909229 MeshFilter: m_ObjectHideFlags: 0 @@ -512,6 +525,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -536,6 +551,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &234304205 MeshFilter: m_ObjectHideFlags: 0 @@ -604,6 +620,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -628,6 +646,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &307441730 MeshFilter: m_ObjectHideFlags: 0 @@ -696,6 +715,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -720,6 +741,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &329988774 MeshFilter: m_ObjectHideFlags: 0 @@ -788,6 +810,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -812,6 +836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385520400 MeshFilter: m_ObjectHideFlags: 0 @@ -880,6 +905,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -904,6 +931,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &396827034 MeshFilter: m_ObjectHideFlags: 0 @@ -972,6 +1000,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -996,6 +1026,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403782451 MeshFilter: m_ObjectHideFlags: 0 @@ -1064,6 +1095,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1088,6 +1121,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &408685716 MeshFilter: m_ObjectHideFlags: 0 @@ -1156,6 +1190,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1180,6 +1216,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &438277602 MeshFilter: m_ObjectHideFlags: 0 @@ -1248,6 +1285,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1272,6 +1311,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447990307 MeshFilter: m_ObjectHideFlags: 0 @@ -1340,6 +1380,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1364,6 +1406,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &466247374 MeshFilter: m_ObjectHideFlags: 0 @@ -1432,6 +1475,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1456,6 +1501,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &470233058 MeshFilter: m_ObjectHideFlags: 0 @@ -1524,6 +1570,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1548,6 +1596,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475510514 MeshFilter: m_ObjectHideFlags: 0 @@ -1616,6 +1665,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1640,6 +1691,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545534896 MeshFilter: m_ObjectHideFlags: 0 @@ -1677,9 +1729,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -1695,6 +1747,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1719,6 +1773,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &552920928 MeshFilter: m_ObjectHideFlags: 0 @@ -1801,6 +1856,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1825,6 +1882,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &574338704 MeshFilter: m_ObjectHideFlags: 0 @@ -1893,6 +1951,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1917,6 +1977,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &590011005 MeshFilter: m_ObjectHideFlags: 0 @@ -1985,6 +2046,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2009,6 +2072,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &627111561 MeshFilter: m_ObjectHideFlags: 0 @@ -2077,6 +2141,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2101,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &663310342 MeshFilter: m_ObjectHideFlags: 0 @@ -2169,6 +2236,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2193,6 +2262,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &692812422 MeshFilter: m_ObjectHideFlags: 0 @@ -2261,6 +2331,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2285,6 +2357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &695012948 MeshFilter: m_ObjectHideFlags: 0 @@ -2353,6 +2426,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2377,6 +2452,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &747987085 MeshFilter: m_ObjectHideFlags: 0 @@ -2445,6 +2521,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2469,6 +2547,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &769543522 MeshFilter: m_ObjectHideFlags: 0 @@ -2537,6 +2616,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2561,6 +2642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &794411577 MeshFilter: m_ObjectHideFlags: 0 @@ -2629,6 +2711,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2653,6 +2737,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809298687 MeshFilter: m_ObjectHideFlags: 0 @@ -2721,6 +2806,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2745,6 +2832,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &810879982 MeshFilter: m_ObjectHideFlags: 0 @@ -2813,6 +2901,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2837,6 +2927,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &815359632 MeshFilter: m_ObjectHideFlags: 0 @@ -2905,6 +2996,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2929,6 +3022,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &835098136 MeshFilter: m_ObjectHideFlags: 0 @@ -2997,6 +3091,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3021,6 +3117,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &865880060 MeshFilter: m_ObjectHideFlags: 0 @@ -3089,6 +3186,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3113,6 +3212,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &927672921 MeshFilter: m_ObjectHideFlags: 0 @@ -3181,6 +3281,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3205,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &973608318 MeshFilter: m_ObjectHideFlags: 0 @@ -3273,6 +3376,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3297,6 +3402,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1017656388 MeshFilter: m_ObjectHideFlags: 0 @@ -3365,6 +3471,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3389,6 +3497,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1042596661 MeshFilter: m_ObjectHideFlags: 0 @@ -3457,6 +3566,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3481,6 +3592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1060853707 MeshFilter: m_ObjectHideFlags: 0 @@ -3500,7 +3612,6 @@ GameObject: - component: {fileID: 1079224357} - component: {fileID: 1079224356} - component: {fileID: 1079224355} - - component: {fileID: 1079224354} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -3508,7 +3619,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1079224354 +--- !u!114 &1079224355 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3517,100 +3628,110 @@ MonoBehaviour: m_GameObject: {fileID: 1079224353} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &1079224355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079224353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -3619,8 +3740,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079224353} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -3669,6 +3791,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1079224357 @@ -3753,12 +3876,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -3985,6 +4108,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 512 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 @@ -4047,6 +4175,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4071,6 +4201,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1121401768 MeshFilter: m_ObjectHideFlags: 0 @@ -4139,6 +4270,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4163,6 +4296,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1141094899 MeshFilter: m_ObjectHideFlags: 0 @@ -4231,6 +4365,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4255,6 +4391,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1158666092 MeshFilter: m_ObjectHideFlags: 0 @@ -4323,6 +4460,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4347,6 +4486,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1164744979 MeshFilter: m_ObjectHideFlags: 0 @@ -4415,6 +4555,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4439,6 +4581,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1212374789 MeshFilter: m_ObjectHideFlags: 0 @@ -4507,6 +4650,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4531,6 +4676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321506414 MeshFilter: m_ObjectHideFlags: 0 @@ -4599,6 +4745,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4623,6 +4771,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1403629108 MeshFilter: m_ObjectHideFlags: 0 @@ -4691,6 +4840,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4715,6 +4866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417593602 MeshFilter: m_ObjectHideFlags: 0 @@ -4783,6 +4935,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4807,6 +4961,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460963255 MeshFilter: m_ObjectHideFlags: 0 @@ -4875,6 +5030,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4899,6 +5056,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1489396295 MeshFilter: m_ObjectHideFlags: 0 @@ -4967,6 +5125,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4991,6 +5151,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1556045220 MeshFilter: m_ObjectHideFlags: 0 @@ -5059,6 +5220,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5083,6 +5246,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1578692525 MeshFilter: m_ObjectHideFlags: 0 @@ -5151,6 +5315,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5175,6 +5341,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591606731 MeshFilter: m_ObjectHideFlags: 0 @@ -5243,6 +5410,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5267,6 +5436,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1636842448 MeshFilter: m_ObjectHideFlags: 0 @@ -5335,6 +5505,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5359,6 +5531,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1662777384 MeshFilter: m_ObjectHideFlags: 0 @@ -5427,6 +5600,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5451,6 +5626,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680240288 MeshFilter: m_ObjectHideFlags: 0 @@ -5519,6 +5695,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5543,6 +5721,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1702910558 MeshFilter: m_ObjectHideFlags: 0 @@ -5611,6 +5790,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5635,6 +5816,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1718495713 MeshFilter: m_ObjectHideFlags: 0 @@ -5703,6 +5885,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5727,6 +5911,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1768881573 MeshFilter: m_ObjectHideFlags: 0 @@ -5795,6 +5980,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5819,6 +6006,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1812995122 MeshFilter: m_ObjectHideFlags: 0 @@ -5887,6 +6075,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5911,6 +6101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1837835318 MeshFilter: m_ObjectHideFlags: 0 @@ -6016,6 +6207,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6040,6 +6233,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1913705761 MeshFilter: m_ObjectHideFlags: 0 @@ -6108,6 +6302,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6132,6 +6328,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1988598091 MeshFilter: m_ObjectHideFlags: 0 @@ -6256,6 +6453,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6280,6 +6479,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2077504822 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity index a9175d91f8a..936393226d7 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity @@ -120,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -873,7 +875,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1030,6 +1032,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1039,6 +1046,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1057,6 +1065,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2012,9 +2023,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -3914,7 +3925,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3960,7 +3971,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3993,6 +4006,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4009,6 +4023,9 @@ MonoBehaviour: useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -4068,6 +4085,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1079224357 @@ -4400,6 +4418,11 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity index 55a06d44306..f2d252f5ab5 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity @@ -4418,6 +4418,11 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity index 1e0cb3d7094..a343f089f62 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 85e59e6fb918b384290a9820ad83d27f, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -202,6 +205,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -226,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -316,12 +321,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69456063102749 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +543,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1312917302 @@ -573,6 +583,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -597,6 +608,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1312917304 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity index cdc8bb1f5af..b07a4044f28 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -373,6 +375,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -387,7 +390,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -496,6 +499,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803629126 @@ -524,7 +528,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -570,7 +574,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -603,6 +609,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -619,6 +626,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -799,6 +809,11 @@ PrefabInstance: propertyPath: backgroundColorHDR.b value: 0.29107332 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1175354105 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity index a32049a39e2..12be196607f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -374,6 +376,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -388,7 +391,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -497,6 +500,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803629126 @@ -525,7 +529,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -571,7 +575,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -604,6 +610,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -620,6 +627,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -811,6 +821,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d39c8f0447409a541a78d12c526207ee, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1122444516 @@ -842,7 +857,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1094,6 +1109,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1103,6 +1123,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1121,6 +1142,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 51c3bdbdc9c..81c4659c77f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -285,5 +285,10 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity index 91936fec90c..36d34a60910 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity @@ -215,6 +215,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -224,6 +229,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -242,6 +248,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -331,6 +340,8 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0.001 AverageCorrectnessThreshold: 0.0001 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -338,6 +349,7 @@ MonoBehaviour: waitFrames: 0 xrCompatible: 0 xrThresholdMultiplier: 1 + renderGraphCompatible: 0 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} @@ -447,6 +459,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -456,6 +473,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -474,6 +492,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -743,7 +764,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -791,6 +812,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -823,6 +845,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -839,6 +862,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &214615002 Light: m_ObjectHideFlags: 0 @@ -898,6 +924,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &214615003 @@ -2906,6 +2933,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2915,6 +2947,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2933,6 +2966,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3042,8 +3078,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: d96c2fdce7fa1e24fa2e6a67853cec3f, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &2102952965 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity index 225992a0eb6..475be4f7c07 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,7 +153,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -170,6 +172,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -279,6 +282,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -373,6 +377,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -435,7 +440,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -454,6 +459,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -625,7 +631,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -644,6 +650,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -753,6 +760,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -847,6 +855,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1008,7 +1017,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1027,6 +1036,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1136,6 +1146,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1202,7 +1213,7 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: 62ad55275245cad4290c3d0f370a6be8, type: 2} + sharedProfile: {fileID: 0} --- !u!4 &701793308 Transform: m_ObjectHideFlags: 0 @@ -1358,6 +1369,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 1290 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &717487235 @@ -1389,7 +1405,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1408,6 +1424,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1517,6 +1534,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1550,98 +1568,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759676931} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &776767567 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Area Light - m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _DistortionVectorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _UnlitColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAffectEmissive: 0 - - _AlphaCutoff: 0.5 - - _AlphaCutoffEnable: 0 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _BlendMode: 0 - - _CullMode: 2 - - _Cutoff: 0.5 - - _DistortionBlendMode: 0 - - _DistortionBlurBlendMode: 0 - - _DistortionBlurDstBlend: 0 - - _DistortionBlurRemapMax: 1 - - _DistortionBlurRemapMin: 0 - - _DistortionBlurScale: 1 - - _DistortionBlurSrcBlend: 0 - - _DistortionDepthTest: 1 - - _DistortionDstBlend: 0 - - _DistortionEnable: 0 - - _DistortionOnly: 0 - - _DistortionScale: 1 - - _DistortionSrcBlend: 0 - - _DistortionVectorBias: -1 - - _DistortionVectorScale: 2 - - _DoubleSidedEnable: 0 - - _DstBlend: 0 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - - _EnableFogOnTransparent: 0 - - _HdrpVersion: 2 - - _IncludeIndirectLighting: 0 - - _SrcBlend: 1 - - _StencilRef: 0 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 64 - - _StencilRefMV: 128 - - _StencilWriteMask: 3 - - _StencilWriteMaskDepth: 32 - - _StencilWriteMaskDistortionVec: 64 - - _StencilWriteMaskMV: 128 - - _SurfaceType: 0 - - _TransparentCullMode: 2 - - _TransparentSortPriority: 0 - - _UseEmissiveIntensity: 0 - - _ZTestDepthEqualForOpaque: 4 - - _ZTestModeDistortion: 8 - - _ZTestTransparent: 4 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 0.12732396, g: 0.12732396, b: 0.12732396, a: 0.12732396} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - - _UnlitColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] --- !u!1 &831104153 GameObject: m_ObjectHideFlags: 0 @@ -1672,7 +1598,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1706,6 +1632,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1713,6 +1644,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1745,6 +1679,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1761,6 +1696,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &831104155 Light: m_ObjectHideFlags: 0 @@ -1820,6 +1758,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &831104156 @@ -1991,6 +1930,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2085,6 +2025,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2147,7 +2088,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2166,6 +2107,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2225,8 +2167,6 @@ GameObject: - component: {fileID: 1062541562} - component: {fileID: 1062541561} - component: {fileID: 1062541560} - - component: {fileID: 1062541559} - - component: {fileID: 1062541558} m_Layer: 0 m_Name: Area Light m_TagString: Untagged @@ -2234,54 +2174,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!33 &1062541558 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062541557} - m_Mesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} ---- !u!23 &1062541559 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062541557} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 776767567} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1062541560 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2294,7 +2186,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2328,6 +2220,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2335,6 +2232,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 10 m_EvsmLightLeakBias: 0.448 m_EvsmVarianceBias: 0 @@ -2367,6 +2267,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2383,6 +2284,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 12 + m_AreaLightEmissiveMeshShadowCastingMode: 1 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 1 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1062541561 Light: m_ObjectHideFlags: 0 @@ -2442,6 +2346,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 64} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1062541562 @@ -2519,6 +2424,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2613,6 +2519,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2707,6 +2614,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2770,7 +2678,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2804,6 +2712,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2811,6 +2724,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2843,6 +2759,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2859,6 +2776,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1562174630 Light: m_ObjectHideFlags: 0 @@ -2918,6 +2838,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1562174631 @@ -2963,7 +2884,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2982,6 +2903,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3091,6 +3013,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3153,7 +3076,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3172,6 +3095,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3249,7 +3173,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3268,6 +3192,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3345,7 +3270,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3364,6 +3289,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3441,7 +3367,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3460,6 +3386,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3537,7 +3464,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3556,6 +3483,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3634,7 +3562,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3668,6 +3596,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3675,6 +3608,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3707,6 +3643,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3723,6 +3660,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1992832556 Light: m_ObjectHideFlags: 0 @@ -3782,6 +3722,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1992832557 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity index e7d6c6dfe9d..4e0883eca5f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} + m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: adeb6e0e8d1cb2a4f88df26fcda87bac, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -196,6 +200,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1693911544 @@ -205,11 +214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -265,7 +269,44 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} --- !u!1 &1916420829 GameObject: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity index 7da9c830d94..bf2527a1a48 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} + m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: d38511e38b409a745a47b6eaa41c92c5, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -259,6 +263,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5493111667791475096 @@ -268,11 +277,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -328,15 +332,52 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5493111666879982181, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5493111667044481732, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_Shadows.m_Type value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity index d4032c6bd49..7ff9f32fa58 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity @@ -156,8 +156,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -352,6 +350,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -540,6 +543,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.36045727 objectReference: {fileID: 0} + - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} - target: {fileID: 4722329110712897087, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalScale.x diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity index 20f002649cc..cfe54217c21 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity @@ -156,8 +156,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -352,6 +350,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -635,6 +638,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 20cc6a2b7d30ae54c9bd8673cafeac38, type: 2} + - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} - target: {fileID: 4722329110318162793, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_RootOrder diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity index ccd36a54ee2..76c89b16f8d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c751d73340dd34b42bbd5ae17c28848c, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -127,6 +131,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -196,13 +208,10 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_IsActive - value: 1 + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -384,6 +393,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -408,6 +418,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828622937 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity index d3a23be3c72..b2d28d062bb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -686,6 +688,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -695,6 +702,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -713,6 +721,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -792,7 +803,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -826,6 +837,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -833,6 +849,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -865,6 +884,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -881,6 +901,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &316708079 Light: m_ObjectHideFlags: 0 @@ -940,6 +963,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &316708080 @@ -1034,6 +1058,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1898,8 +1923,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &627418905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2102,7 +2125,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2136,6 +2159,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2143,6 +2171,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2175,6 +2206,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2191,6 +2223,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &739942738 Light: m_ObjectHideFlags: 0 @@ -2250,6 +2285,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &739942739 @@ -2510,7 +2546,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2544,6 +2580,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2551,6 +2592,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2583,6 +2627,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2599,6 +2644,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &803090226 Light: m_ObjectHideFlags: 0 @@ -2658,6 +2706,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803090227 @@ -2844,7 +2893,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2878,6 +2927,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2885,6 +2939,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2917,6 +2974,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2933,6 +2991,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &928375464 Light: m_ObjectHideFlags: 0 @@ -2992,6 +3053,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &928375465 @@ -3159,7 +3221,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3176,6 +3238,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -3184,7 +3251,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3201,6 +3268,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -3269,7 +3341,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3286,6 +3358,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3819,7 +3896,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3853,6 +3930,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3860,6 +3942,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3892,6 +3977,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3908,6 +3994,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1237229781 Light: m_ObjectHideFlags: 0 @@ -3967,6 +4056,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1237229782 @@ -4050,7 +4140,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4084,6 +4174,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4091,6 +4186,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4123,6 +4221,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4139,6 +4238,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1274396916 Light: m_ObjectHideFlags: 0 @@ -4198,6 +4300,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1274396917 @@ -5488,6 +5591,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1789434830 stripped @@ -5601,6 +5709,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5610,6 +5723,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5628,6 +5742,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6087,7 +6204,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6121,6 +6238,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6128,6 +6250,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6160,6 +6285,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6176,6 +6302,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2010550058 Light: m_ObjectHideFlags: 0 @@ -6235,6 +6364,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2010550059 @@ -6398,6 +6528,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6407,6 +6542,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6425,6 +6561,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity index bd63f5f084e..c5feef8b2a1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -675,8 +677,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &160564957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1095,7 +1095,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1129,6 +1129,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1136,6 +1141,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1168,6 +1176,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1184,6 +1193,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &376190249 Light: m_ObjectHideFlags: 0 @@ -1243,6 +1255,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &376190250 @@ -1609,7 +1622,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1643,6 +1656,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1650,6 +1668,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1682,6 +1703,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1698,6 +1720,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &597864850 Light: m_ObjectHideFlags: 0 @@ -1757,6 +1782,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &597864851 @@ -1803,7 +1829,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1837,6 +1863,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1844,6 +1875,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1876,6 +1910,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1892,6 +1927,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &632939249 Light: m_ObjectHideFlags: 0 @@ -1951,6 +1989,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &632939250 @@ -2117,7 +2156,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2151,6 +2190,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2158,6 +2202,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2190,6 +2237,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2206,6 +2254,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &667701177 Light: m_ObjectHideFlags: 0 @@ -2265,6 +2316,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &667701178 @@ -3510,6 +3562,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3517,6 +3574,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3549,6 +3609,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3565,6 +3626,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1190946901 Light: m_ObjectHideFlags: 0 @@ -3624,6 +3688,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1190946902 @@ -3729,6 +3794,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -3738,6 +3808,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3756,6 +3827,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3866,6 +3940,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4335,6 +4410,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1311907884 @@ -4484,7 +4564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4518,6 +4598,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4525,6 +4610,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4557,6 +4645,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4573,6 +4662,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1313756196 Light: m_ObjectHideFlags: 0 @@ -4632,6 +4724,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1313756197 @@ -4905,7 +4998,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4939,6 +5032,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4946,6 +5044,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4978,6 +5079,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4994,6 +5096,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1503478094 Light: m_ObjectHideFlags: 0 @@ -5053,6 +5158,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1503478095 @@ -5718,7 +5824,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5735,6 +5841,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -5743,7 +5854,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5760,6 +5871,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -5828,7 +5944,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5845,6 +5961,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5953,6 +6074,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5962,6 +6088,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5980,6 +6107,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6273,7 +6403,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6307,6 +6437,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6314,6 +6449,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6346,6 +6484,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6362,6 +6501,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1970729143 Light: m_ObjectHideFlags: 0 @@ -6421,6 +6563,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1970729144 @@ -6807,6 +6950,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6816,6 +6964,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6834,6 +6983,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity index 0c143444d60..b45c2598498 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 96be6728ca2a96a4595a4df0242dfd52, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -128,16 +131,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -208,46 +241,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &36551380 @@ -283,6 +286,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -307,6 +311,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &36551382 MeshFilter: m_ObjectHideFlags: 0 @@ -362,6 +367,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -386,6 +392,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &46421382 MeshFilter: m_ObjectHideFlags: 0 @@ -441,6 +448,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -465,6 +473,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &60506766 MeshFilter: m_ObjectHideFlags: 0 @@ -520,6 +529,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -544,6 +554,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65113829 MeshFilter: m_ObjectHideFlags: 0 @@ -599,6 +610,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -623,6 +635,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &66120961 MeshFilter: m_ObjectHideFlags: 0 @@ -678,6 +691,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -702,6 +716,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77076703 MeshFilter: m_ObjectHideFlags: 0 @@ -753,9 +768,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &101861481 MeshRenderer: @@ -772,6 +787,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -796,6 +812,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &101861482 MeshFilter: m_ObjectHideFlags: 0 @@ -850,9 +867,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1500180839} - m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, - type: 2} --- !u!114 &115701100 MonoBehaviour: m_ObjectHideFlags: 0 @@ -917,6 +931,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -941,6 +956,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &127095559 MeshFilter: m_ObjectHideFlags: 0 @@ -970,16 +986,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(OFF) test with 4 materials + + and 4 meshes checking + shadow behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -1050,51 +1101,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: 'Batching(OFF) test with 4 materials - - and 4 meshes checking - shadow behavior - - with different light type shadows' - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &150582942 @@ -1130,6 +1146,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1154,6 +1171,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &150582944 MeshFilter: m_ObjectHideFlags: 0 @@ -1209,6 +1227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1233,6 +1252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &153531923 MeshFilter: m_ObjectHideFlags: 0 @@ -1288,6 +1308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1312,6 +1333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &155155688 MeshFilter: m_ObjectHideFlags: 0 @@ -1367,6 +1389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1391,6 +1414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &170534014 MeshFilter: m_ObjectHideFlags: 0 @@ -1446,6 +1470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1470,6 +1495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &174301839 MeshFilter: m_ObjectHideFlags: 0 @@ -1525,6 +1551,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1549,6 +1576,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &182072262 MeshFilter: m_ObjectHideFlags: 0 @@ -1604,6 +1632,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1628,6 +1657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &186477293 MeshFilter: m_ObjectHideFlags: 0 @@ -1683,6 +1713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1707,6 +1738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &200455129 MeshFilter: m_ObjectHideFlags: 0 @@ -1762,6 +1794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1786,6 +1819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &204257016 MeshFilter: m_ObjectHideFlags: 0 @@ -1841,6 +1875,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1865,6 +1900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &227477080 MeshFilter: m_ObjectHideFlags: 0 @@ -1920,6 +1956,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1944,6 +1981,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &238349023 MeshFilter: m_ObjectHideFlags: 0 @@ -1973,16 +2011,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2053,46 +2121,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &243558409 @@ -2128,6 +2166,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2152,6 +2191,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &243558411 MeshFilter: m_ObjectHideFlags: 0 @@ -2207,6 +2247,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2231,6 +2272,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &253909733 MeshFilter: m_ObjectHideFlags: 0 @@ -2286,6 +2328,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2310,6 +2353,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259622049 MeshFilter: m_ObjectHideFlags: 0 @@ -2365,6 +2409,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2389,6 +2434,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &261850620 MeshFilter: m_ObjectHideFlags: 0 @@ -2444,6 +2490,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2468,6 +2515,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &264730788 MeshFilter: m_ObjectHideFlags: 0 @@ -2523,6 +2571,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2547,6 +2596,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &265628708 MeshFilter: m_ObjectHideFlags: 0 @@ -2602,6 +2652,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2626,6 +2677,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &268124353 MeshFilter: m_ObjectHideFlags: 0 @@ -2677,9 +2729,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &286673898 MeshRenderer: @@ -2696,6 +2748,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2720,6 +2773,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286673899 MeshFilter: m_ObjectHideFlags: 0 @@ -2775,6 +2829,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2799,6 +2854,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &288435795 MeshFilter: m_ObjectHideFlags: 0 @@ -2828,15 +2884,45 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2908,46 +2994,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &311832186 @@ -2983,6 +3039,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3007,6 +3064,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311832188 MeshFilter: m_ObjectHideFlags: 0 @@ -3062,6 +3120,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3086,6 +3145,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &315335065 MeshFilter: m_ObjectHideFlags: 0 @@ -3141,6 +3201,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3165,6 +3226,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &323337983 MeshFilter: m_ObjectHideFlags: 0 @@ -3220,6 +3282,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3244,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &347980535 MeshFilter: m_ObjectHideFlags: 0 @@ -3299,6 +3363,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3323,6 +3388,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &353743933 MeshFilter: m_ObjectHideFlags: 0 @@ -3378,6 +3444,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3402,6 +3469,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &358891137 MeshFilter: m_ObjectHideFlags: 0 @@ -3457,6 +3525,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3481,6 +3550,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &371112390 MeshFilter: m_ObjectHideFlags: 0 @@ -3536,6 +3606,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3560,6 +3631,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385211676 MeshFilter: m_ObjectHideFlags: 0 @@ -3615,6 +3687,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3639,6 +3712,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &393485934 MeshFilter: m_ObjectHideFlags: 0 @@ -3694,6 +3768,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3718,6 +3793,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414712806 MeshFilter: m_ObjectHideFlags: 0 @@ -3773,6 +3849,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3797,6 +3874,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &442248312 MeshFilter: m_ObjectHideFlags: 0 @@ -3852,6 +3930,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3876,6 +3955,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &451218266 MeshFilter: m_ObjectHideFlags: 0 @@ -3931,6 +4011,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3955,6 +4036,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &454545252 MeshFilter: m_ObjectHideFlags: 0 @@ -4024,6 +4106,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4048,6 +4131,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &456409600 MeshFilter: m_ObjectHideFlags: 0 @@ -4089,6 +4173,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4113,6 +4198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &463589548 MeshFilter: m_ObjectHideFlags: 0 @@ -4168,6 +4254,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4192,6 +4279,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475376730 MeshFilter: m_ObjectHideFlags: 0 @@ -4247,6 +4335,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4271,6 +4360,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &481317919 MeshFilter: m_ObjectHideFlags: 0 @@ -4326,6 +4416,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4350,6 +4441,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483495094 MeshFilter: m_ObjectHideFlags: 0 @@ -4405,6 +4497,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4429,6 +4522,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483928023 MeshFilter: m_ObjectHideFlags: 0 @@ -4484,6 +4578,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4508,6 +4603,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &485852219 MeshFilter: m_ObjectHideFlags: 0 @@ -4559,9 +4655,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &507304597 MeshRenderer: @@ -4578,6 +4674,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4602,6 +4699,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &507304598 MeshFilter: m_ObjectHideFlags: 0 @@ -4657,6 +4755,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4681,6 +4780,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515052764 MeshFilter: m_ObjectHideFlags: 0 @@ -4732,9 +4832,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &515113725 MeshRenderer: @@ -4751,6 +4851,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4775,6 +4876,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515113726 MeshFilter: m_ObjectHideFlags: 0 @@ -4830,6 +4932,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4854,6 +4957,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515981675 MeshFilter: m_ObjectHideFlags: 0 @@ -4909,6 +5013,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4933,6 +5038,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &524115670 MeshFilter: m_ObjectHideFlags: 0 @@ -4988,6 +5094,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5012,6 +5119,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531014866 MeshFilter: m_ObjectHideFlags: 0 @@ -5067,6 +5175,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5091,6 +5200,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &535988451 MeshFilter: m_ObjectHideFlags: 0 @@ -5146,6 +5256,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5170,6 +5281,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545110250 MeshFilter: m_ObjectHideFlags: 0 @@ -5225,6 +5337,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5249,6 +5362,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545921550 MeshFilter: m_ObjectHideFlags: 0 @@ -5304,6 +5418,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5328,6 +5443,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &549211337 MeshFilter: m_ObjectHideFlags: 0 @@ -5419,6 +5535,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5443,6 +5560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &554062274 MeshFilter: m_ObjectHideFlags: 0 @@ -5498,6 +5616,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5522,6 +5641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &585238646 MeshFilter: m_ObjectHideFlags: 0 @@ -5577,6 +5697,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5601,6 +5722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &593985934 MeshFilter: m_ObjectHideFlags: 0 @@ -5656,6 +5778,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5680,6 +5803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &600499765 MeshFilter: m_ObjectHideFlags: 0 @@ -5735,6 +5859,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5759,6 +5884,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602785436 MeshFilter: m_ObjectHideFlags: 0 @@ -5814,6 +5940,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5838,6 +5965,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &606501518 MeshFilter: m_ObjectHideFlags: 0 @@ -5893,6 +6021,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5917,6 +6046,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &635086611 MeshFilter: m_ObjectHideFlags: 0 @@ -5972,6 +6102,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5996,6 +6127,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &644832025 MeshFilter: m_ObjectHideFlags: 0 @@ -6047,9 +6179,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &675722532 MeshRenderer: @@ -6066,6 +6198,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6090,6 +6223,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &675722533 MeshFilter: m_ObjectHideFlags: 0 @@ -6145,6 +6279,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6169,6 +6304,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &680093780 MeshFilter: m_ObjectHideFlags: 0 @@ -6224,6 +6360,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6248,6 +6385,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &705903101 MeshFilter: m_ObjectHideFlags: 0 @@ -6303,6 +6441,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6327,6 +6466,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &728083195 MeshFilter: m_ObjectHideFlags: 0 @@ -6382,6 +6522,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6406,6 +6547,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &734490762 MeshFilter: m_ObjectHideFlags: 0 @@ -6461,6 +6603,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6485,6 +6628,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &737650306 MeshFilter: m_ObjectHideFlags: 0 @@ -6540,6 +6684,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6564,6 +6709,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &751044735 MeshFilter: m_ObjectHideFlags: 0 @@ -6619,6 +6765,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6643,6 +6790,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &756692492 MeshFilter: m_ObjectHideFlags: 0 @@ -6698,6 +6846,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6722,6 +6871,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &757283832 MeshFilter: m_ObjectHideFlags: 0 @@ -6777,6 +6927,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6801,6 +6952,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &772931098 MeshFilter: m_ObjectHideFlags: 0 @@ -6856,6 +7008,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6880,6 +7033,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &774742369 MeshFilter: m_ObjectHideFlags: 0 @@ -6935,6 +7089,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6959,6 +7114,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &777150796 MeshFilter: m_ObjectHideFlags: 0 @@ -7014,6 +7170,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7038,6 +7195,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &784485898 MeshFilter: m_ObjectHideFlags: 0 @@ -7093,6 +7251,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7117,6 +7276,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &824852118 MeshFilter: m_ObjectHideFlags: 0 @@ -7172,6 +7332,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7196,6 +7357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &831555554 MeshFilter: m_ObjectHideFlags: 0 @@ -7251,6 +7413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7275,6 +7438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &841086743 MeshFilter: m_ObjectHideFlags: 0 @@ -7330,6 +7494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7354,6 +7519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886695358 MeshFilter: m_ObjectHideFlags: 0 @@ -7409,6 +7575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7433,6 +7600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901920340 MeshFilter: m_ObjectHideFlags: 0 @@ -7488,6 +7656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7512,6 +7681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &913545789 MeshFilter: m_ObjectHideFlags: 0 @@ -7567,6 +7737,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7591,6 +7762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917358696 MeshFilter: m_ObjectHideFlags: 0 @@ -7646,6 +7818,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7670,6 +7843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917574245 MeshFilter: m_ObjectHideFlags: 0 @@ -7725,6 +7899,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7749,6 +7924,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &939069929 MeshFilter: m_ObjectHideFlags: 0 @@ -7804,6 +7980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7828,6 +8005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &942091866 MeshFilter: m_ObjectHideFlags: 0 @@ -7883,6 +8061,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7907,6 +8086,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &943532141 MeshFilter: m_ObjectHideFlags: 0 @@ -7962,6 +8142,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7986,6 +8167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &987125021 MeshFilter: m_ObjectHideFlags: 0 @@ -8041,6 +8223,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8065,6 +8248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991365373 MeshFilter: m_ObjectHideFlags: 0 @@ -8120,6 +8304,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8144,6 +8329,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1008620057 MeshFilter: m_ObjectHideFlags: 0 @@ -8213,6 +8399,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8237,6 +8424,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1021467115 MeshFilter: m_ObjectHideFlags: 0 @@ -8278,6 +8466,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8302,6 +8491,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1056257243 MeshFilter: m_ObjectHideFlags: 0 @@ -8357,6 +8547,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8381,6 +8572,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1062953899 MeshFilter: m_ObjectHideFlags: 0 @@ -8436,6 +8628,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8460,6 +8653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064303137 MeshFilter: m_ObjectHideFlags: 0 @@ -8515,6 +8709,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8539,6 +8734,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064782782 MeshFilter: m_ObjectHideFlags: 0 @@ -8594,6 +8790,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8618,6 +8815,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1069142520 MeshFilter: m_ObjectHideFlags: 0 @@ -8673,6 +8871,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8697,6 +8896,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1090690753 MeshFilter: m_ObjectHideFlags: 0 @@ -8795,6 +8995,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8819,6 +9020,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1101367492 MeshFilter: m_ObjectHideFlags: 0 @@ -8874,6 +9076,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8898,6 +9101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1102238839 MeshFilter: m_ObjectHideFlags: 0 @@ -8953,6 +9157,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8977,6 +9182,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1114955574 MeshFilter: m_ObjectHideFlags: 0 @@ -9032,6 +9238,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9056,6 +9263,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1115857959 MeshFilter: m_ObjectHideFlags: 0 @@ -9111,6 +9319,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9135,6 +9344,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123583534 MeshFilter: m_ObjectHideFlags: 0 @@ -9190,6 +9400,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9214,6 +9425,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1136865338 MeshFilter: m_ObjectHideFlags: 0 @@ -9269,6 +9481,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9293,6 +9506,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1139714605 MeshFilter: m_ObjectHideFlags: 0 @@ -9348,6 +9562,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9372,6 +9587,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1146692006 MeshFilter: m_ObjectHideFlags: 0 @@ -9427,6 +9643,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9451,6 +9668,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1150003263 MeshFilter: m_ObjectHideFlags: 0 @@ -9506,6 +9724,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9530,6 +9749,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1155367716 MeshFilter: m_ObjectHideFlags: 0 @@ -9585,6 +9805,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9609,6 +9830,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167055085 MeshFilter: m_ObjectHideFlags: 0 @@ -9664,6 +9886,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9688,6 +9911,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169402463 MeshFilter: m_ObjectHideFlags: 0 @@ -9743,6 +9967,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9767,6 +9992,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169459259 MeshFilter: m_ObjectHideFlags: 0 @@ -9822,6 +10048,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9846,6 +10073,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173661556 MeshFilter: m_ObjectHideFlags: 0 @@ -9901,6 +10129,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9925,6 +10154,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173941889 MeshFilter: m_ObjectHideFlags: 0 @@ -9991,7 +10221,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -10014,6 +10244,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -10024,6 +10255,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -10031,6 +10267,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -10038,10 +10277,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -10058,9 +10296,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10077,6 +10319,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1186812977 Light: m_ObjectHideFlags: 0 @@ -10136,6 +10381,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1189427210 @@ -10171,6 +10417,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10195,6 +10442,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1189427212 MeshFilter: m_ObjectHideFlags: 0 @@ -10250,6 +10498,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10274,6 +10523,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1191893181 MeshFilter: m_ObjectHideFlags: 0 @@ -10329,6 +10579,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10353,6 +10604,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1200757313 MeshFilter: m_ObjectHideFlags: 0 @@ -10408,6 +10660,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10432,6 +10685,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1219120707 MeshFilter: m_ObjectHideFlags: 0 @@ -10487,6 +10741,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10511,6 +10766,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1222561854 MeshFilter: m_ObjectHideFlags: 0 @@ -10566,6 +10822,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10590,6 +10847,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1224740520 MeshFilter: m_ObjectHideFlags: 0 @@ -10645,6 +10903,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10669,6 +10928,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236603816 MeshFilter: m_ObjectHideFlags: 0 @@ -10738,6 +10998,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10762,6 +11023,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1242223686 MeshFilter: m_ObjectHideFlags: 0 @@ -10803,6 +11065,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10827,6 +11090,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1243024348 MeshFilter: m_ObjectHideFlags: 0 @@ -10882,6 +11146,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10906,6 +11171,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1247850078 MeshFilter: m_ObjectHideFlags: 0 @@ -10961,6 +11227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10985,6 +11252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1259711087 MeshFilter: m_ObjectHideFlags: 0 @@ -11040,6 +11308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11064,6 +11333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1262205734 MeshFilter: m_ObjectHideFlags: 0 @@ -11119,6 +11389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11143,6 +11414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275508096 MeshFilter: m_ObjectHideFlags: 0 @@ -11198,6 +11470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11222,6 +11495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275917559 MeshFilter: m_ObjectHideFlags: 0 @@ -11277,6 +11551,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11301,6 +11576,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1287832517 MeshFilter: m_ObjectHideFlags: 0 @@ -11356,6 +11632,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11380,6 +11657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1289313402 MeshFilter: m_ObjectHideFlags: 0 @@ -11435,6 +11713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11459,6 +11738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1298995558 MeshFilter: m_ObjectHideFlags: 0 @@ -11514,6 +11794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11538,6 +11819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1302983124 MeshFilter: m_ObjectHideFlags: 0 @@ -11593,6 +11875,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11617,6 +11900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1310388112 MeshFilter: m_ObjectHideFlags: 0 @@ -11672,6 +11956,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11696,6 +11981,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1313496688 MeshFilter: m_ObjectHideFlags: 0 @@ -11751,6 +12037,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11775,6 +12062,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321236503 MeshFilter: m_ObjectHideFlags: 0 @@ -11841,7 +12129,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -11864,6 +12152,7 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -11874,6 +12163,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -11881,6 +12175,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -11888,10 +12185,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -11908,9 +12204,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11927,6 +12227,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1334092060 Light: m_ObjectHideFlags: 0 @@ -11986,6 +12289,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1344180423 @@ -12035,6 +12339,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12059,6 +12364,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344180426 MeshFilter: m_ObjectHideFlags: 0 @@ -12100,6 +12406,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12124,6 +12431,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1350933908 MeshFilter: m_ObjectHideFlags: 0 @@ -12179,6 +12487,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12203,6 +12512,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368252137 MeshFilter: m_ObjectHideFlags: 0 @@ -12258,6 +12568,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12282,6 +12593,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368802139 MeshFilter: m_ObjectHideFlags: 0 @@ -12337,6 +12649,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12361,6 +12674,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1381569253 MeshFilter: m_ObjectHideFlags: 0 @@ -12416,6 +12730,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12440,6 +12755,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1383163231 MeshFilter: m_ObjectHideFlags: 0 @@ -12495,6 +12811,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12519,6 +12836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1396529170 MeshFilter: m_ObjectHideFlags: 0 @@ -12574,6 +12892,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12598,6 +12917,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1402937276 MeshFilter: m_ObjectHideFlags: 0 @@ -12653,6 +12973,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12677,6 +12998,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1414587696 MeshFilter: m_ObjectHideFlags: 0 @@ -12732,6 +13054,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12756,6 +13079,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417253615 MeshFilter: m_ObjectHideFlags: 0 @@ -12811,6 +13135,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12835,6 +13160,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1419332792 MeshFilter: m_ObjectHideFlags: 0 @@ -12890,6 +13216,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12914,6 +13241,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1434700136 MeshFilter: m_ObjectHideFlags: 0 @@ -12969,6 +13297,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12993,6 +13322,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1453744377 MeshFilter: m_ObjectHideFlags: 0 @@ -13048,6 +13378,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13072,6 +13403,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1476022556 MeshFilter: m_ObjectHideFlags: 0 @@ -13124,7 +13456,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13147,6 +13479,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -13157,6 +13490,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13164,6 +13502,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13171,10 +13512,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13191,9 +13531,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13210,6 +13554,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1481024265 Light: m_ObjectHideFlags: 0 @@ -13269,6 +13616,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1481024266 @@ -13318,6 +13666,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13342,6 +13691,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1490167730 MeshFilter: m_ObjectHideFlags: 0 @@ -13364,82 +13714,6 @@ Transform: m_Father: {fileID: 1603355434} m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1500180839 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1505593270 GameObject: m_ObjectHideFlags: 0 @@ -13473,6 +13747,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13497,6 +13772,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1505593272 MeshFilter: m_ObjectHideFlags: 0 @@ -13552,6 +13828,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13576,6 +13853,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1507424699 MeshFilter: m_ObjectHideFlags: 0 @@ -13631,6 +13909,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13655,6 +13934,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1514978764 MeshFilter: m_ObjectHideFlags: 0 @@ -13710,6 +13990,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13734,6 +14015,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1519772559 MeshFilter: m_ObjectHideFlags: 0 @@ -13789,6 +14071,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13813,6 +14096,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1538025914 MeshFilter: m_ObjectHideFlags: 0 @@ -13868,6 +14152,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13892,6 +14177,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1543193733 MeshFilter: m_ObjectHideFlags: 0 @@ -13947,6 +14233,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13971,6 +14258,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1545245265 MeshFilter: m_ObjectHideFlags: 0 @@ -14026,6 +14314,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14050,6 +14339,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1574710584 MeshFilter: m_ObjectHideFlags: 0 @@ -14105,6 +14395,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14129,6 +14420,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1598618972 MeshFilter: m_ObjectHideFlags: 0 @@ -14420,6 +14712,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14444,6 +14737,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1645498030 MeshFilter: m_ObjectHideFlags: 0 @@ -14499,6 +14793,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14523,6 +14818,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1655537782 MeshFilter: m_ObjectHideFlags: 0 @@ -14578,6 +14874,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14602,6 +14899,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1677565070 MeshFilter: m_ObjectHideFlags: 0 @@ -14657,6 +14955,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14681,6 +14980,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680464722 MeshFilter: m_ObjectHideFlags: 0 @@ -14736,6 +15036,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14760,6 +15061,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1694320345 MeshFilter: m_ObjectHideFlags: 0 @@ -14815,6 +15117,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14839,6 +15142,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1701473976 MeshFilter: m_ObjectHideFlags: 0 @@ -14894,6 +15198,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14918,6 +15223,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723268422 MeshFilter: m_ObjectHideFlags: 0 @@ -14947,16 +15253,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: overrideTestSettings + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15027,51 +15368,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Anchor - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Alignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: targetCamera - value: + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: overrideTestSettings - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1733495935 @@ -15107,6 +15413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15131,6 +15438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1733495937 MeshFilter: m_ObjectHideFlags: 0 @@ -15186,6 +15494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15210,6 +15519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1737097214 MeshFilter: m_ObjectHideFlags: 0 @@ -15265,6 +15575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15289,6 +15600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1742747597 MeshFilter: m_ObjectHideFlags: 0 @@ -15344,6 +15656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15368,6 +15681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1745614621 MeshFilter: m_ObjectHideFlags: 0 @@ -15423,6 +15737,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15447,6 +15762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750054272 MeshFilter: m_ObjectHideFlags: 0 @@ -15502,6 +15818,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15526,6 +15843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1770933946 MeshFilter: m_ObjectHideFlags: 0 @@ -15581,6 +15899,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15605,6 +15924,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1772511680 MeshFilter: m_ObjectHideFlags: 0 @@ -15660,6 +15980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15684,6 +16005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777553420 MeshFilter: m_ObjectHideFlags: 0 @@ -15771,6 +16093,21 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -15832,21 +16169,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1788602647 @@ -15856,16 +16183,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (3) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Pyramid Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15936,46 +16293,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1791778916 @@ -16011,6 +16338,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16035,6 +16363,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791778918 MeshFilter: m_ObjectHideFlags: 0 @@ -16090,6 +16419,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16114,6 +16444,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1795726768 MeshFilter: m_ObjectHideFlags: 0 @@ -16169,6 +16500,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16193,6 +16525,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805369059 MeshFilter: m_ObjectHideFlags: 0 @@ -16248,6 +16581,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16272,6 +16606,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805418746 MeshFilter: m_ObjectHideFlags: 0 @@ -16327,6 +16662,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16351,6 +16687,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1806486486 MeshFilter: m_ObjectHideFlags: 0 @@ -16406,6 +16743,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16430,6 +16768,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1811672316 MeshFilter: m_ObjectHideFlags: 0 @@ -16485,6 +16824,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16509,6 +16849,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820677218 MeshFilter: m_ObjectHideFlags: 0 @@ -16564,6 +16905,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16588,6 +16930,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828202885 MeshFilter: m_ObjectHideFlags: 0 @@ -16643,6 +16986,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16667,6 +17011,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828337667 MeshFilter: m_ObjectHideFlags: 0 @@ -16722,6 +17067,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16746,6 +17092,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1845195892 MeshFilter: m_ObjectHideFlags: 0 @@ -16801,6 +17148,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16825,6 +17173,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1851237859 MeshFilter: m_ObjectHideFlags: 0 @@ -16880,6 +17229,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16904,6 +17254,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1905441408 MeshFilter: m_ObjectHideFlags: 0 @@ -16959,6 +17310,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16983,6 +17335,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1922813201 MeshFilter: m_ObjectHideFlags: 0 @@ -17038,6 +17391,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17062,6 +17416,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1924402466 MeshFilter: m_ObjectHideFlags: 0 @@ -17117,6 +17472,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17141,6 +17497,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1930622162 MeshFilter: m_ObjectHideFlags: 0 @@ -17207,7 +17564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17230,6 +17587,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -17240,6 +17598,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17247,6 +17610,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17254,10 +17620,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17274,9 +17639,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17293,6 +17662,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1934754985 Light: m_ObjectHideFlags: 0 @@ -17352,6 +17724,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1944444714 @@ -17387,6 +17760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17411,6 +17785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1944444716 MeshFilter: m_ObjectHideFlags: 0 @@ -17466,6 +17841,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17490,6 +17866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1950934447 MeshFilter: m_ObjectHideFlags: 0 @@ -17545,6 +17922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17569,6 +17947,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1951027920 MeshFilter: m_ObjectHideFlags: 0 @@ -17624,6 +18003,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17648,6 +18028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1952346156 MeshFilter: m_ObjectHideFlags: 0 @@ -17703,6 +18084,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17727,6 +18109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1972269529 MeshFilter: m_ObjectHideFlags: 0 @@ -17782,6 +18165,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17806,6 +18190,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1973997287 MeshFilter: m_ObjectHideFlags: 0 @@ -17858,7 +18243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17881,6 +18266,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -17891,6 +18277,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17898,6 +18289,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17905,10 +18299,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17925,9 +18318,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17944,6 +18341,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2000975652 Light: m_ObjectHideFlags: 0 @@ -18003,6 +18403,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2000975653 @@ -18052,6 +18453,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18076,6 +18478,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2004796537 MeshFilter: m_ObjectHideFlags: 0 @@ -18131,6 +18534,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18155,6 +18559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2007878966 MeshFilter: m_ObjectHideFlags: 0 @@ -18210,6 +18615,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18234,6 +18640,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2009971746 MeshFilter: m_ObjectHideFlags: 0 @@ -18289,6 +18696,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18313,6 +18721,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2012882290 MeshFilter: m_ObjectHideFlags: 0 @@ -18368,6 +18777,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18392,6 +18802,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2041816170 MeshFilter: m_ObjectHideFlags: 0 @@ -18447,6 +18858,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18471,6 +18883,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2055222863 MeshFilter: m_ObjectHideFlags: 0 @@ -18526,6 +18939,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18550,6 +18964,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2057234449 MeshFilter: m_ObjectHideFlags: 0 @@ -18616,7 +19031,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -18639,6 +19054,7 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -18649,6 +19065,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -18656,6 +19077,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -18663,10 +19087,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -18683,9 +19106,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -18702,6 +19129,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2063225983 Light: m_ObjectHideFlags: 0 @@ -18761,6 +19191,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2073048139 @@ -18796,6 +19227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18820,6 +19252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2073048141 MeshFilter: m_ObjectHideFlags: 0 @@ -18875,6 +19308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18899,6 +19333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079882538 MeshFilter: m_ObjectHideFlags: 0 @@ -18954,6 +19389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18978,6 +19414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099243441 MeshFilter: m_ObjectHideFlags: 0 @@ -19033,6 +19470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19057,6 +19495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099775709 MeshFilter: m_ObjectHideFlags: 0 @@ -19126,6 +19565,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19150,6 +19590,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2103916467 MeshFilter: m_ObjectHideFlags: 0 @@ -19205,6 +19646,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19229,6 +19671,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2111003287 MeshFilter: m_ObjectHideFlags: 0 @@ -19270,6 +19713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19294,6 +19738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2121451157 MeshFilter: m_ObjectHideFlags: 0 @@ -19349,6 +19794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19373,6 +19819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2133598721 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity index 5747be64a64..60e90f83425 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8dcf44329359b844c8aa48f80ab59bbb, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +171,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -192,6 +196,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1710004 MeshFilter: m_ObjectHideFlags: 0 @@ -247,6 +252,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -271,6 +277,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &18051140 MeshFilter: m_ObjectHideFlags: 0 @@ -326,6 +333,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -350,6 +358,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &27279487 MeshFilter: m_ObjectHideFlags: 0 @@ -390,9 +399,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1907606003} - m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, - type: 2} --- !u!114 &63803591 MonoBehaviour: m_ObjectHideFlags: 0 @@ -471,6 +477,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -495,6 +502,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65574162 MeshFilter: m_ObjectHideFlags: 0 @@ -550,6 +558,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -574,6 +583,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77199700 MeshFilter: m_ObjectHideFlags: 0 @@ -629,6 +639,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -653,6 +664,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &115102200 MeshFilter: m_ObjectHideFlags: 0 @@ -708,6 +720,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -732,6 +745,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &118990961 MeshFilter: m_ObjectHideFlags: 0 @@ -787,6 +801,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -811,6 +826,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &119543197 MeshFilter: m_ObjectHideFlags: 0 @@ -866,6 +882,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -890,6 +907,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &121141773 MeshFilter: m_ObjectHideFlags: 0 @@ -945,6 +963,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -969,6 +988,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &144936673 MeshFilter: m_ObjectHideFlags: 0 @@ -1021,7 +1041,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1044,6 +1064,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -1054,6 +1075,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1061,6 +1087,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1068,10 +1097,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1088,9 +1116,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1107,6 +1139,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &154133178 Light: m_ObjectHideFlags: 0 @@ -1166,6 +1201,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &158924534 @@ -1215,6 +1251,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1239,6 +1276,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158924537 MeshFilter: m_ObjectHideFlags: 0 @@ -1294,6 +1332,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1318,6 +1357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172004985 MeshFilter: m_ObjectHideFlags: 0 @@ -1373,6 +1413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1397,6 +1438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &193875014 MeshFilter: m_ObjectHideFlags: 0 @@ -1452,6 +1494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1476,6 +1519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &197171319 MeshFilter: m_ObjectHideFlags: 0 @@ -1531,6 +1575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1555,6 +1600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &206141925 MeshFilter: m_ObjectHideFlags: 0 @@ -1610,6 +1656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1634,6 +1681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &207934261 MeshFilter: m_ObjectHideFlags: 0 @@ -1686,7 +1734,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1709,6 +1757,7 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -1719,6 +1768,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1726,6 +1780,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1733,10 +1790,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1753,9 +1809,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1772,6 +1832,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &208533895 Light: m_ObjectHideFlags: 0 @@ -1831,6 +1894,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &216458700 @@ -1916,6 +1980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1940,6 +2005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &230260784 MeshFilter: m_ObjectHideFlags: 0 @@ -1995,6 +2061,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2019,6 +2086,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &239392583 MeshFilter: m_ObjectHideFlags: 0 @@ -2074,6 +2142,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2098,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259433369 MeshFilter: m_ObjectHideFlags: 0 @@ -2153,6 +2223,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2177,6 +2248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &270927042 MeshFilter: m_ObjectHideFlags: 0 @@ -2232,6 +2304,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2256,6 +2329,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &276492018 MeshFilter: m_ObjectHideFlags: 0 @@ -2311,6 +2385,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2335,6 +2410,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &279874603 MeshFilter: m_ObjectHideFlags: 0 @@ -2390,6 +2466,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2414,6 +2491,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286864260 MeshFilter: m_ObjectHideFlags: 0 @@ -2469,6 +2547,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2493,6 +2572,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &290550682 MeshFilter: m_ObjectHideFlags: 0 @@ -2548,6 +2628,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2572,6 +2653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &296839945 MeshFilter: m_ObjectHideFlags: 0 @@ -2627,6 +2709,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2651,6 +2734,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303394831 MeshFilter: m_ObjectHideFlags: 0 @@ -2706,6 +2790,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2730,6 +2815,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303878567 MeshFilter: m_ObjectHideFlags: 0 @@ -2785,6 +2871,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2809,6 +2896,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311038003 MeshFilter: m_ObjectHideFlags: 0 @@ -2864,6 +2952,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2888,6 +2977,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &326053888 MeshFilter: m_ObjectHideFlags: 0 @@ -2903,16 +2993,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2983,46 +3103,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &328796436 @@ -3072,6 +3162,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3096,6 +3187,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &328796439 MeshFilter: m_ObjectHideFlags: 0 @@ -3151,6 +3243,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3175,6 +3268,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &341756822 MeshFilter: m_ObjectHideFlags: 0 @@ -3230,6 +3324,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3254,6 +3349,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &350374762 MeshFilter: m_ObjectHideFlags: 0 @@ -3309,6 +3405,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3333,6 +3430,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &360110942 MeshFilter: m_ObjectHideFlags: 0 @@ -3388,6 +3486,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3412,6 +3511,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &372328438 MeshFilter: m_ObjectHideFlags: 0 @@ -3467,6 +3567,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3491,6 +3592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &395776440 MeshFilter: m_ObjectHideFlags: 0 @@ -3546,6 +3648,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3570,6 +3673,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &402203564 MeshFilter: m_ObjectHideFlags: 0 @@ -3625,6 +3729,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3649,6 +3754,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403989726 MeshFilter: m_ObjectHideFlags: 0 @@ -3704,6 +3810,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3728,6 +3835,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &413571831 MeshFilter: m_ObjectHideFlags: 0 @@ -3783,6 +3891,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3807,6 +3916,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414367076 MeshFilter: m_ObjectHideFlags: 0 @@ -3859,7 +3969,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3882,6 +3992,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -3892,6 +4003,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3899,6 +4015,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3906,10 +4025,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -3926,9 +4044,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3945,6 +4067,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &426295405 Light: m_ObjectHideFlags: 0 @@ -4004,6 +4129,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &430017949 @@ -4035,9 +4161,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &430017951 MeshRenderer: @@ -4054,6 +4180,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4078,6 +4205,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &430017952 MeshFilter: m_ObjectHideFlags: 0 @@ -4147,6 +4275,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4171,6 +4300,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437055873 MeshFilter: m_ObjectHideFlags: 0 @@ -4226,6 +4356,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4250,6 +4381,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437361371 MeshFilter: m_ObjectHideFlags: 0 @@ -4305,6 +4437,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4329,6 +4462,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &444731604 MeshFilter: m_ObjectHideFlags: 0 @@ -4384,6 +4518,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4408,6 +4543,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447696771 MeshFilter: m_ObjectHideFlags: 0 @@ -4460,7 +4596,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4483,6 +4619,7 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -4493,6 +4630,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4500,6 +4642,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4507,10 +4652,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -4527,9 +4671,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4546,6 +4694,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &461319428 Light: m_ObjectHideFlags: 0 @@ -4605,6 +4756,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &469890627 @@ -4654,6 +4806,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4678,6 +4831,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &469890630 MeshFilter: m_ObjectHideFlags: 0 @@ -4733,6 +4887,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4757,6 +4912,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &505552224 MeshFilter: m_ObjectHideFlags: 0 @@ -4812,6 +4968,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4836,6 +4993,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531559732 MeshFilter: m_ObjectHideFlags: 0 @@ -4891,6 +5049,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4915,6 +5074,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &557952777 MeshFilter: m_ObjectHideFlags: 0 @@ -4970,6 +5130,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4994,6 +5155,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559229149 MeshFilter: m_ObjectHideFlags: 0 @@ -5049,6 +5211,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5073,6 +5236,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559689558 MeshFilter: m_ObjectHideFlags: 0 @@ -5128,6 +5292,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5152,6 +5317,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &572130308 MeshFilter: m_ObjectHideFlags: 0 @@ -5207,6 +5373,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5231,6 +5398,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &578472782 MeshFilter: m_ObjectHideFlags: 0 @@ -5286,6 +5454,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5310,6 +5479,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &588295910 MeshFilter: m_ObjectHideFlags: 0 @@ -5365,6 +5535,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5389,6 +5560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602930598 MeshFilter: m_ObjectHideFlags: 0 @@ -5444,6 +5616,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5468,6 +5641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &607221212 MeshFilter: m_ObjectHideFlags: 0 @@ -5523,6 +5697,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5547,6 +5722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &628528525 MeshFilter: m_ObjectHideFlags: 0 @@ -5602,6 +5778,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5626,6 +5803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &637490629 MeshFilter: m_ObjectHideFlags: 0 @@ -5681,6 +5859,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5705,6 +5884,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &640826958 MeshFilter: m_ObjectHideFlags: 0 @@ -5760,6 +5940,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5784,6 +5965,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &642911914 MeshFilter: m_ObjectHideFlags: 0 @@ -5839,6 +6021,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5863,6 +6046,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &643134898 MeshFilter: m_ObjectHideFlags: 0 @@ -5918,6 +6102,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5942,6 +6127,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &645820563 MeshFilter: m_ObjectHideFlags: 0 @@ -5997,6 +6183,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6021,6 +6208,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &647684059 MeshFilter: m_ObjectHideFlags: 0 @@ -6076,6 +6264,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6100,6 +6289,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &648188782 MeshFilter: m_ObjectHideFlags: 0 @@ -6155,6 +6345,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6179,6 +6370,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &649749382 MeshFilter: m_ObjectHideFlags: 0 @@ -6234,6 +6426,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6258,6 +6451,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &668693072 MeshFilter: m_ObjectHideFlags: 0 @@ -6313,6 +6507,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6337,6 +6532,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &669754239 MeshFilter: m_ObjectHideFlags: 0 @@ -6392,6 +6588,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6416,6 +6613,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &671857626 MeshFilter: m_ObjectHideFlags: 0 @@ -6471,6 +6669,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6495,6 +6694,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &682974520 MeshFilter: m_ObjectHideFlags: 0 @@ -6550,6 +6750,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6574,6 +6775,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &697148330 MeshFilter: m_ObjectHideFlags: 0 @@ -6629,6 +6831,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6653,6 +6856,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &712399915 MeshFilter: m_ObjectHideFlags: 0 @@ -6708,6 +6912,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6732,6 +6937,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &719811194 MeshFilter: m_ObjectHideFlags: 0 @@ -6787,6 +6993,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6811,6 +7018,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &744018712 MeshFilter: m_ObjectHideFlags: 0 @@ -6866,6 +7074,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6890,6 +7099,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &758209044 MeshFilter: m_ObjectHideFlags: 0 @@ -6942,7 +7152,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6965,6 +7175,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -6975,6 +7186,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6982,6 +7198,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6989,10 +7208,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -7009,9 +7227,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7028,6 +7250,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &762691883 Light: m_ObjectHideFlags: 0 @@ -7087,6 +7312,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &777871935 @@ -7372,6 +7598,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7396,6 +7623,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &779875687 MeshFilter: m_ObjectHideFlags: 0 @@ -7451,6 +7679,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7475,6 +7704,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &781345256 MeshFilter: m_ObjectHideFlags: 0 @@ -7530,6 +7760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7554,6 +7785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &789731996 MeshFilter: m_ObjectHideFlags: 0 @@ -7609,6 +7841,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7633,6 +7866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809657012 MeshFilter: m_ObjectHideFlags: 0 @@ -7688,6 +7922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7712,6 +7947,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &813923243 MeshFilter: m_ObjectHideFlags: 0 @@ -7767,6 +8003,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7791,6 +8028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &820566438 MeshFilter: m_ObjectHideFlags: 0 @@ -7846,6 +8084,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7870,6 +8109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825050274 MeshFilter: m_ObjectHideFlags: 0 @@ -7925,6 +8165,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7949,6 +8190,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825718158 MeshFilter: m_ObjectHideFlags: 0 @@ -8004,6 +8246,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8028,6 +8271,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &842571686 MeshFilter: m_ObjectHideFlags: 0 @@ -8083,6 +8327,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8107,6 +8352,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &853547569 MeshFilter: m_ObjectHideFlags: 0 @@ -8162,6 +8408,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8186,6 +8433,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &869079679 MeshFilter: m_ObjectHideFlags: 0 @@ -8241,6 +8489,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8265,6 +8514,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &875492872 MeshFilter: m_ObjectHideFlags: 0 @@ -8320,6 +8570,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8344,6 +8595,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886690332 MeshFilter: m_ObjectHideFlags: 0 @@ -8399,6 +8651,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8423,6 +8676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &888245113 MeshFilter: m_ObjectHideFlags: 0 @@ -8478,6 +8732,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8502,6 +8757,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &891847955 MeshFilter: m_ObjectHideFlags: 0 @@ -8557,6 +8813,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8581,6 +8838,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901521603 MeshFilter: m_ObjectHideFlags: 0 @@ -8636,6 +8894,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8660,6 +8919,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &904353995 MeshFilter: m_ObjectHideFlags: 0 @@ -8675,16 +8935,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -8755,46 +9045,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &921921080 @@ -8844,6 +9104,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8868,6 +9129,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &921921083 MeshFilter: m_ObjectHideFlags: 0 @@ -8923,6 +9185,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8947,6 +9210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &930171902 MeshFilter: m_ObjectHideFlags: 0 @@ -9002,6 +9266,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9026,6 +9291,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &953810097 MeshFilter: m_ObjectHideFlags: 0 @@ -9063,9 +9329,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &960424436 MeshRenderer: @@ -9082,6 +9348,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9106,6 +9373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &960424437 MeshFilter: m_ObjectHideFlags: 0 @@ -9175,6 +9443,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9199,6 +9468,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &965748961 MeshFilter: m_ObjectHideFlags: 0 @@ -9254,6 +9524,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9278,6 +9549,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &980798177 MeshFilter: m_ObjectHideFlags: 0 @@ -9333,6 +9605,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9357,6 +9630,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &981646854 MeshFilter: m_ObjectHideFlags: 0 @@ -9412,6 +9686,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9436,6 +9711,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991737266 MeshFilter: m_ObjectHideFlags: 0 @@ -9491,6 +9767,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9515,6 +9792,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1001326874 MeshFilter: m_ObjectHideFlags: 0 @@ -9570,6 +9848,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9594,6 +9873,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1012989238 MeshFilter: m_ObjectHideFlags: 0 @@ -9649,6 +9929,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9673,6 +9954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1031276030 MeshFilter: m_ObjectHideFlags: 0 @@ -9728,6 +10010,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9752,6 +10035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1038229444 MeshFilter: m_ObjectHideFlags: 0 @@ -9807,6 +10091,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9831,6 +10116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1040771379 MeshFilter: m_ObjectHideFlags: 0 @@ -9886,6 +10172,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9910,6 +10197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1043930410 MeshFilter: m_ObjectHideFlags: 0 @@ -9965,6 +10253,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9989,6 +10278,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1046327772 MeshFilter: m_ObjectHideFlags: 0 @@ -10044,6 +10334,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10068,6 +10359,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1057088725 MeshFilter: m_ObjectHideFlags: 0 @@ -10123,6 +10415,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10147,6 +10440,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1061504061 MeshFilter: m_ObjectHideFlags: 0 @@ -10202,6 +10496,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10226,6 +10521,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1080468800 MeshFilter: m_ObjectHideFlags: 0 @@ -10281,6 +10577,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10305,6 +10602,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1096914707 MeshFilter: m_ObjectHideFlags: 0 @@ -10360,6 +10658,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10384,6 +10683,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1108541228 MeshFilter: m_ObjectHideFlags: 0 @@ -10439,6 +10739,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10463,6 +10764,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123246062 MeshFilter: m_ObjectHideFlags: 0 @@ -10518,6 +10820,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10542,6 +10845,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1127700270 MeshFilter: m_ObjectHideFlags: 0 @@ -10597,6 +10901,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10621,6 +10926,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1166530868 MeshFilter: m_ObjectHideFlags: 0 @@ -10676,6 +10982,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10700,6 +11007,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167094695 MeshFilter: m_ObjectHideFlags: 0 @@ -10755,6 +11063,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10779,6 +11088,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1168327892 MeshFilter: m_ObjectHideFlags: 0 @@ -10834,6 +11144,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10858,6 +11169,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1183782476 MeshFilter: m_ObjectHideFlags: 0 @@ -10913,6 +11225,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10937,6 +11250,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1184022654 MeshFilter: m_ObjectHideFlags: 0 @@ -10992,6 +11306,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11016,6 +11331,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1185794389 MeshFilter: m_ObjectHideFlags: 0 @@ -11071,6 +11387,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11095,6 +11412,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1204878890 MeshFilter: m_ObjectHideFlags: 0 @@ -11150,6 +11468,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11174,6 +11493,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1213431291 MeshFilter: m_ObjectHideFlags: 0 @@ -11229,6 +11549,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11253,6 +11574,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1215106502 MeshFilter: m_ObjectHideFlags: 0 @@ -11308,6 +11630,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11332,6 +11655,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1220612084 MeshFilter: m_ObjectHideFlags: 0 @@ -11387,6 +11711,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11411,6 +11736,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1221260582 MeshFilter: m_ObjectHideFlags: 0 @@ -11466,6 +11792,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11490,6 +11817,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1231156226 MeshFilter: m_ObjectHideFlags: 0 @@ -11545,6 +11873,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11569,6 +11898,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1234711635 MeshFilter: m_ObjectHideFlags: 0 @@ -11624,6 +11954,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11648,6 +11979,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236035745 MeshFilter: m_ObjectHideFlags: 0 @@ -11703,6 +12035,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11727,6 +12060,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1239462281 MeshFilter: m_ObjectHideFlags: 0 @@ -11782,6 +12116,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11806,6 +12141,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1257610671 MeshFilter: m_ObjectHideFlags: 0 @@ -11861,6 +12197,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11885,6 +12222,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1266980223 MeshFilter: m_ObjectHideFlags: 0 @@ -11940,6 +12278,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11964,6 +12303,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1282175057 MeshFilter: m_ObjectHideFlags: 0 @@ -12019,6 +12359,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12043,6 +12384,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1285940584 MeshFilter: m_ObjectHideFlags: 0 @@ -12098,6 +12440,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12122,6 +12465,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1293709081 MeshFilter: m_ObjectHideFlags: 0 @@ -12177,6 +12521,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12201,6 +12546,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1296742209 MeshFilter: m_ObjectHideFlags: 0 @@ -12274,6 +12620,21 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -12335,21 +12696,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1314322408 @@ -12399,6 +12750,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12423,6 +12775,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1314322411 MeshFilter: m_ObjectHideFlags: 0 @@ -12478,6 +12831,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12502,6 +12856,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1322864851 MeshFilter: m_ObjectHideFlags: 0 @@ -12557,6 +12912,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12581,6 +12937,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1325976481 MeshFilter: m_ObjectHideFlags: 0 @@ -12636,6 +12993,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12660,6 +13018,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1339361874 MeshFilter: m_ObjectHideFlags: 0 @@ -12715,6 +13074,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12739,6 +13099,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344659076 MeshFilter: m_ObjectHideFlags: 0 @@ -12794,6 +13155,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12818,6 +13180,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1353796882 MeshFilter: m_ObjectHideFlags: 0 @@ -12873,6 +13236,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12897,6 +13261,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1355408080 MeshFilter: m_ObjectHideFlags: 0 @@ -12952,6 +13317,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12976,6 +13342,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1359668098 MeshFilter: m_ObjectHideFlags: 0 @@ -13031,6 +13398,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13055,6 +13423,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1361440978 MeshFilter: m_ObjectHideFlags: 0 @@ -13110,6 +13479,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13134,6 +13504,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1363775923 MeshFilter: m_ObjectHideFlags: 0 @@ -13189,6 +13560,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13213,6 +13585,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1378795295 MeshFilter: m_ObjectHideFlags: 0 @@ -13268,6 +13641,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13292,6 +13666,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1379653303 MeshFilter: m_ObjectHideFlags: 0 @@ -13344,7 +13719,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13367,6 +13742,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -13377,6 +13753,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13384,6 +13765,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13391,10 +13775,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13411,9 +13794,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13430,6 +13817,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386862605 Light: m_ObjectHideFlags: 0 @@ -13489,6 +13879,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1388287949 @@ -13538,6 +13929,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13562,6 +13954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1388287952 MeshFilter: m_ObjectHideFlags: 0 @@ -13617,6 +14010,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13641,6 +14035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1389526138 MeshFilter: m_ObjectHideFlags: 0 @@ -13696,6 +14091,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13720,6 +14116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1422354403 MeshFilter: m_ObjectHideFlags: 0 @@ -13775,6 +14172,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13799,6 +14197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1428342881 MeshFilter: m_ObjectHideFlags: 0 @@ -13814,16 +14213,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -13894,46 +14323,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1460143124 @@ -13983,6 +14382,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14007,6 +14407,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460143127 MeshFilter: m_ObjectHideFlags: 0 @@ -14062,6 +14463,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14086,6 +14488,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1463956016 MeshFilter: m_ObjectHideFlags: 0 @@ -14141,6 +14544,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14165,6 +14569,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1482492333 MeshFilter: m_ObjectHideFlags: 0 @@ -14220,6 +14625,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14244,6 +14650,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1493613822 MeshFilter: m_ObjectHideFlags: 0 @@ -14299,6 +14706,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14323,6 +14731,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1511303639 MeshFilter: m_ObjectHideFlags: 0 @@ -14378,6 +14787,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14402,6 +14812,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1521266381 MeshFilter: m_ObjectHideFlags: 0 @@ -14457,6 +14868,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14481,6 +14893,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1528394421 MeshFilter: m_ObjectHideFlags: 0 @@ -14536,6 +14949,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14560,6 +14974,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1531121810 MeshFilter: m_ObjectHideFlags: 0 @@ -14615,6 +15030,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14639,6 +15055,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1566466870 MeshFilter: m_ObjectHideFlags: 0 @@ -14694,6 +15111,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14718,6 +15136,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1577879441 MeshFilter: m_ObjectHideFlags: 0 @@ -14773,6 +15192,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14797,6 +15217,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1587290154 MeshFilter: m_ObjectHideFlags: 0 @@ -14852,6 +15273,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14876,6 +15298,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591162017 MeshFilter: m_ObjectHideFlags: 0 @@ -14891,16 +15314,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(ON) test with 4 materials + + and 4 meshes checking shadow + behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -14971,6 +15429,30 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Name + value: Text + objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} +--- !u!1001 &1606173312 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_CharacterSize @@ -14979,12 +15461,7 @@ PrefabInstance: - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text - value: 'Batching(ON) test with 4 materials - - and 4 meshes checking shadow - behavior - - with different light type shadows' + value: Spot Pyramid Shape objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15011,30 +15488,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} ---- !u!1001 &1606173312 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Name - value: Text (3) - objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15105,46 +15558,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1621115680 @@ -15194,6 +15617,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15218,6 +15642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1621115683 MeshFilter: m_ObjectHideFlags: 0 @@ -15273,6 +15698,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15297,6 +15723,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1681693788 MeshFilter: m_ObjectHideFlags: 0 @@ -15352,6 +15779,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15376,6 +15804,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1687574455 MeshFilter: m_ObjectHideFlags: 0 @@ -15431,6 +15860,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15455,6 +15885,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1689229584 MeshFilter: m_ObjectHideFlags: 0 @@ -15510,6 +15941,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15534,6 +15966,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1696616959 MeshFilter: m_ObjectHideFlags: 0 @@ -15589,6 +16022,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15613,6 +16047,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705199462 MeshFilter: m_ObjectHideFlags: 0 @@ -15668,6 +16103,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15692,6 +16128,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705921691 MeshFilter: m_ObjectHideFlags: 0 @@ -15747,6 +16184,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15771,6 +16209,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723596831 MeshFilter: m_ObjectHideFlags: 0 @@ -15826,6 +16265,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15850,6 +16290,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1726899976 MeshFilter: m_ObjectHideFlags: 0 @@ -15905,6 +16346,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15929,6 +16371,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750460725 MeshFilter: m_ObjectHideFlags: 0 @@ -15966,9 +16409,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1771681643 MeshRenderer: @@ -15985,6 +16428,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16009,6 +16453,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1771681644 MeshFilter: m_ObjectHideFlags: 0 @@ -16078,6 +16523,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16102,6 +16548,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777647186 MeshFilter: m_ObjectHideFlags: 0 @@ -16157,6 +16604,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16181,6 +16629,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1789371758 MeshFilter: m_ObjectHideFlags: 0 @@ -16236,6 +16685,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16260,6 +16710,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791411182 MeshFilter: m_ObjectHideFlags: 0 @@ -16315,6 +16766,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16339,6 +16791,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1839709220 MeshFilter: m_ObjectHideFlags: 0 @@ -16394,6 +16847,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16418,6 +16872,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1841428342 MeshFilter: m_ObjectHideFlags: 0 @@ -16473,6 +16928,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16497,6 +16953,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1848109756 MeshFilter: m_ObjectHideFlags: 0 @@ -16534,9 +16991,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1856875282 MeshRenderer: @@ -16553,6 +17010,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16577,6 +17035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1856875283 MeshFilter: m_ObjectHideFlags: 0 @@ -16646,6 +17105,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16670,6 +17130,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1866992478 MeshFilter: m_ObjectHideFlags: 0 @@ -16725,6 +17186,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16749,6 +17211,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1867244841 MeshFilter: m_ObjectHideFlags: 0 @@ -16804,6 +17267,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16828,6 +17292,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1877582089 MeshFilter: m_ObjectHideFlags: 0 @@ -16883,6 +17348,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16907,6 +17373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1885217152 MeshFilter: m_ObjectHideFlags: 0 @@ -16962,6 +17429,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16986,6 +17454,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1887731496 MeshFilter: m_ObjectHideFlags: 0 @@ -17041,6 +17510,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17065,6 +17535,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1895596062 MeshFilter: m_ObjectHideFlags: 0 @@ -17120,6 +17591,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17144,6 +17616,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1901667384 MeshFilter: m_ObjectHideFlags: 0 @@ -17152,82 +17625,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901667381} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1907606003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1926583767 GameObject: m_ObjectHideFlags: 0 @@ -17275,6 +17672,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17299,6 +17697,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1926583770 MeshFilter: m_ObjectHideFlags: 0 @@ -17354,6 +17753,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17378,6 +17778,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1928970123 MeshFilter: m_ObjectHideFlags: 0 @@ -17433,6 +17834,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17457,6 +17859,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1957957041 MeshFilter: m_ObjectHideFlags: 0 @@ -17512,6 +17915,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17536,6 +17940,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1970018806 MeshFilter: m_ObjectHideFlags: 0 @@ -17591,6 +17996,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17615,6 +18021,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1974510906 MeshFilter: m_ObjectHideFlags: 0 @@ -17670,6 +18077,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17694,6 +18102,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1981351887 MeshFilter: m_ObjectHideFlags: 0 @@ -17749,6 +18158,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17773,6 +18183,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2006189128 MeshFilter: m_ObjectHideFlags: 0 @@ -17828,6 +18239,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17852,6 +18264,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2019026764 MeshFilter: m_ObjectHideFlags: 0 @@ -17907,6 +18320,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17931,6 +18345,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2027312071 MeshFilter: m_ObjectHideFlags: 0 @@ -17986,6 +18401,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18010,6 +18426,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2036693317 MeshFilter: m_ObjectHideFlags: 0 @@ -18065,6 +18482,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18089,6 +18507,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2037183620 MeshFilter: m_ObjectHideFlags: 0 @@ -18144,6 +18563,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18168,6 +18588,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2038469265 MeshFilter: m_ObjectHideFlags: 0 @@ -18223,6 +18644,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18247,6 +18669,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2039296765 MeshFilter: m_ObjectHideFlags: 0 @@ -18302,6 +18725,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18326,6 +18750,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2040827661 MeshFilter: m_ObjectHideFlags: 0 @@ -18341,16 +18766,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -18421,46 +18876,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &2064361793 @@ -18510,6 +18935,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18534,6 +18960,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2064361796 MeshFilter: m_ObjectHideFlags: 0 @@ -18589,6 +19016,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18613,6 +19041,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2070414141 MeshFilter: m_ObjectHideFlags: 0 @@ -18668,6 +19097,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18692,6 +19122,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079107238 MeshFilter: m_ObjectHideFlags: 0 @@ -18747,6 +19178,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18771,6 +19203,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2084708072 MeshFilter: m_ObjectHideFlags: 0 @@ -18826,6 +19259,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18850,6 +19284,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2090701780 MeshFilter: m_ObjectHideFlags: 0 @@ -18905,6 +19340,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18929,6 +19365,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2096080274 MeshFilter: m_ObjectHideFlags: 0 @@ -18984,6 +19421,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19008,6 +19446,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2097382540 MeshFilter: m_ObjectHideFlags: 0 @@ -19045,9 +19484,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2106720174 MeshRenderer: @@ -19064,6 +19503,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19088,6 +19528,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2106720175 MeshFilter: m_ObjectHideFlags: 0 @@ -19157,6 +19598,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19181,6 +19623,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2119204914 MeshFilter: m_ObjectHideFlags: 0 @@ -19236,6 +19679,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19260,6 +19704,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2127647011 MeshFilter: m_ObjectHideFlags: 0 @@ -19315,6 +19760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19339,6 +19785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136776845 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity index 0821d36bd72..d8a50c2b3a5 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity @@ -318,6 +318,11 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity index 6f16b5df781..054b0799b05 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity @@ -323,6 +323,11 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped @@ -461,6 +466,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -479,6 +485,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &85208911 Light: m_ObjectHideFlags: 0 @@ -1107,8 +1114,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 8192 @@ -1399,8 +1404,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 10 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 1024 @@ -1543,8 +1546,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 4096 @@ -2809,6 +2810,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2827,6 +2829,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1302253251 Light: m_ObjectHideFlags: 0 @@ -3575,8 +3578,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 2048 @@ -4080,8 +4081,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 1 @@ -4158,8 +4157,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 16384 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity index 2464d215047..bc04e6e63c3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity @@ -714,6 +714,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -723,6 +728,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -741,6 +747,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -830,6 +839,8 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0 AverageCorrectnessThreshold: 0 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -837,6 +848,7 @@ MonoBehaviour: waitFrames: 5 xrCompatible: 1 xrThresholdMultiplier: 1 + renderGraphCompatible: 1 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 0} --- !u!1 &593565746 @@ -1143,6 +1155,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &764415611 @@ -1171,7 +1184,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 2048 @@ -1252,6 +1265,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1270,6 +1284,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!21 &808236715 Material: serializedVersion: 6 @@ -1438,6 +1453,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -1601,6 +1617,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &899885052 GameObject: @@ -1900,6 +1917,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -2063,6 +2081,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &1266377334 GameObject: @@ -2589,6 +2608,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2598,6 +2622,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2616,6 +2641,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2795,6 +2823,11 @@ PrefabInstance: propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1569434673 @@ -3252,6 +3285,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3415,6 +3449,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2074857581 GameObject: @@ -3620,6 +3655,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3783,6 +3819,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2085158283 GameObject: @@ -4047,6 +4084,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4210,6 +4248,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2099876030 GameObject: @@ -4475,6 +4514,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4638,4 +4678,5 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] From 7b8acc08944df4b11244ee97a1877cee91d55be9 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 11:20:23 +0200 Subject: [PATCH 17/53] Updated yamato with new render graph configurations --- .yamato/all-hdrp.yml | 6 ++++ .yamato/hdrp-win-dx11.yml | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index afefcfb3c78..b42c3c659f7 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -7,6 +7,8 @@ All_HDRP_trunk: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk @@ -26,6 +28,8 @@ All_HDRP_fast-trunk: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk @@ -45,6 +49,8 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 63d6ccf808c..c6e30b686e1 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -38,6 +38,26 @@ HDRP_Win_DX11_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_trunk: + name: HDRP on Win_DX11_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_trunk: name: HDRP on Win_DX11_editmode on version trunk agent: @@ -144,6 +164,26 @@ HDRP_Win_DX11_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_DX11_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_fast-trunk: name: HDRP on Win_DX11_editmode on version fast-trunk agent: @@ -252,6 +292,27 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_DX11_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: From 46a64a353f2dc2effcdfc098242bd7f37253f5a7 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 12:02:44 +0200 Subject: [PATCH 18/53] Fixed lens distortion --- .../Runtime/PostProcessing/PostProcessSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs index ff9b87e4328..08500ca4ac1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs @@ -791,7 +791,7 @@ static void DoUberPostProcess( in UberPostParameters parameters, // Lens distortion cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._DistortionParams1, parameters.lensDistortionParams1); - cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._DistortionParams2, parameters.lensDistortionParams1); + cmd.SetComputeVectorParam(parameters.uberPostCS, HDShaderIDs._DistortionParams2, parameters.lensDistortionParams2); // Chromatic aberration cmd.SetComputeTextureParam(parameters.uberPostCS, parameters.uberPostKernel, HDShaderIDs._ChromaSpectralLut, parameters.spectralLut); From 76a7c003456f40c5e84dd454a9c291b2b57ade64 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 13:07:43 +0200 Subject: [PATCH 19/53] Reenabled 4021 --- .../Scenes/4x_PostProcessing/4021_LensDistortion.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index 6cb43095307..f144fd69883 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -531,7 +531,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderGraphCompatible - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 9c4c38e7544436a7992754a780c919e1946bd0f3 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 13:53:03 +0200 Subject: [PATCH 20/53] Added an option to ignore tests when render graph is enabled. --- .../TestRunner/HDRP_GraphicTestRunner.cs | 8 ++++++++ com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs | 1 + 2 files changed, 9 insertions(+) diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs index 094e27a628a..db677ae9feb 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs @@ -58,6 +58,14 @@ public IEnumerator Run(GraphicsTestCase testCase) } } + if (HDRenderPipeline.enableRenderGraphTests) + { + if (!settings.renderGraphCompatible) + { + Assert.Ignore("Test scene is not compatible with Render Graph and will be skipped."); + } + } + if (settings.doBeforeTest != null) { settings.doBeforeTest.Invoke(); diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs index fd673a19472..bd2fa578af2 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs @@ -23,6 +23,7 @@ public class HDRP_TestSettings : GraphicsTestSettings [UnityEngine.Range(1.0f, 10.0f)] public float xrThresholdMultiplier = 1.0f; + public bool renderGraphCompatible = true; public bool checkMemoryAllocation = true; From e5d8dd0767e6a4b8336eb1e2a0dc44e531305686 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 11:04:34 +0200 Subject: [PATCH 21/53] Disabled for render graph tests that are currently broken. --- .../2x_Lighting/2402_Area_Rect_Shadow.unity | 178 +-- .../Scenes/2x_Lighting/2501_LightLayers.unity | 178 +-- .../2x_Lighting/2601_SSAO_HalfRes.unity | 254 ++-- .../2x_Lighting/2602_SSAO_FullRes.unity | 253 ++-- .../2x_Lighting/2701_TransparentSSR.unity | 41 +- .../3x_DebugView/3002_DebugLightLayers.unity | 41 +- .../4011_MotionBlur_PerObject.unity | 275 ++-- .../4013_TransparentMotionVector.unity | 282 ++-- .../4021_LensDistortion.unity | 20 +- .../4022_PaniniProjection.unity | 20 +- .../Scenes/4x_PostProcessing/4051_SMAA.unity | 380 ++++-- .../Scenes/4x_PostProcessing/4052_TAA.unity | 31 +- .../4053_TAA-FP16Alpha.unity | 5 + .../4060_CustomPostProcess.unity | 20 +- .../4x_PostProcessing/4080_DepthOfField.unity | 19 +- .../4081_DepthOfField-FP16Alpha.unity | 30 +- .../5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 5 + .../8x_ShaderGraph/8103_PrePostPass.unity | 40 +- .../8106_UnlitShadowMatte.unity | 259 ++-- .../9x_Other/9401_MSAAForwardBoth.unity | 59 +- .../9x_Other/9401_MSAAForwardOnly.unity | 59 +- .../9x_Other/9402_AlphaToMask-Graph.unity | 12 +- .../9x_Other/9402_AlphaToMask-HDRP.unity | 12 +- .../Scenes/9x_Other/9500_LightScripting.unity | 29 +- .../9601_SkinnedMeshBatching-Off.unity | 163 ++- .../9602_SkinnedMeshBatching-On.unity | 176 ++- .../9603_MeshRendererBatching-Off.unity | 1191 ++++++++++++----- .../9604_MeshRendererBatching-On.unity | 1149 +++++++++++----- .../9x_Other/9700_CustomPass_FullScreen.unity | 5 + .../9701_CustomPass_DrawRenderers.unity | 21 +- .../Scenes/9x_Other/9901_AOV_buffers.unity | 43 +- 31 files changed, 3485 insertions(+), 1765 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity index 868997590c3..f957e14a6e1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: d1e6b80487b4523419f8b0808a8fe032, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -128,11 +131,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (2) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -193,6 +191,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (2) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &189362331 @@ -225,11 +228,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 6 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 1024 m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 200 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -241,12 +247,11 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_LightTypeExtent: 1 - m_SpotLightShape: 0 m_ShapeWidth: 0.5 m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -257,7 +262,21 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15.5 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -265,10 +284,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -280,13 +298,18 @@ MonoBehaviour: m_VolumetricShadowDimmer: 1 m_ShadowFadeDistance: 10000 m_UseContactShadow: - m_Level: 0 - m_UseOverride: 1 m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 - m_ConstantBias: 0.15 + m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -303,6 +326,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &189362334 Light: m_ObjectHideFlags: 0 @@ -362,6 +388,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 10} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &189362335 @@ -385,11 +412,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (3) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -450,84 +472,13 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (3) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} ---- !u!114 &557812783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1001 &972798640 PrefabInstance: m_ObjectHideFlags: 0 @@ -535,11 +486,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (1) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -600,6 +546,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (1) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1001 &1071061321 @@ -609,11 +560,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -674,6 +620,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &1126674573 @@ -708,9 +659,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: a435593e8df5fec4ab2279b9647b1816, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 557812783} - m_SkySettingsFromProfile: {fileID: -8584095877685573462, guid: a435593e8df5fec4ab2279b9647b1816, - type: 2} --- !u!114 &1126674575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,6 +761,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2115918006 @@ -844,9 +797,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2115918008 MeshRenderer: @@ -863,6 +816,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity index 32b374d9d61..fd382b4c0df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity @@ -358,7 +358,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -406,6 +406,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -438,6 +439,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -456,6 +458,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &58980334 Light: m_ObjectHideFlags: 0 @@ -515,6 +518,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.7318046} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &65356095 @@ -561,7 +565,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -609,6 +613,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -641,6 +646,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -659,6 +665,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &65356099 Light: m_ObjectHideFlags: 0 @@ -718,6 +725,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.6893601} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &96461834 @@ -1811,7 +1819,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1859,6 +1867,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1891,6 +1900,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1909,6 +1919,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &253966103 Light: m_ObjectHideFlags: 0 @@ -1968,6 +1979,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &266337115 @@ -2146,107 +2158,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274728986} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &306112926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 200 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} - enableBackplate: - m_OverrideState: 0 - m_Value: 0 - backplateType: - m_OverrideState: 0 - m_Value: 0 - groundLevel: - m_OverrideState: 0 - m_Value: 0 - scale: - m_OverrideState: 0 - m_Value: {x: 32, y: 32} - projectionDistance: - m_OverrideState: 0 - m_Value: 16 - min: 0.0000001 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 100 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 --- !u!1 &331787933 GameObject: m_ObjectHideFlags: 0 @@ -2732,7 +2643,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2780,6 +2691,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2812,6 +2724,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2830,6 +2743,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &677342031 Light: m_ObjectHideFlags: 0 @@ -2889,6 +2803,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &698110940 @@ -3308,6 +3223,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4190,7 +4108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4238,6 +4156,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4270,6 +4189,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4288,6 +4208,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &985985205 Light: m_ObjectHideFlags: 0 @@ -4347,6 +4268,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &990865355 @@ -5679,7 +5601,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5727,6 +5649,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5759,6 +5682,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5777,6 +5701,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386441945 Light: m_ObjectHideFlags: 0 @@ -5836,6 +5761,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1422636729 @@ -5882,7 +5808,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5930,6 +5856,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5962,6 +5889,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5980,6 +5908,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1422636733 Light: m_ObjectHideFlags: 0 @@ -6039,6 +5968,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 1.441993, w: 3.2154703} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1433395784 @@ -6664,7 +6594,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6712,6 +6642,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6744,6 +6675,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6762,6 +6694,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1687167846 Light: m_ObjectHideFlags: 0 @@ -6821,6 +6754,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1730395417 @@ -7271,6 +7205,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -7687,6 +7626,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -8951,6 +8893,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -8960,6 +8907,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -8978,6 +8926,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9055,6 +9006,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -9064,6 +9020,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -9082,6 +9039,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity index ac782911aea..68d9cc8b2ae 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: a5b7c221c4f9f984c9dfa998b2f282ce, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -257,15 +261,42 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264148765 + value: 70005818654557 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -477,32 +508,15 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 + propertyPath: checkMemoryAllocation + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +552,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -562,6 +578,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820961446 MeshFilter: m_ObjectHideFlags: 0 @@ -630,6 +647,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -654,6 +673,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1832587852 MeshFilter: m_ObjectHideFlags: 0 @@ -722,6 +742,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -746,6 +768,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1873845493 MeshFilter: m_ObjectHideFlags: 0 @@ -779,7 +802,6 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} - - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -787,7 +809,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700540 +--- !u!114 &2023700541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -796,98 +818,110 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 ---- !u!114 &2023700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023700539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 - m_Version: 5 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - lightlayersMask: 1 - linkShadowLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -896,8 +930,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -946,6 +981,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity index 65d9f609cd2..fdb0950f687 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 87f2cf15e682aa241982fc3c774314bc, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -257,15 +261,42 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264148765 + value: 70005818654557 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -477,32 +508,10 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +547,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -562,6 +573,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &908551374 MeshFilter: m_ObjectHideFlags: 0 @@ -630,6 +642,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -654,6 +668,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1063449301 MeshFilter: m_ObjectHideFlags: 0 @@ -722,6 +737,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -746,6 +763,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1931848246 MeshFilter: m_ObjectHideFlags: 0 @@ -779,7 +797,6 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} - - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -787,7 +804,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700540 +--- !u!114 &2023700541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -796,98 +813,110 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 ---- !u!114 &2023700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023700539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 - m_Version: 5 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - lightlayersMask: 1 - linkShadowLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -896,8 +925,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -946,6 +976,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity index c06dd265b91..c5d8ab351eb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -164,7 +166,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -470,7 +472,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -518,6 +520,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -550,6 +553,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -566,6 +570,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &280720572 Light: m_ObjectHideFlags: 0 @@ -625,6 +632,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &280720573 @@ -779,7 +787,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -896,8 +904,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &491657228 Transform: m_ObjectHideFlags: 1 @@ -1401,7 +1407,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1625,7 +1631,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1850,7 +1856,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2520,7 +2526,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2711,7 +2717,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2807,7 +2813,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2903,7 +2909,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2985,7 +2991,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3095,7 +3101,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3224,7 +3230,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3548,6 +3554,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 3558f110980f9af48b96167a74d9bf69, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2024456295 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity index f7f9b1a295d..e68822c81df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity @@ -121,7 +121,7 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 maxJobWorkers: 0 - keepTiles: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -155,7 +155,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -203,6 +203,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -235,6 +236,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -251,6 +253,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &16453702 Light: m_ObjectHideFlags: 0 @@ -310,6 +315,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &16453703 @@ -356,7 +362,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -404,6 +410,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -436,6 +443,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -452,6 +460,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &83800134 Light: m_ObjectHideFlags: 0 @@ -511,6 +522,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.34} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &83800135 @@ -653,8 +665,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -856,6 +866,11 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: DebugViewController, Unity.RenderPipelines.HighDefinition-Tests.Runtime objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &719009298 @@ -1359,7 +1374,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1407,6 +1422,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1439,6 +1455,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1455,6 +1472,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1629224201 Light: m_ObjectHideFlags: 0 @@ -1514,6 +1534,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1629224202 @@ -2093,6 +2114,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0.53 --- !u!4 &2035111235 @@ -2121,7 +2143,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 2 m_ObsoleteUseShadowQualitySettings: 1 m_ObsoleteCustomShadowResolution: 1024 @@ -2169,6 +2191,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2201,6 +2224,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.005 - 0.015 @@ -2217,6 +2241,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &2132904863 GameObject: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity index e95f3cfdc26..7871e0c33d1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c35a6f302d21bc0409b93c78214222e3, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -174,6 +178,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -198,6 +204,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &102126622 Transform: m_ObjectHideFlags: 0 @@ -267,31 +274,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -315,12 +297,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -512,6 +494,41 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteRenderingPath + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &177840196 stripped @@ -596,6 +613,8 @@ MeshRenderer: m_MotionVectors: 0 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -620,6 +639,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -706,6 +726,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -730,6 +752,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &428956473 MeshFilter: m_ObjectHideFlags: 0 @@ -816,6 +839,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -840,6 +865,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &710282033 MeshFilter: m_ObjectHideFlags: 0 @@ -873,7 +899,6 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} - - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -881,7 +906,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016620 +--- !u!114 &795016621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -890,100 +915,110 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &795016621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795016619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -992,8 +1027,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -1042,6 +1078,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &795016623 @@ -1122,6 +1159,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1146,6 +1185,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1071859215 MeshFilter: m_ObjectHideFlags: 0 @@ -1222,6 +1262,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1246,6 +1288,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1316705464 Transform: m_ObjectHideFlags: 0 @@ -1387,6 +1430,8 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1411,6 +1456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1934046221 MeshFilter: m_ObjectHideFlags: 0 @@ -1487,6 +1533,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1511,6 +1559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &2058568487 Transform: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity index cc313b94bbd..7c0300c865a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 65750d7cf7c87af4bb393c06fcbc9907, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -175,41 +179,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 320 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 180 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -233,12 +202,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -430,6 +399,51 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteRenderingPath + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &309473258 @@ -496,6 +510,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -520,6 +536,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -553,7 +570,6 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} - - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -561,7 +577,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016620 +--- !u!114 &795016621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -570,100 +586,110 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &795016621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795016619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -672,8 +698,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -722,6 +749,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &795016623 @@ -830,9 +858,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1483280835 MeshRenderer: @@ -848,6 +876,8 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -872,6 +902,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1483280836 MeshFilter: m_ObjectHideFlags: 0 @@ -932,6 +963,7 @@ MonoBehaviour: settingType: 1 gBuffer: 0 fullScreenDebugMode: 14 + lightlayers: 0 --- !u!114 &1618510980 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index 733a1cfd5be..6cb43095307 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 1219cfc7625a6e34e9b81f20088b6c94, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,6 +204,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -224,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -314,12 +321,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -521,5 +528,10 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity index 8f377bac91c..bc8bd1f9681 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 1dea28949d52d764fa2f6f75a37f742c, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,6 +204,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -224,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -319,12 +326,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -526,5 +533,10 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity index 590ae2d5a80..8944b649e7b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8dc0d3965082d3b44a051ebc67373c24, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -180,6 +184,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -204,6 +210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &40006672 MeshFilter: m_ObjectHideFlags: 0 @@ -328,6 +335,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -352,6 +361,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158095357 MeshFilter: m_ObjectHideFlags: 0 @@ -420,6 +430,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -444,6 +456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172909229 MeshFilter: m_ObjectHideFlags: 0 @@ -512,6 +525,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -536,6 +551,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &234304205 MeshFilter: m_ObjectHideFlags: 0 @@ -604,6 +620,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -628,6 +646,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &307441730 MeshFilter: m_ObjectHideFlags: 0 @@ -696,6 +715,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -720,6 +741,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &329988774 MeshFilter: m_ObjectHideFlags: 0 @@ -788,6 +810,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -812,6 +836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385520400 MeshFilter: m_ObjectHideFlags: 0 @@ -880,6 +905,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -904,6 +931,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &396827034 MeshFilter: m_ObjectHideFlags: 0 @@ -972,6 +1000,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -996,6 +1026,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403782451 MeshFilter: m_ObjectHideFlags: 0 @@ -1064,6 +1095,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1088,6 +1121,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &408685716 MeshFilter: m_ObjectHideFlags: 0 @@ -1156,6 +1190,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1180,6 +1216,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &438277602 MeshFilter: m_ObjectHideFlags: 0 @@ -1248,6 +1285,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1272,6 +1311,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447990307 MeshFilter: m_ObjectHideFlags: 0 @@ -1340,6 +1380,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1364,6 +1406,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &466247374 MeshFilter: m_ObjectHideFlags: 0 @@ -1432,6 +1475,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1456,6 +1501,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &470233058 MeshFilter: m_ObjectHideFlags: 0 @@ -1524,6 +1570,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1548,6 +1596,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475510514 MeshFilter: m_ObjectHideFlags: 0 @@ -1616,6 +1665,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1640,6 +1691,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545534896 MeshFilter: m_ObjectHideFlags: 0 @@ -1677,9 +1729,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -1695,6 +1747,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1719,6 +1773,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &552920928 MeshFilter: m_ObjectHideFlags: 0 @@ -1801,6 +1856,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1825,6 +1882,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &574338704 MeshFilter: m_ObjectHideFlags: 0 @@ -1893,6 +1951,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1917,6 +1977,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &590011005 MeshFilter: m_ObjectHideFlags: 0 @@ -1985,6 +2046,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2009,6 +2072,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &627111561 MeshFilter: m_ObjectHideFlags: 0 @@ -2077,6 +2141,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2101,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &663310342 MeshFilter: m_ObjectHideFlags: 0 @@ -2169,6 +2236,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2193,6 +2262,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &692812422 MeshFilter: m_ObjectHideFlags: 0 @@ -2261,6 +2331,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2285,6 +2357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &695012948 MeshFilter: m_ObjectHideFlags: 0 @@ -2353,6 +2426,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2377,6 +2452,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &747987085 MeshFilter: m_ObjectHideFlags: 0 @@ -2445,6 +2521,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2469,6 +2547,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &769543522 MeshFilter: m_ObjectHideFlags: 0 @@ -2537,6 +2616,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2561,6 +2642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &794411577 MeshFilter: m_ObjectHideFlags: 0 @@ -2629,6 +2711,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2653,6 +2737,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809298687 MeshFilter: m_ObjectHideFlags: 0 @@ -2721,6 +2806,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2745,6 +2832,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &810879982 MeshFilter: m_ObjectHideFlags: 0 @@ -2813,6 +2901,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2837,6 +2927,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &815359632 MeshFilter: m_ObjectHideFlags: 0 @@ -2905,6 +2996,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2929,6 +3022,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &835098136 MeshFilter: m_ObjectHideFlags: 0 @@ -2997,6 +3091,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3021,6 +3117,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &865880060 MeshFilter: m_ObjectHideFlags: 0 @@ -3089,6 +3186,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3113,6 +3212,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &927672921 MeshFilter: m_ObjectHideFlags: 0 @@ -3181,6 +3281,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3205,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &973608318 MeshFilter: m_ObjectHideFlags: 0 @@ -3273,6 +3376,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3297,6 +3402,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1017656388 MeshFilter: m_ObjectHideFlags: 0 @@ -3365,6 +3471,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3389,6 +3497,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1042596661 MeshFilter: m_ObjectHideFlags: 0 @@ -3457,6 +3566,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3481,6 +3592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1060853707 MeshFilter: m_ObjectHideFlags: 0 @@ -3500,7 +3612,6 @@ GameObject: - component: {fileID: 1079224357} - component: {fileID: 1079224356} - component: {fileID: 1079224355} - - component: {fileID: 1079224354} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -3508,7 +3619,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1079224354 +--- !u!114 &1079224355 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3517,100 +3628,110 @@ MonoBehaviour: m_GameObject: {fileID: 1079224353} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &1079224355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079224353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -3619,8 +3740,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079224353} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -3669,6 +3791,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1079224357 @@ -3753,12 +3876,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -3985,6 +4108,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 512 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 @@ -4047,6 +4175,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4071,6 +4201,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1121401768 MeshFilter: m_ObjectHideFlags: 0 @@ -4139,6 +4270,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4163,6 +4296,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1141094899 MeshFilter: m_ObjectHideFlags: 0 @@ -4231,6 +4365,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4255,6 +4391,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1158666092 MeshFilter: m_ObjectHideFlags: 0 @@ -4323,6 +4460,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4347,6 +4486,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1164744979 MeshFilter: m_ObjectHideFlags: 0 @@ -4415,6 +4555,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4439,6 +4581,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1212374789 MeshFilter: m_ObjectHideFlags: 0 @@ -4507,6 +4650,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4531,6 +4676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321506414 MeshFilter: m_ObjectHideFlags: 0 @@ -4599,6 +4745,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4623,6 +4771,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1403629108 MeshFilter: m_ObjectHideFlags: 0 @@ -4691,6 +4840,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4715,6 +4866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417593602 MeshFilter: m_ObjectHideFlags: 0 @@ -4783,6 +4935,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4807,6 +4961,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460963255 MeshFilter: m_ObjectHideFlags: 0 @@ -4875,6 +5030,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4899,6 +5056,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1489396295 MeshFilter: m_ObjectHideFlags: 0 @@ -4967,6 +5125,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4991,6 +5151,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1556045220 MeshFilter: m_ObjectHideFlags: 0 @@ -5059,6 +5220,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5083,6 +5246,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1578692525 MeshFilter: m_ObjectHideFlags: 0 @@ -5151,6 +5315,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5175,6 +5341,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591606731 MeshFilter: m_ObjectHideFlags: 0 @@ -5243,6 +5410,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5267,6 +5436,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1636842448 MeshFilter: m_ObjectHideFlags: 0 @@ -5335,6 +5505,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5359,6 +5531,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1662777384 MeshFilter: m_ObjectHideFlags: 0 @@ -5427,6 +5600,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5451,6 +5626,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680240288 MeshFilter: m_ObjectHideFlags: 0 @@ -5519,6 +5695,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5543,6 +5721,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1702910558 MeshFilter: m_ObjectHideFlags: 0 @@ -5611,6 +5790,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5635,6 +5816,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1718495713 MeshFilter: m_ObjectHideFlags: 0 @@ -5703,6 +5885,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5727,6 +5911,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1768881573 MeshFilter: m_ObjectHideFlags: 0 @@ -5795,6 +5980,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5819,6 +6006,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1812995122 MeshFilter: m_ObjectHideFlags: 0 @@ -5887,6 +6075,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5911,6 +6101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1837835318 MeshFilter: m_ObjectHideFlags: 0 @@ -6016,6 +6207,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6040,6 +6233,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1913705761 MeshFilter: m_ObjectHideFlags: 0 @@ -6108,6 +6302,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6132,6 +6328,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1988598091 MeshFilter: m_ObjectHideFlags: 0 @@ -6256,6 +6453,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6280,6 +6479,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2077504822 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity index a9175d91f8a..936393226d7 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity @@ -120,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -873,7 +875,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1030,6 +1032,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1039,6 +1046,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1057,6 +1065,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2012,9 +2023,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -3914,7 +3925,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3960,7 +3971,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3993,6 +4006,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4009,6 +4023,9 @@ MonoBehaviour: useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -4068,6 +4085,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1079224357 @@ -4400,6 +4418,11 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity index 55a06d44306..f2d252f5ab5 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity @@ -4418,6 +4418,11 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity index 1e0cb3d7094..a343f089f62 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 85e59e6fb918b384290a9820ad83d27f, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -202,6 +205,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -226,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -316,12 +321,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69456063102749 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +543,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1312917302 @@ -573,6 +583,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -597,6 +608,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1312917304 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity index cdc8bb1f5af..b07a4044f28 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -373,6 +375,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -387,7 +390,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -496,6 +499,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803629126 @@ -524,7 +528,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -570,7 +574,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -603,6 +609,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -619,6 +626,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -799,6 +809,11 @@ PrefabInstance: propertyPath: backgroundColorHDR.b value: 0.29107332 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1175354105 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity index a32049a39e2..12be196607f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -374,6 +376,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -388,7 +391,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -497,6 +500,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803629126 @@ -525,7 +529,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -571,7 +575,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -604,6 +610,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -620,6 +627,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -811,6 +821,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d39c8f0447409a541a78d12c526207ee, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1122444516 @@ -842,7 +857,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1094,6 +1109,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1103,6 +1123,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1121,6 +1142,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 790cabb29f8..97a5d28ce5b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -285,5 +285,10 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity index 91936fec90c..36d34a60910 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity @@ -215,6 +215,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -224,6 +229,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -242,6 +248,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -331,6 +340,8 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0.001 AverageCorrectnessThreshold: 0.0001 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -338,6 +349,7 @@ MonoBehaviour: waitFrames: 0 xrCompatible: 0 xrThresholdMultiplier: 1 + renderGraphCompatible: 0 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} @@ -447,6 +459,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -456,6 +473,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -474,6 +492,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -743,7 +764,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -791,6 +812,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -823,6 +845,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -839,6 +862,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &214615002 Light: m_ObjectHideFlags: 0 @@ -898,6 +924,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &214615003 @@ -2906,6 +2933,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2915,6 +2947,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2933,6 +2966,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3042,8 +3078,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: d96c2fdce7fa1e24fa2e6a67853cec3f, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &2102952965 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity index 225992a0eb6..475be4f7c07 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,7 +153,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -170,6 +172,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -279,6 +282,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -373,6 +377,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -435,7 +440,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -454,6 +459,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -625,7 +631,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -644,6 +650,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -753,6 +760,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -847,6 +855,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1008,7 +1017,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1027,6 +1036,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1136,6 +1146,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1202,7 +1213,7 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: 62ad55275245cad4290c3d0f370a6be8, type: 2} + sharedProfile: {fileID: 0} --- !u!4 &701793308 Transform: m_ObjectHideFlags: 0 @@ -1358,6 +1369,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 1290 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &717487235 @@ -1389,7 +1405,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1408,6 +1424,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1517,6 +1534,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1550,98 +1568,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759676931} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &776767567 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Area Light - m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _DistortionVectorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _UnlitColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAffectEmissive: 0 - - _AlphaCutoff: 0.5 - - _AlphaCutoffEnable: 0 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _BlendMode: 0 - - _CullMode: 2 - - _Cutoff: 0.5 - - _DistortionBlendMode: 0 - - _DistortionBlurBlendMode: 0 - - _DistortionBlurDstBlend: 0 - - _DistortionBlurRemapMax: 1 - - _DistortionBlurRemapMin: 0 - - _DistortionBlurScale: 1 - - _DistortionBlurSrcBlend: 0 - - _DistortionDepthTest: 1 - - _DistortionDstBlend: 0 - - _DistortionEnable: 0 - - _DistortionOnly: 0 - - _DistortionScale: 1 - - _DistortionSrcBlend: 0 - - _DistortionVectorBias: -1 - - _DistortionVectorScale: 2 - - _DoubleSidedEnable: 0 - - _DstBlend: 0 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - - _EnableFogOnTransparent: 0 - - _HdrpVersion: 2 - - _IncludeIndirectLighting: 0 - - _SrcBlend: 1 - - _StencilRef: 0 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 64 - - _StencilRefMV: 128 - - _StencilWriteMask: 3 - - _StencilWriteMaskDepth: 32 - - _StencilWriteMaskDistortionVec: 64 - - _StencilWriteMaskMV: 128 - - _SurfaceType: 0 - - _TransparentCullMode: 2 - - _TransparentSortPriority: 0 - - _UseEmissiveIntensity: 0 - - _ZTestDepthEqualForOpaque: 4 - - _ZTestModeDistortion: 8 - - _ZTestTransparent: 4 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 0.12732396, g: 0.12732396, b: 0.12732396, a: 0.12732396} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - - _UnlitColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] --- !u!1 &831104153 GameObject: m_ObjectHideFlags: 0 @@ -1672,7 +1598,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1706,6 +1632,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1713,6 +1644,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1745,6 +1679,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1761,6 +1696,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &831104155 Light: m_ObjectHideFlags: 0 @@ -1820,6 +1758,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &831104156 @@ -1991,6 +1930,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2085,6 +2025,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2147,7 +2088,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2166,6 +2107,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2225,8 +2167,6 @@ GameObject: - component: {fileID: 1062541562} - component: {fileID: 1062541561} - component: {fileID: 1062541560} - - component: {fileID: 1062541559} - - component: {fileID: 1062541558} m_Layer: 0 m_Name: Area Light m_TagString: Untagged @@ -2234,54 +2174,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!33 &1062541558 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062541557} - m_Mesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} ---- !u!23 &1062541559 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062541557} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 776767567} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1062541560 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2294,7 +2186,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2328,6 +2220,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2335,6 +2232,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 10 m_EvsmLightLeakBias: 0.448 m_EvsmVarianceBias: 0 @@ -2367,6 +2267,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2383,6 +2284,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 12 + m_AreaLightEmissiveMeshShadowCastingMode: 1 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 1 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1062541561 Light: m_ObjectHideFlags: 0 @@ -2442,6 +2346,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 64} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1062541562 @@ -2519,6 +2424,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2613,6 +2519,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2707,6 +2614,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2770,7 +2678,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2804,6 +2712,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2811,6 +2724,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2843,6 +2759,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2859,6 +2776,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1562174630 Light: m_ObjectHideFlags: 0 @@ -2918,6 +2838,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1562174631 @@ -2963,7 +2884,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2982,6 +2903,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3091,6 +3013,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3153,7 +3076,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3172,6 +3095,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3249,7 +3173,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3268,6 +3192,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3345,7 +3270,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3364,6 +3289,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3441,7 +3367,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3460,6 +3386,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3537,7 +3464,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3556,6 +3483,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3634,7 +3562,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3668,6 +3596,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3675,6 +3608,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3707,6 +3643,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3723,6 +3660,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1992832556 Light: m_ObjectHideFlags: 0 @@ -3782,6 +3722,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1992832557 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity index e7d6c6dfe9d..4e0883eca5f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} + m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: adeb6e0e8d1cb2a4f88df26fcda87bac, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -196,6 +200,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1693911544 @@ -205,11 +214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -265,7 +269,44 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} --- !u!1 &1916420829 GameObject: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity index 7da9c830d94..bf2527a1a48 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} + m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: d38511e38b409a745a47b6eaa41c92c5, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -259,6 +263,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5493111667791475096 @@ -268,11 +277,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -328,15 +332,52 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5493111666879982181, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5493111667044481732, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_Shadows.m_Type value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity index d4032c6bd49..7ff9f32fa58 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity @@ -156,8 +156,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -352,6 +350,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -540,6 +543,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.36045727 objectReference: {fileID: 0} + - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} - target: {fileID: 4722329110712897087, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalScale.x diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity index 20f002649cc..cfe54217c21 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity @@ -156,8 +156,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -352,6 +350,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -635,6 +638,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 20cc6a2b7d30ae54c9bd8673cafeac38, type: 2} + - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} - target: {fileID: 4722329110318162793, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_RootOrder diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity index ccd36a54ee2..76c89b16f8d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c751d73340dd34b42bbd5ae17c28848c, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -127,6 +131,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -196,13 +208,10 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_IsActive - value: 1 + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -384,6 +393,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -408,6 +418,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828622937 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity index d3a23be3c72..b2d28d062bb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -686,6 +688,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -695,6 +702,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -713,6 +721,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -792,7 +803,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -826,6 +837,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -833,6 +849,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -865,6 +884,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -881,6 +901,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &316708079 Light: m_ObjectHideFlags: 0 @@ -940,6 +963,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &316708080 @@ -1034,6 +1058,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1898,8 +1923,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &627418905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2102,7 +2125,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2136,6 +2159,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2143,6 +2171,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2175,6 +2206,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2191,6 +2223,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &739942738 Light: m_ObjectHideFlags: 0 @@ -2250,6 +2285,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &739942739 @@ -2510,7 +2546,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2544,6 +2580,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2551,6 +2592,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2583,6 +2627,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2599,6 +2644,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &803090226 Light: m_ObjectHideFlags: 0 @@ -2658,6 +2706,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803090227 @@ -2844,7 +2893,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2878,6 +2927,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2885,6 +2939,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2917,6 +2974,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2933,6 +2991,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &928375464 Light: m_ObjectHideFlags: 0 @@ -2992,6 +3053,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &928375465 @@ -3159,7 +3221,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3176,6 +3238,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -3184,7 +3251,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3201,6 +3268,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -3269,7 +3341,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3286,6 +3358,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3819,7 +3896,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3853,6 +3930,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3860,6 +3942,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3892,6 +3977,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3908,6 +3994,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1237229781 Light: m_ObjectHideFlags: 0 @@ -3967,6 +4056,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1237229782 @@ -4050,7 +4140,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4084,6 +4174,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4091,6 +4186,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4123,6 +4221,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4139,6 +4238,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1274396916 Light: m_ObjectHideFlags: 0 @@ -4198,6 +4300,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1274396917 @@ -5488,6 +5591,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1789434830 stripped @@ -5601,6 +5709,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5610,6 +5723,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5628,6 +5742,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6087,7 +6204,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6121,6 +6238,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6128,6 +6250,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6160,6 +6285,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6176,6 +6302,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2010550058 Light: m_ObjectHideFlags: 0 @@ -6235,6 +6364,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2010550059 @@ -6398,6 +6528,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6407,6 +6542,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6425,6 +6561,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity index bd63f5f084e..c5feef8b2a1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -675,8 +677,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &160564957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1095,7 +1095,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1129,6 +1129,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1136,6 +1141,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1168,6 +1176,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1184,6 +1193,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &376190249 Light: m_ObjectHideFlags: 0 @@ -1243,6 +1255,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &376190250 @@ -1609,7 +1622,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1643,6 +1656,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1650,6 +1668,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1682,6 +1703,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1698,6 +1720,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &597864850 Light: m_ObjectHideFlags: 0 @@ -1757,6 +1782,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &597864851 @@ -1803,7 +1829,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1837,6 +1863,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1844,6 +1875,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1876,6 +1910,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1892,6 +1927,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &632939249 Light: m_ObjectHideFlags: 0 @@ -1951,6 +1989,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &632939250 @@ -2117,7 +2156,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2151,6 +2190,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2158,6 +2202,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2190,6 +2237,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2206,6 +2254,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &667701177 Light: m_ObjectHideFlags: 0 @@ -2265,6 +2316,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &667701178 @@ -3510,6 +3562,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3517,6 +3574,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3549,6 +3609,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3565,6 +3626,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1190946901 Light: m_ObjectHideFlags: 0 @@ -3624,6 +3688,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1190946902 @@ -3729,6 +3794,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -3738,6 +3808,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3756,6 +3827,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3866,6 +3940,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4335,6 +4410,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1311907884 @@ -4484,7 +4564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4518,6 +4598,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4525,6 +4610,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4557,6 +4645,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4573,6 +4662,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1313756196 Light: m_ObjectHideFlags: 0 @@ -4632,6 +4724,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1313756197 @@ -4905,7 +4998,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4939,6 +5032,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4946,6 +5044,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4978,6 +5079,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4994,6 +5096,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1503478094 Light: m_ObjectHideFlags: 0 @@ -5053,6 +5158,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1503478095 @@ -5718,7 +5824,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5735,6 +5841,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -5743,7 +5854,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5760,6 +5871,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -5828,7 +5944,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5845,6 +5961,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5953,6 +6074,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5962,6 +6088,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5980,6 +6107,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6273,7 +6403,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6307,6 +6437,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6314,6 +6449,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6346,6 +6484,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6362,6 +6501,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1970729143 Light: m_ObjectHideFlags: 0 @@ -6421,6 +6563,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1970729144 @@ -6807,6 +6950,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6816,6 +6964,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6834,6 +6983,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity index 0c143444d60..b45c2598498 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 96be6728ca2a96a4595a4df0242dfd52, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -128,16 +131,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -208,46 +241,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &36551380 @@ -283,6 +286,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -307,6 +311,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &36551382 MeshFilter: m_ObjectHideFlags: 0 @@ -362,6 +367,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -386,6 +392,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &46421382 MeshFilter: m_ObjectHideFlags: 0 @@ -441,6 +448,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -465,6 +473,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &60506766 MeshFilter: m_ObjectHideFlags: 0 @@ -520,6 +529,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -544,6 +554,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65113829 MeshFilter: m_ObjectHideFlags: 0 @@ -599,6 +610,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -623,6 +635,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &66120961 MeshFilter: m_ObjectHideFlags: 0 @@ -678,6 +691,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -702,6 +716,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77076703 MeshFilter: m_ObjectHideFlags: 0 @@ -753,9 +768,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &101861481 MeshRenderer: @@ -772,6 +787,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -796,6 +812,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &101861482 MeshFilter: m_ObjectHideFlags: 0 @@ -850,9 +867,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1500180839} - m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, - type: 2} --- !u!114 &115701100 MonoBehaviour: m_ObjectHideFlags: 0 @@ -917,6 +931,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -941,6 +956,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &127095559 MeshFilter: m_ObjectHideFlags: 0 @@ -970,16 +986,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(OFF) test with 4 materials + + and 4 meshes checking + shadow behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -1050,51 +1101,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: 'Batching(OFF) test with 4 materials - - and 4 meshes checking - shadow behavior - - with different light type shadows' - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &150582942 @@ -1130,6 +1146,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1154,6 +1171,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &150582944 MeshFilter: m_ObjectHideFlags: 0 @@ -1209,6 +1227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1233,6 +1252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &153531923 MeshFilter: m_ObjectHideFlags: 0 @@ -1288,6 +1308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1312,6 +1333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &155155688 MeshFilter: m_ObjectHideFlags: 0 @@ -1367,6 +1389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1391,6 +1414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &170534014 MeshFilter: m_ObjectHideFlags: 0 @@ -1446,6 +1470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1470,6 +1495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &174301839 MeshFilter: m_ObjectHideFlags: 0 @@ -1525,6 +1551,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1549,6 +1576,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &182072262 MeshFilter: m_ObjectHideFlags: 0 @@ -1604,6 +1632,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1628,6 +1657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &186477293 MeshFilter: m_ObjectHideFlags: 0 @@ -1683,6 +1713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1707,6 +1738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &200455129 MeshFilter: m_ObjectHideFlags: 0 @@ -1762,6 +1794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1786,6 +1819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &204257016 MeshFilter: m_ObjectHideFlags: 0 @@ -1841,6 +1875,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1865,6 +1900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &227477080 MeshFilter: m_ObjectHideFlags: 0 @@ -1920,6 +1956,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1944,6 +1981,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &238349023 MeshFilter: m_ObjectHideFlags: 0 @@ -1973,16 +2011,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2053,46 +2121,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &243558409 @@ -2128,6 +2166,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2152,6 +2191,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &243558411 MeshFilter: m_ObjectHideFlags: 0 @@ -2207,6 +2247,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2231,6 +2272,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &253909733 MeshFilter: m_ObjectHideFlags: 0 @@ -2286,6 +2328,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2310,6 +2353,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259622049 MeshFilter: m_ObjectHideFlags: 0 @@ -2365,6 +2409,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2389,6 +2434,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &261850620 MeshFilter: m_ObjectHideFlags: 0 @@ -2444,6 +2490,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2468,6 +2515,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &264730788 MeshFilter: m_ObjectHideFlags: 0 @@ -2523,6 +2571,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2547,6 +2596,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &265628708 MeshFilter: m_ObjectHideFlags: 0 @@ -2602,6 +2652,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2626,6 +2677,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &268124353 MeshFilter: m_ObjectHideFlags: 0 @@ -2677,9 +2729,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &286673898 MeshRenderer: @@ -2696,6 +2748,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2720,6 +2773,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286673899 MeshFilter: m_ObjectHideFlags: 0 @@ -2775,6 +2829,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2799,6 +2854,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &288435795 MeshFilter: m_ObjectHideFlags: 0 @@ -2828,15 +2884,45 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2908,46 +2994,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &311832186 @@ -2983,6 +3039,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3007,6 +3064,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311832188 MeshFilter: m_ObjectHideFlags: 0 @@ -3062,6 +3120,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3086,6 +3145,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &315335065 MeshFilter: m_ObjectHideFlags: 0 @@ -3141,6 +3201,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3165,6 +3226,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &323337983 MeshFilter: m_ObjectHideFlags: 0 @@ -3220,6 +3282,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3244,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &347980535 MeshFilter: m_ObjectHideFlags: 0 @@ -3299,6 +3363,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3323,6 +3388,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &353743933 MeshFilter: m_ObjectHideFlags: 0 @@ -3378,6 +3444,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3402,6 +3469,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &358891137 MeshFilter: m_ObjectHideFlags: 0 @@ -3457,6 +3525,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3481,6 +3550,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &371112390 MeshFilter: m_ObjectHideFlags: 0 @@ -3536,6 +3606,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3560,6 +3631,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385211676 MeshFilter: m_ObjectHideFlags: 0 @@ -3615,6 +3687,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3639,6 +3712,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &393485934 MeshFilter: m_ObjectHideFlags: 0 @@ -3694,6 +3768,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3718,6 +3793,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414712806 MeshFilter: m_ObjectHideFlags: 0 @@ -3773,6 +3849,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3797,6 +3874,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &442248312 MeshFilter: m_ObjectHideFlags: 0 @@ -3852,6 +3930,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3876,6 +3955,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &451218266 MeshFilter: m_ObjectHideFlags: 0 @@ -3931,6 +4011,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3955,6 +4036,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &454545252 MeshFilter: m_ObjectHideFlags: 0 @@ -4024,6 +4106,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4048,6 +4131,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &456409600 MeshFilter: m_ObjectHideFlags: 0 @@ -4089,6 +4173,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4113,6 +4198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &463589548 MeshFilter: m_ObjectHideFlags: 0 @@ -4168,6 +4254,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4192,6 +4279,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475376730 MeshFilter: m_ObjectHideFlags: 0 @@ -4247,6 +4335,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4271,6 +4360,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &481317919 MeshFilter: m_ObjectHideFlags: 0 @@ -4326,6 +4416,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4350,6 +4441,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483495094 MeshFilter: m_ObjectHideFlags: 0 @@ -4405,6 +4497,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4429,6 +4522,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483928023 MeshFilter: m_ObjectHideFlags: 0 @@ -4484,6 +4578,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4508,6 +4603,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &485852219 MeshFilter: m_ObjectHideFlags: 0 @@ -4559,9 +4655,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &507304597 MeshRenderer: @@ -4578,6 +4674,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4602,6 +4699,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &507304598 MeshFilter: m_ObjectHideFlags: 0 @@ -4657,6 +4755,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4681,6 +4780,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515052764 MeshFilter: m_ObjectHideFlags: 0 @@ -4732,9 +4832,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &515113725 MeshRenderer: @@ -4751,6 +4851,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4775,6 +4876,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515113726 MeshFilter: m_ObjectHideFlags: 0 @@ -4830,6 +4932,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4854,6 +4957,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515981675 MeshFilter: m_ObjectHideFlags: 0 @@ -4909,6 +5013,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4933,6 +5038,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &524115670 MeshFilter: m_ObjectHideFlags: 0 @@ -4988,6 +5094,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5012,6 +5119,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531014866 MeshFilter: m_ObjectHideFlags: 0 @@ -5067,6 +5175,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5091,6 +5200,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &535988451 MeshFilter: m_ObjectHideFlags: 0 @@ -5146,6 +5256,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5170,6 +5281,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545110250 MeshFilter: m_ObjectHideFlags: 0 @@ -5225,6 +5337,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5249,6 +5362,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545921550 MeshFilter: m_ObjectHideFlags: 0 @@ -5304,6 +5418,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5328,6 +5443,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &549211337 MeshFilter: m_ObjectHideFlags: 0 @@ -5419,6 +5535,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5443,6 +5560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &554062274 MeshFilter: m_ObjectHideFlags: 0 @@ -5498,6 +5616,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5522,6 +5641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &585238646 MeshFilter: m_ObjectHideFlags: 0 @@ -5577,6 +5697,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5601,6 +5722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &593985934 MeshFilter: m_ObjectHideFlags: 0 @@ -5656,6 +5778,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5680,6 +5803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &600499765 MeshFilter: m_ObjectHideFlags: 0 @@ -5735,6 +5859,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5759,6 +5884,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602785436 MeshFilter: m_ObjectHideFlags: 0 @@ -5814,6 +5940,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5838,6 +5965,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &606501518 MeshFilter: m_ObjectHideFlags: 0 @@ -5893,6 +6021,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5917,6 +6046,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &635086611 MeshFilter: m_ObjectHideFlags: 0 @@ -5972,6 +6102,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5996,6 +6127,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &644832025 MeshFilter: m_ObjectHideFlags: 0 @@ -6047,9 +6179,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &675722532 MeshRenderer: @@ -6066,6 +6198,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6090,6 +6223,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &675722533 MeshFilter: m_ObjectHideFlags: 0 @@ -6145,6 +6279,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6169,6 +6304,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &680093780 MeshFilter: m_ObjectHideFlags: 0 @@ -6224,6 +6360,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6248,6 +6385,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &705903101 MeshFilter: m_ObjectHideFlags: 0 @@ -6303,6 +6441,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6327,6 +6466,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &728083195 MeshFilter: m_ObjectHideFlags: 0 @@ -6382,6 +6522,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6406,6 +6547,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &734490762 MeshFilter: m_ObjectHideFlags: 0 @@ -6461,6 +6603,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6485,6 +6628,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &737650306 MeshFilter: m_ObjectHideFlags: 0 @@ -6540,6 +6684,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6564,6 +6709,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &751044735 MeshFilter: m_ObjectHideFlags: 0 @@ -6619,6 +6765,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6643,6 +6790,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &756692492 MeshFilter: m_ObjectHideFlags: 0 @@ -6698,6 +6846,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6722,6 +6871,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &757283832 MeshFilter: m_ObjectHideFlags: 0 @@ -6777,6 +6927,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6801,6 +6952,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &772931098 MeshFilter: m_ObjectHideFlags: 0 @@ -6856,6 +7008,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6880,6 +7033,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &774742369 MeshFilter: m_ObjectHideFlags: 0 @@ -6935,6 +7089,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6959,6 +7114,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &777150796 MeshFilter: m_ObjectHideFlags: 0 @@ -7014,6 +7170,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7038,6 +7195,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &784485898 MeshFilter: m_ObjectHideFlags: 0 @@ -7093,6 +7251,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7117,6 +7276,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &824852118 MeshFilter: m_ObjectHideFlags: 0 @@ -7172,6 +7332,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7196,6 +7357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &831555554 MeshFilter: m_ObjectHideFlags: 0 @@ -7251,6 +7413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7275,6 +7438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &841086743 MeshFilter: m_ObjectHideFlags: 0 @@ -7330,6 +7494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7354,6 +7519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886695358 MeshFilter: m_ObjectHideFlags: 0 @@ -7409,6 +7575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7433,6 +7600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901920340 MeshFilter: m_ObjectHideFlags: 0 @@ -7488,6 +7656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7512,6 +7681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &913545789 MeshFilter: m_ObjectHideFlags: 0 @@ -7567,6 +7737,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7591,6 +7762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917358696 MeshFilter: m_ObjectHideFlags: 0 @@ -7646,6 +7818,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7670,6 +7843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917574245 MeshFilter: m_ObjectHideFlags: 0 @@ -7725,6 +7899,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7749,6 +7924,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &939069929 MeshFilter: m_ObjectHideFlags: 0 @@ -7804,6 +7980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7828,6 +8005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &942091866 MeshFilter: m_ObjectHideFlags: 0 @@ -7883,6 +8061,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7907,6 +8086,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &943532141 MeshFilter: m_ObjectHideFlags: 0 @@ -7962,6 +8142,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7986,6 +8167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &987125021 MeshFilter: m_ObjectHideFlags: 0 @@ -8041,6 +8223,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8065,6 +8248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991365373 MeshFilter: m_ObjectHideFlags: 0 @@ -8120,6 +8304,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8144,6 +8329,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1008620057 MeshFilter: m_ObjectHideFlags: 0 @@ -8213,6 +8399,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8237,6 +8424,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1021467115 MeshFilter: m_ObjectHideFlags: 0 @@ -8278,6 +8466,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8302,6 +8491,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1056257243 MeshFilter: m_ObjectHideFlags: 0 @@ -8357,6 +8547,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8381,6 +8572,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1062953899 MeshFilter: m_ObjectHideFlags: 0 @@ -8436,6 +8628,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8460,6 +8653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064303137 MeshFilter: m_ObjectHideFlags: 0 @@ -8515,6 +8709,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8539,6 +8734,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064782782 MeshFilter: m_ObjectHideFlags: 0 @@ -8594,6 +8790,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8618,6 +8815,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1069142520 MeshFilter: m_ObjectHideFlags: 0 @@ -8673,6 +8871,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8697,6 +8896,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1090690753 MeshFilter: m_ObjectHideFlags: 0 @@ -8795,6 +8995,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8819,6 +9020,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1101367492 MeshFilter: m_ObjectHideFlags: 0 @@ -8874,6 +9076,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8898,6 +9101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1102238839 MeshFilter: m_ObjectHideFlags: 0 @@ -8953,6 +9157,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8977,6 +9182,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1114955574 MeshFilter: m_ObjectHideFlags: 0 @@ -9032,6 +9238,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9056,6 +9263,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1115857959 MeshFilter: m_ObjectHideFlags: 0 @@ -9111,6 +9319,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9135,6 +9344,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123583534 MeshFilter: m_ObjectHideFlags: 0 @@ -9190,6 +9400,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9214,6 +9425,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1136865338 MeshFilter: m_ObjectHideFlags: 0 @@ -9269,6 +9481,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9293,6 +9506,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1139714605 MeshFilter: m_ObjectHideFlags: 0 @@ -9348,6 +9562,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9372,6 +9587,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1146692006 MeshFilter: m_ObjectHideFlags: 0 @@ -9427,6 +9643,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9451,6 +9668,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1150003263 MeshFilter: m_ObjectHideFlags: 0 @@ -9506,6 +9724,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9530,6 +9749,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1155367716 MeshFilter: m_ObjectHideFlags: 0 @@ -9585,6 +9805,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9609,6 +9830,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167055085 MeshFilter: m_ObjectHideFlags: 0 @@ -9664,6 +9886,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9688,6 +9911,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169402463 MeshFilter: m_ObjectHideFlags: 0 @@ -9743,6 +9967,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9767,6 +9992,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169459259 MeshFilter: m_ObjectHideFlags: 0 @@ -9822,6 +10048,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9846,6 +10073,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173661556 MeshFilter: m_ObjectHideFlags: 0 @@ -9901,6 +10129,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9925,6 +10154,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173941889 MeshFilter: m_ObjectHideFlags: 0 @@ -9991,7 +10221,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -10014,6 +10244,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -10024,6 +10255,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -10031,6 +10267,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -10038,10 +10277,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -10058,9 +10296,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10077,6 +10319,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1186812977 Light: m_ObjectHideFlags: 0 @@ -10136,6 +10381,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1189427210 @@ -10171,6 +10417,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10195,6 +10442,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1189427212 MeshFilter: m_ObjectHideFlags: 0 @@ -10250,6 +10498,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10274,6 +10523,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1191893181 MeshFilter: m_ObjectHideFlags: 0 @@ -10329,6 +10579,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10353,6 +10604,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1200757313 MeshFilter: m_ObjectHideFlags: 0 @@ -10408,6 +10660,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10432,6 +10685,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1219120707 MeshFilter: m_ObjectHideFlags: 0 @@ -10487,6 +10741,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10511,6 +10766,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1222561854 MeshFilter: m_ObjectHideFlags: 0 @@ -10566,6 +10822,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10590,6 +10847,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1224740520 MeshFilter: m_ObjectHideFlags: 0 @@ -10645,6 +10903,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10669,6 +10928,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236603816 MeshFilter: m_ObjectHideFlags: 0 @@ -10738,6 +10998,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10762,6 +11023,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1242223686 MeshFilter: m_ObjectHideFlags: 0 @@ -10803,6 +11065,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10827,6 +11090,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1243024348 MeshFilter: m_ObjectHideFlags: 0 @@ -10882,6 +11146,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10906,6 +11171,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1247850078 MeshFilter: m_ObjectHideFlags: 0 @@ -10961,6 +11227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10985,6 +11252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1259711087 MeshFilter: m_ObjectHideFlags: 0 @@ -11040,6 +11308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11064,6 +11333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1262205734 MeshFilter: m_ObjectHideFlags: 0 @@ -11119,6 +11389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11143,6 +11414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275508096 MeshFilter: m_ObjectHideFlags: 0 @@ -11198,6 +11470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11222,6 +11495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275917559 MeshFilter: m_ObjectHideFlags: 0 @@ -11277,6 +11551,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11301,6 +11576,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1287832517 MeshFilter: m_ObjectHideFlags: 0 @@ -11356,6 +11632,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11380,6 +11657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1289313402 MeshFilter: m_ObjectHideFlags: 0 @@ -11435,6 +11713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11459,6 +11738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1298995558 MeshFilter: m_ObjectHideFlags: 0 @@ -11514,6 +11794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11538,6 +11819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1302983124 MeshFilter: m_ObjectHideFlags: 0 @@ -11593,6 +11875,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11617,6 +11900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1310388112 MeshFilter: m_ObjectHideFlags: 0 @@ -11672,6 +11956,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11696,6 +11981,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1313496688 MeshFilter: m_ObjectHideFlags: 0 @@ -11751,6 +12037,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11775,6 +12062,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321236503 MeshFilter: m_ObjectHideFlags: 0 @@ -11841,7 +12129,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -11864,6 +12152,7 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -11874,6 +12163,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -11881,6 +12175,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -11888,10 +12185,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -11908,9 +12204,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11927,6 +12227,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1334092060 Light: m_ObjectHideFlags: 0 @@ -11986,6 +12289,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1344180423 @@ -12035,6 +12339,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12059,6 +12364,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344180426 MeshFilter: m_ObjectHideFlags: 0 @@ -12100,6 +12406,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12124,6 +12431,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1350933908 MeshFilter: m_ObjectHideFlags: 0 @@ -12179,6 +12487,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12203,6 +12512,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368252137 MeshFilter: m_ObjectHideFlags: 0 @@ -12258,6 +12568,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12282,6 +12593,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368802139 MeshFilter: m_ObjectHideFlags: 0 @@ -12337,6 +12649,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12361,6 +12674,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1381569253 MeshFilter: m_ObjectHideFlags: 0 @@ -12416,6 +12730,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12440,6 +12755,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1383163231 MeshFilter: m_ObjectHideFlags: 0 @@ -12495,6 +12811,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12519,6 +12836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1396529170 MeshFilter: m_ObjectHideFlags: 0 @@ -12574,6 +12892,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12598,6 +12917,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1402937276 MeshFilter: m_ObjectHideFlags: 0 @@ -12653,6 +12973,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12677,6 +12998,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1414587696 MeshFilter: m_ObjectHideFlags: 0 @@ -12732,6 +13054,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12756,6 +13079,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417253615 MeshFilter: m_ObjectHideFlags: 0 @@ -12811,6 +13135,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12835,6 +13160,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1419332792 MeshFilter: m_ObjectHideFlags: 0 @@ -12890,6 +13216,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12914,6 +13241,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1434700136 MeshFilter: m_ObjectHideFlags: 0 @@ -12969,6 +13297,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12993,6 +13322,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1453744377 MeshFilter: m_ObjectHideFlags: 0 @@ -13048,6 +13378,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13072,6 +13403,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1476022556 MeshFilter: m_ObjectHideFlags: 0 @@ -13124,7 +13456,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13147,6 +13479,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -13157,6 +13490,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13164,6 +13502,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13171,10 +13512,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13191,9 +13531,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13210,6 +13554,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1481024265 Light: m_ObjectHideFlags: 0 @@ -13269,6 +13616,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1481024266 @@ -13318,6 +13666,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13342,6 +13691,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1490167730 MeshFilter: m_ObjectHideFlags: 0 @@ -13364,82 +13714,6 @@ Transform: m_Father: {fileID: 1603355434} m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1500180839 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1505593270 GameObject: m_ObjectHideFlags: 0 @@ -13473,6 +13747,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13497,6 +13772,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1505593272 MeshFilter: m_ObjectHideFlags: 0 @@ -13552,6 +13828,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13576,6 +13853,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1507424699 MeshFilter: m_ObjectHideFlags: 0 @@ -13631,6 +13909,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13655,6 +13934,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1514978764 MeshFilter: m_ObjectHideFlags: 0 @@ -13710,6 +13990,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13734,6 +14015,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1519772559 MeshFilter: m_ObjectHideFlags: 0 @@ -13789,6 +14071,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13813,6 +14096,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1538025914 MeshFilter: m_ObjectHideFlags: 0 @@ -13868,6 +14152,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13892,6 +14177,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1543193733 MeshFilter: m_ObjectHideFlags: 0 @@ -13947,6 +14233,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13971,6 +14258,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1545245265 MeshFilter: m_ObjectHideFlags: 0 @@ -14026,6 +14314,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14050,6 +14339,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1574710584 MeshFilter: m_ObjectHideFlags: 0 @@ -14105,6 +14395,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14129,6 +14420,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1598618972 MeshFilter: m_ObjectHideFlags: 0 @@ -14420,6 +14712,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14444,6 +14737,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1645498030 MeshFilter: m_ObjectHideFlags: 0 @@ -14499,6 +14793,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14523,6 +14818,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1655537782 MeshFilter: m_ObjectHideFlags: 0 @@ -14578,6 +14874,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14602,6 +14899,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1677565070 MeshFilter: m_ObjectHideFlags: 0 @@ -14657,6 +14955,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14681,6 +14980,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680464722 MeshFilter: m_ObjectHideFlags: 0 @@ -14736,6 +15036,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14760,6 +15061,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1694320345 MeshFilter: m_ObjectHideFlags: 0 @@ -14815,6 +15117,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14839,6 +15142,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1701473976 MeshFilter: m_ObjectHideFlags: 0 @@ -14894,6 +15198,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14918,6 +15223,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723268422 MeshFilter: m_ObjectHideFlags: 0 @@ -14947,16 +15253,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: overrideTestSettings + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15027,51 +15368,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Anchor - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Alignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: targetCamera - value: + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: overrideTestSettings - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1733495935 @@ -15107,6 +15413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15131,6 +15438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1733495937 MeshFilter: m_ObjectHideFlags: 0 @@ -15186,6 +15494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15210,6 +15519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1737097214 MeshFilter: m_ObjectHideFlags: 0 @@ -15265,6 +15575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15289,6 +15600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1742747597 MeshFilter: m_ObjectHideFlags: 0 @@ -15344,6 +15656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15368,6 +15681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1745614621 MeshFilter: m_ObjectHideFlags: 0 @@ -15423,6 +15737,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15447,6 +15762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750054272 MeshFilter: m_ObjectHideFlags: 0 @@ -15502,6 +15818,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15526,6 +15843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1770933946 MeshFilter: m_ObjectHideFlags: 0 @@ -15581,6 +15899,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15605,6 +15924,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1772511680 MeshFilter: m_ObjectHideFlags: 0 @@ -15660,6 +15980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15684,6 +16005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777553420 MeshFilter: m_ObjectHideFlags: 0 @@ -15771,6 +16093,21 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -15832,21 +16169,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1788602647 @@ -15856,16 +16183,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (3) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Pyramid Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15936,46 +16293,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1791778916 @@ -16011,6 +16338,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16035,6 +16363,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791778918 MeshFilter: m_ObjectHideFlags: 0 @@ -16090,6 +16419,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16114,6 +16444,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1795726768 MeshFilter: m_ObjectHideFlags: 0 @@ -16169,6 +16500,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16193,6 +16525,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805369059 MeshFilter: m_ObjectHideFlags: 0 @@ -16248,6 +16581,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16272,6 +16606,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805418746 MeshFilter: m_ObjectHideFlags: 0 @@ -16327,6 +16662,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16351,6 +16687,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1806486486 MeshFilter: m_ObjectHideFlags: 0 @@ -16406,6 +16743,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16430,6 +16768,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1811672316 MeshFilter: m_ObjectHideFlags: 0 @@ -16485,6 +16824,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16509,6 +16849,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820677218 MeshFilter: m_ObjectHideFlags: 0 @@ -16564,6 +16905,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16588,6 +16930,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828202885 MeshFilter: m_ObjectHideFlags: 0 @@ -16643,6 +16986,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16667,6 +17011,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828337667 MeshFilter: m_ObjectHideFlags: 0 @@ -16722,6 +17067,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16746,6 +17092,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1845195892 MeshFilter: m_ObjectHideFlags: 0 @@ -16801,6 +17148,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16825,6 +17173,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1851237859 MeshFilter: m_ObjectHideFlags: 0 @@ -16880,6 +17229,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16904,6 +17254,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1905441408 MeshFilter: m_ObjectHideFlags: 0 @@ -16959,6 +17310,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16983,6 +17335,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1922813201 MeshFilter: m_ObjectHideFlags: 0 @@ -17038,6 +17391,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17062,6 +17416,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1924402466 MeshFilter: m_ObjectHideFlags: 0 @@ -17117,6 +17472,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17141,6 +17497,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1930622162 MeshFilter: m_ObjectHideFlags: 0 @@ -17207,7 +17564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17230,6 +17587,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -17240,6 +17598,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17247,6 +17610,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17254,10 +17620,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17274,9 +17639,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17293,6 +17662,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1934754985 Light: m_ObjectHideFlags: 0 @@ -17352,6 +17724,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1944444714 @@ -17387,6 +17760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17411,6 +17785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1944444716 MeshFilter: m_ObjectHideFlags: 0 @@ -17466,6 +17841,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17490,6 +17866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1950934447 MeshFilter: m_ObjectHideFlags: 0 @@ -17545,6 +17922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17569,6 +17947,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1951027920 MeshFilter: m_ObjectHideFlags: 0 @@ -17624,6 +18003,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17648,6 +18028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1952346156 MeshFilter: m_ObjectHideFlags: 0 @@ -17703,6 +18084,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17727,6 +18109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1972269529 MeshFilter: m_ObjectHideFlags: 0 @@ -17782,6 +18165,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17806,6 +18190,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1973997287 MeshFilter: m_ObjectHideFlags: 0 @@ -17858,7 +18243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17881,6 +18266,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -17891,6 +18277,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17898,6 +18289,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17905,10 +18299,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17925,9 +18318,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17944,6 +18341,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2000975652 Light: m_ObjectHideFlags: 0 @@ -18003,6 +18403,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2000975653 @@ -18052,6 +18453,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18076,6 +18478,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2004796537 MeshFilter: m_ObjectHideFlags: 0 @@ -18131,6 +18534,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18155,6 +18559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2007878966 MeshFilter: m_ObjectHideFlags: 0 @@ -18210,6 +18615,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18234,6 +18640,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2009971746 MeshFilter: m_ObjectHideFlags: 0 @@ -18289,6 +18696,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18313,6 +18721,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2012882290 MeshFilter: m_ObjectHideFlags: 0 @@ -18368,6 +18777,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18392,6 +18802,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2041816170 MeshFilter: m_ObjectHideFlags: 0 @@ -18447,6 +18858,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18471,6 +18883,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2055222863 MeshFilter: m_ObjectHideFlags: 0 @@ -18526,6 +18939,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18550,6 +18964,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2057234449 MeshFilter: m_ObjectHideFlags: 0 @@ -18616,7 +19031,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -18639,6 +19054,7 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -18649,6 +19065,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -18656,6 +19077,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -18663,10 +19087,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -18683,9 +19106,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -18702,6 +19129,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2063225983 Light: m_ObjectHideFlags: 0 @@ -18761,6 +19191,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2073048139 @@ -18796,6 +19227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18820,6 +19252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2073048141 MeshFilter: m_ObjectHideFlags: 0 @@ -18875,6 +19308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18899,6 +19333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079882538 MeshFilter: m_ObjectHideFlags: 0 @@ -18954,6 +19389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18978,6 +19414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099243441 MeshFilter: m_ObjectHideFlags: 0 @@ -19033,6 +19470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19057,6 +19495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099775709 MeshFilter: m_ObjectHideFlags: 0 @@ -19126,6 +19565,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19150,6 +19590,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2103916467 MeshFilter: m_ObjectHideFlags: 0 @@ -19205,6 +19646,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19229,6 +19671,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2111003287 MeshFilter: m_ObjectHideFlags: 0 @@ -19270,6 +19713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19294,6 +19738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2121451157 MeshFilter: m_ObjectHideFlags: 0 @@ -19349,6 +19794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19373,6 +19819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2133598721 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity index 5747be64a64..60e90f83425 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8dcf44329359b844c8aa48f80ab59bbb, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +171,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -192,6 +196,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1710004 MeshFilter: m_ObjectHideFlags: 0 @@ -247,6 +252,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -271,6 +277,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &18051140 MeshFilter: m_ObjectHideFlags: 0 @@ -326,6 +333,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -350,6 +358,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &27279487 MeshFilter: m_ObjectHideFlags: 0 @@ -390,9 +399,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1907606003} - m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, - type: 2} --- !u!114 &63803591 MonoBehaviour: m_ObjectHideFlags: 0 @@ -471,6 +477,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -495,6 +502,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65574162 MeshFilter: m_ObjectHideFlags: 0 @@ -550,6 +558,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -574,6 +583,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77199700 MeshFilter: m_ObjectHideFlags: 0 @@ -629,6 +639,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -653,6 +664,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &115102200 MeshFilter: m_ObjectHideFlags: 0 @@ -708,6 +720,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -732,6 +745,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &118990961 MeshFilter: m_ObjectHideFlags: 0 @@ -787,6 +801,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -811,6 +826,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &119543197 MeshFilter: m_ObjectHideFlags: 0 @@ -866,6 +882,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -890,6 +907,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &121141773 MeshFilter: m_ObjectHideFlags: 0 @@ -945,6 +963,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -969,6 +988,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &144936673 MeshFilter: m_ObjectHideFlags: 0 @@ -1021,7 +1041,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1044,6 +1064,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -1054,6 +1075,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1061,6 +1087,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1068,10 +1097,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1088,9 +1116,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1107,6 +1139,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &154133178 Light: m_ObjectHideFlags: 0 @@ -1166,6 +1201,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &158924534 @@ -1215,6 +1251,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1239,6 +1276,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158924537 MeshFilter: m_ObjectHideFlags: 0 @@ -1294,6 +1332,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1318,6 +1357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172004985 MeshFilter: m_ObjectHideFlags: 0 @@ -1373,6 +1413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1397,6 +1438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &193875014 MeshFilter: m_ObjectHideFlags: 0 @@ -1452,6 +1494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1476,6 +1519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &197171319 MeshFilter: m_ObjectHideFlags: 0 @@ -1531,6 +1575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1555,6 +1600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &206141925 MeshFilter: m_ObjectHideFlags: 0 @@ -1610,6 +1656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1634,6 +1681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &207934261 MeshFilter: m_ObjectHideFlags: 0 @@ -1686,7 +1734,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1709,6 +1757,7 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -1719,6 +1768,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1726,6 +1780,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1733,10 +1790,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1753,9 +1809,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1772,6 +1832,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &208533895 Light: m_ObjectHideFlags: 0 @@ -1831,6 +1894,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &216458700 @@ -1916,6 +1980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1940,6 +2005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &230260784 MeshFilter: m_ObjectHideFlags: 0 @@ -1995,6 +2061,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2019,6 +2086,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &239392583 MeshFilter: m_ObjectHideFlags: 0 @@ -2074,6 +2142,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2098,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259433369 MeshFilter: m_ObjectHideFlags: 0 @@ -2153,6 +2223,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2177,6 +2248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &270927042 MeshFilter: m_ObjectHideFlags: 0 @@ -2232,6 +2304,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2256,6 +2329,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &276492018 MeshFilter: m_ObjectHideFlags: 0 @@ -2311,6 +2385,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2335,6 +2410,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &279874603 MeshFilter: m_ObjectHideFlags: 0 @@ -2390,6 +2466,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2414,6 +2491,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286864260 MeshFilter: m_ObjectHideFlags: 0 @@ -2469,6 +2547,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2493,6 +2572,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &290550682 MeshFilter: m_ObjectHideFlags: 0 @@ -2548,6 +2628,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2572,6 +2653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &296839945 MeshFilter: m_ObjectHideFlags: 0 @@ -2627,6 +2709,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2651,6 +2734,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303394831 MeshFilter: m_ObjectHideFlags: 0 @@ -2706,6 +2790,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2730,6 +2815,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303878567 MeshFilter: m_ObjectHideFlags: 0 @@ -2785,6 +2871,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2809,6 +2896,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311038003 MeshFilter: m_ObjectHideFlags: 0 @@ -2864,6 +2952,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2888,6 +2977,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &326053888 MeshFilter: m_ObjectHideFlags: 0 @@ -2903,16 +2993,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2983,46 +3103,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &328796436 @@ -3072,6 +3162,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3096,6 +3187,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &328796439 MeshFilter: m_ObjectHideFlags: 0 @@ -3151,6 +3243,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3175,6 +3268,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &341756822 MeshFilter: m_ObjectHideFlags: 0 @@ -3230,6 +3324,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3254,6 +3349,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &350374762 MeshFilter: m_ObjectHideFlags: 0 @@ -3309,6 +3405,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3333,6 +3430,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &360110942 MeshFilter: m_ObjectHideFlags: 0 @@ -3388,6 +3486,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3412,6 +3511,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &372328438 MeshFilter: m_ObjectHideFlags: 0 @@ -3467,6 +3567,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3491,6 +3592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &395776440 MeshFilter: m_ObjectHideFlags: 0 @@ -3546,6 +3648,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3570,6 +3673,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &402203564 MeshFilter: m_ObjectHideFlags: 0 @@ -3625,6 +3729,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3649,6 +3754,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403989726 MeshFilter: m_ObjectHideFlags: 0 @@ -3704,6 +3810,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3728,6 +3835,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &413571831 MeshFilter: m_ObjectHideFlags: 0 @@ -3783,6 +3891,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3807,6 +3916,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414367076 MeshFilter: m_ObjectHideFlags: 0 @@ -3859,7 +3969,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3882,6 +3992,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -3892,6 +4003,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3899,6 +4015,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3906,10 +4025,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -3926,9 +4044,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3945,6 +4067,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &426295405 Light: m_ObjectHideFlags: 0 @@ -4004,6 +4129,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &430017949 @@ -4035,9 +4161,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &430017951 MeshRenderer: @@ -4054,6 +4180,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4078,6 +4205,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &430017952 MeshFilter: m_ObjectHideFlags: 0 @@ -4147,6 +4275,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4171,6 +4300,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437055873 MeshFilter: m_ObjectHideFlags: 0 @@ -4226,6 +4356,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4250,6 +4381,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437361371 MeshFilter: m_ObjectHideFlags: 0 @@ -4305,6 +4437,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4329,6 +4462,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &444731604 MeshFilter: m_ObjectHideFlags: 0 @@ -4384,6 +4518,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4408,6 +4543,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447696771 MeshFilter: m_ObjectHideFlags: 0 @@ -4460,7 +4596,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4483,6 +4619,7 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -4493,6 +4630,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4500,6 +4642,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4507,10 +4652,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -4527,9 +4671,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4546,6 +4694,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &461319428 Light: m_ObjectHideFlags: 0 @@ -4605,6 +4756,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &469890627 @@ -4654,6 +4806,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4678,6 +4831,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &469890630 MeshFilter: m_ObjectHideFlags: 0 @@ -4733,6 +4887,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4757,6 +4912,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &505552224 MeshFilter: m_ObjectHideFlags: 0 @@ -4812,6 +4968,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4836,6 +4993,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531559732 MeshFilter: m_ObjectHideFlags: 0 @@ -4891,6 +5049,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4915,6 +5074,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &557952777 MeshFilter: m_ObjectHideFlags: 0 @@ -4970,6 +5130,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4994,6 +5155,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559229149 MeshFilter: m_ObjectHideFlags: 0 @@ -5049,6 +5211,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5073,6 +5236,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559689558 MeshFilter: m_ObjectHideFlags: 0 @@ -5128,6 +5292,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5152,6 +5317,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &572130308 MeshFilter: m_ObjectHideFlags: 0 @@ -5207,6 +5373,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5231,6 +5398,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &578472782 MeshFilter: m_ObjectHideFlags: 0 @@ -5286,6 +5454,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5310,6 +5479,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &588295910 MeshFilter: m_ObjectHideFlags: 0 @@ -5365,6 +5535,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5389,6 +5560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602930598 MeshFilter: m_ObjectHideFlags: 0 @@ -5444,6 +5616,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5468,6 +5641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &607221212 MeshFilter: m_ObjectHideFlags: 0 @@ -5523,6 +5697,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5547,6 +5722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &628528525 MeshFilter: m_ObjectHideFlags: 0 @@ -5602,6 +5778,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5626,6 +5803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &637490629 MeshFilter: m_ObjectHideFlags: 0 @@ -5681,6 +5859,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5705,6 +5884,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &640826958 MeshFilter: m_ObjectHideFlags: 0 @@ -5760,6 +5940,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5784,6 +5965,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &642911914 MeshFilter: m_ObjectHideFlags: 0 @@ -5839,6 +6021,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5863,6 +6046,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &643134898 MeshFilter: m_ObjectHideFlags: 0 @@ -5918,6 +6102,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5942,6 +6127,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &645820563 MeshFilter: m_ObjectHideFlags: 0 @@ -5997,6 +6183,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6021,6 +6208,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &647684059 MeshFilter: m_ObjectHideFlags: 0 @@ -6076,6 +6264,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6100,6 +6289,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &648188782 MeshFilter: m_ObjectHideFlags: 0 @@ -6155,6 +6345,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6179,6 +6370,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &649749382 MeshFilter: m_ObjectHideFlags: 0 @@ -6234,6 +6426,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6258,6 +6451,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &668693072 MeshFilter: m_ObjectHideFlags: 0 @@ -6313,6 +6507,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6337,6 +6532,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &669754239 MeshFilter: m_ObjectHideFlags: 0 @@ -6392,6 +6588,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6416,6 +6613,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &671857626 MeshFilter: m_ObjectHideFlags: 0 @@ -6471,6 +6669,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6495,6 +6694,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &682974520 MeshFilter: m_ObjectHideFlags: 0 @@ -6550,6 +6750,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6574,6 +6775,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &697148330 MeshFilter: m_ObjectHideFlags: 0 @@ -6629,6 +6831,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6653,6 +6856,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &712399915 MeshFilter: m_ObjectHideFlags: 0 @@ -6708,6 +6912,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6732,6 +6937,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &719811194 MeshFilter: m_ObjectHideFlags: 0 @@ -6787,6 +6993,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6811,6 +7018,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &744018712 MeshFilter: m_ObjectHideFlags: 0 @@ -6866,6 +7074,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6890,6 +7099,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &758209044 MeshFilter: m_ObjectHideFlags: 0 @@ -6942,7 +7152,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6965,6 +7175,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -6975,6 +7186,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6982,6 +7198,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6989,10 +7208,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -7009,9 +7227,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7028,6 +7250,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &762691883 Light: m_ObjectHideFlags: 0 @@ -7087,6 +7312,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &777871935 @@ -7372,6 +7598,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7396,6 +7623,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &779875687 MeshFilter: m_ObjectHideFlags: 0 @@ -7451,6 +7679,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7475,6 +7704,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &781345256 MeshFilter: m_ObjectHideFlags: 0 @@ -7530,6 +7760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7554,6 +7785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &789731996 MeshFilter: m_ObjectHideFlags: 0 @@ -7609,6 +7841,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7633,6 +7866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809657012 MeshFilter: m_ObjectHideFlags: 0 @@ -7688,6 +7922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7712,6 +7947,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &813923243 MeshFilter: m_ObjectHideFlags: 0 @@ -7767,6 +8003,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7791,6 +8028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &820566438 MeshFilter: m_ObjectHideFlags: 0 @@ -7846,6 +8084,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7870,6 +8109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825050274 MeshFilter: m_ObjectHideFlags: 0 @@ -7925,6 +8165,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7949,6 +8190,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825718158 MeshFilter: m_ObjectHideFlags: 0 @@ -8004,6 +8246,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8028,6 +8271,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &842571686 MeshFilter: m_ObjectHideFlags: 0 @@ -8083,6 +8327,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8107,6 +8352,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &853547569 MeshFilter: m_ObjectHideFlags: 0 @@ -8162,6 +8408,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8186,6 +8433,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &869079679 MeshFilter: m_ObjectHideFlags: 0 @@ -8241,6 +8489,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8265,6 +8514,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &875492872 MeshFilter: m_ObjectHideFlags: 0 @@ -8320,6 +8570,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8344,6 +8595,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886690332 MeshFilter: m_ObjectHideFlags: 0 @@ -8399,6 +8651,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8423,6 +8676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &888245113 MeshFilter: m_ObjectHideFlags: 0 @@ -8478,6 +8732,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8502,6 +8757,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &891847955 MeshFilter: m_ObjectHideFlags: 0 @@ -8557,6 +8813,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8581,6 +8838,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901521603 MeshFilter: m_ObjectHideFlags: 0 @@ -8636,6 +8894,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8660,6 +8919,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &904353995 MeshFilter: m_ObjectHideFlags: 0 @@ -8675,16 +8935,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -8755,46 +9045,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &921921080 @@ -8844,6 +9104,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8868,6 +9129,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &921921083 MeshFilter: m_ObjectHideFlags: 0 @@ -8923,6 +9185,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8947,6 +9210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &930171902 MeshFilter: m_ObjectHideFlags: 0 @@ -9002,6 +9266,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9026,6 +9291,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &953810097 MeshFilter: m_ObjectHideFlags: 0 @@ -9063,9 +9329,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &960424436 MeshRenderer: @@ -9082,6 +9348,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9106,6 +9373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &960424437 MeshFilter: m_ObjectHideFlags: 0 @@ -9175,6 +9443,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9199,6 +9468,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &965748961 MeshFilter: m_ObjectHideFlags: 0 @@ -9254,6 +9524,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9278,6 +9549,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &980798177 MeshFilter: m_ObjectHideFlags: 0 @@ -9333,6 +9605,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9357,6 +9630,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &981646854 MeshFilter: m_ObjectHideFlags: 0 @@ -9412,6 +9686,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9436,6 +9711,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991737266 MeshFilter: m_ObjectHideFlags: 0 @@ -9491,6 +9767,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9515,6 +9792,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1001326874 MeshFilter: m_ObjectHideFlags: 0 @@ -9570,6 +9848,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9594,6 +9873,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1012989238 MeshFilter: m_ObjectHideFlags: 0 @@ -9649,6 +9929,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9673,6 +9954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1031276030 MeshFilter: m_ObjectHideFlags: 0 @@ -9728,6 +10010,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9752,6 +10035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1038229444 MeshFilter: m_ObjectHideFlags: 0 @@ -9807,6 +10091,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9831,6 +10116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1040771379 MeshFilter: m_ObjectHideFlags: 0 @@ -9886,6 +10172,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9910,6 +10197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1043930410 MeshFilter: m_ObjectHideFlags: 0 @@ -9965,6 +10253,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9989,6 +10278,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1046327772 MeshFilter: m_ObjectHideFlags: 0 @@ -10044,6 +10334,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10068,6 +10359,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1057088725 MeshFilter: m_ObjectHideFlags: 0 @@ -10123,6 +10415,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10147,6 +10440,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1061504061 MeshFilter: m_ObjectHideFlags: 0 @@ -10202,6 +10496,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10226,6 +10521,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1080468800 MeshFilter: m_ObjectHideFlags: 0 @@ -10281,6 +10577,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10305,6 +10602,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1096914707 MeshFilter: m_ObjectHideFlags: 0 @@ -10360,6 +10658,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10384,6 +10683,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1108541228 MeshFilter: m_ObjectHideFlags: 0 @@ -10439,6 +10739,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10463,6 +10764,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123246062 MeshFilter: m_ObjectHideFlags: 0 @@ -10518,6 +10820,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10542,6 +10845,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1127700270 MeshFilter: m_ObjectHideFlags: 0 @@ -10597,6 +10901,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10621,6 +10926,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1166530868 MeshFilter: m_ObjectHideFlags: 0 @@ -10676,6 +10982,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10700,6 +11007,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167094695 MeshFilter: m_ObjectHideFlags: 0 @@ -10755,6 +11063,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10779,6 +11088,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1168327892 MeshFilter: m_ObjectHideFlags: 0 @@ -10834,6 +11144,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10858,6 +11169,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1183782476 MeshFilter: m_ObjectHideFlags: 0 @@ -10913,6 +11225,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10937,6 +11250,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1184022654 MeshFilter: m_ObjectHideFlags: 0 @@ -10992,6 +11306,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11016,6 +11331,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1185794389 MeshFilter: m_ObjectHideFlags: 0 @@ -11071,6 +11387,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11095,6 +11412,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1204878890 MeshFilter: m_ObjectHideFlags: 0 @@ -11150,6 +11468,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11174,6 +11493,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1213431291 MeshFilter: m_ObjectHideFlags: 0 @@ -11229,6 +11549,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11253,6 +11574,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1215106502 MeshFilter: m_ObjectHideFlags: 0 @@ -11308,6 +11630,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11332,6 +11655,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1220612084 MeshFilter: m_ObjectHideFlags: 0 @@ -11387,6 +11711,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11411,6 +11736,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1221260582 MeshFilter: m_ObjectHideFlags: 0 @@ -11466,6 +11792,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11490,6 +11817,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1231156226 MeshFilter: m_ObjectHideFlags: 0 @@ -11545,6 +11873,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11569,6 +11898,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1234711635 MeshFilter: m_ObjectHideFlags: 0 @@ -11624,6 +11954,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11648,6 +11979,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236035745 MeshFilter: m_ObjectHideFlags: 0 @@ -11703,6 +12035,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11727,6 +12060,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1239462281 MeshFilter: m_ObjectHideFlags: 0 @@ -11782,6 +12116,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11806,6 +12141,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1257610671 MeshFilter: m_ObjectHideFlags: 0 @@ -11861,6 +12197,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11885,6 +12222,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1266980223 MeshFilter: m_ObjectHideFlags: 0 @@ -11940,6 +12278,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11964,6 +12303,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1282175057 MeshFilter: m_ObjectHideFlags: 0 @@ -12019,6 +12359,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12043,6 +12384,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1285940584 MeshFilter: m_ObjectHideFlags: 0 @@ -12098,6 +12440,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12122,6 +12465,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1293709081 MeshFilter: m_ObjectHideFlags: 0 @@ -12177,6 +12521,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12201,6 +12546,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1296742209 MeshFilter: m_ObjectHideFlags: 0 @@ -12274,6 +12620,21 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -12335,21 +12696,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1314322408 @@ -12399,6 +12750,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12423,6 +12775,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1314322411 MeshFilter: m_ObjectHideFlags: 0 @@ -12478,6 +12831,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12502,6 +12856,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1322864851 MeshFilter: m_ObjectHideFlags: 0 @@ -12557,6 +12912,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12581,6 +12937,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1325976481 MeshFilter: m_ObjectHideFlags: 0 @@ -12636,6 +12993,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12660,6 +13018,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1339361874 MeshFilter: m_ObjectHideFlags: 0 @@ -12715,6 +13074,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12739,6 +13099,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344659076 MeshFilter: m_ObjectHideFlags: 0 @@ -12794,6 +13155,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12818,6 +13180,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1353796882 MeshFilter: m_ObjectHideFlags: 0 @@ -12873,6 +13236,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12897,6 +13261,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1355408080 MeshFilter: m_ObjectHideFlags: 0 @@ -12952,6 +13317,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12976,6 +13342,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1359668098 MeshFilter: m_ObjectHideFlags: 0 @@ -13031,6 +13398,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13055,6 +13423,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1361440978 MeshFilter: m_ObjectHideFlags: 0 @@ -13110,6 +13479,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13134,6 +13504,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1363775923 MeshFilter: m_ObjectHideFlags: 0 @@ -13189,6 +13560,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13213,6 +13585,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1378795295 MeshFilter: m_ObjectHideFlags: 0 @@ -13268,6 +13641,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13292,6 +13666,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1379653303 MeshFilter: m_ObjectHideFlags: 0 @@ -13344,7 +13719,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13367,6 +13742,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -13377,6 +13753,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13384,6 +13765,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13391,10 +13775,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13411,9 +13794,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13430,6 +13817,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386862605 Light: m_ObjectHideFlags: 0 @@ -13489,6 +13879,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1388287949 @@ -13538,6 +13929,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13562,6 +13954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1388287952 MeshFilter: m_ObjectHideFlags: 0 @@ -13617,6 +14010,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13641,6 +14035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1389526138 MeshFilter: m_ObjectHideFlags: 0 @@ -13696,6 +14091,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13720,6 +14116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1422354403 MeshFilter: m_ObjectHideFlags: 0 @@ -13775,6 +14172,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13799,6 +14197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1428342881 MeshFilter: m_ObjectHideFlags: 0 @@ -13814,16 +14213,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -13894,46 +14323,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1460143124 @@ -13983,6 +14382,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14007,6 +14407,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460143127 MeshFilter: m_ObjectHideFlags: 0 @@ -14062,6 +14463,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14086,6 +14488,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1463956016 MeshFilter: m_ObjectHideFlags: 0 @@ -14141,6 +14544,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14165,6 +14569,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1482492333 MeshFilter: m_ObjectHideFlags: 0 @@ -14220,6 +14625,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14244,6 +14650,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1493613822 MeshFilter: m_ObjectHideFlags: 0 @@ -14299,6 +14706,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14323,6 +14731,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1511303639 MeshFilter: m_ObjectHideFlags: 0 @@ -14378,6 +14787,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14402,6 +14812,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1521266381 MeshFilter: m_ObjectHideFlags: 0 @@ -14457,6 +14868,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14481,6 +14893,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1528394421 MeshFilter: m_ObjectHideFlags: 0 @@ -14536,6 +14949,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14560,6 +14974,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1531121810 MeshFilter: m_ObjectHideFlags: 0 @@ -14615,6 +15030,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14639,6 +15055,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1566466870 MeshFilter: m_ObjectHideFlags: 0 @@ -14694,6 +15111,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14718,6 +15136,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1577879441 MeshFilter: m_ObjectHideFlags: 0 @@ -14773,6 +15192,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14797,6 +15217,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1587290154 MeshFilter: m_ObjectHideFlags: 0 @@ -14852,6 +15273,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14876,6 +15298,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591162017 MeshFilter: m_ObjectHideFlags: 0 @@ -14891,16 +15314,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(ON) test with 4 materials + + and 4 meshes checking shadow + behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -14971,6 +15429,30 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Name + value: Text + objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} +--- !u!1001 &1606173312 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_CharacterSize @@ -14979,12 +15461,7 @@ PrefabInstance: - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text - value: 'Batching(ON) test with 4 materials - - and 4 meshes checking shadow - behavior - - with different light type shadows' + value: Spot Pyramid Shape objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15011,30 +15488,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} ---- !u!1001 &1606173312 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Name - value: Text (3) - objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15105,46 +15558,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1621115680 @@ -15194,6 +15617,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15218,6 +15642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1621115683 MeshFilter: m_ObjectHideFlags: 0 @@ -15273,6 +15698,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15297,6 +15723,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1681693788 MeshFilter: m_ObjectHideFlags: 0 @@ -15352,6 +15779,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15376,6 +15804,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1687574455 MeshFilter: m_ObjectHideFlags: 0 @@ -15431,6 +15860,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15455,6 +15885,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1689229584 MeshFilter: m_ObjectHideFlags: 0 @@ -15510,6 +15941,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15534,6 +15966,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1696616959 MeshFilter: m_ObjectHideFlags: 0 @@ -15589,6 +16022,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15613,6 +16047,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705199462 MeshFilter: m_ObjectHideFlags: 0 @@ -15668,6 +16103,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15692,6 +16128,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705921691 MeshFilter: m_ObjectHideFlags: 0 @@ -15747,6 +16184,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15771,6 +16209,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723596831 MeshFilter: m_ObjectHideFlags: 0 @@ -15826,6 +16265,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15850,6 +16290,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1726899976 MeshFilter: m_ObjectHideFlags: 0 @@ -15905,6 +16346,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15929,6 +16371,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750460725 MeshFilter: m_ObjectHideFlags: 0 @@ -15966,9 +16409,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1771681643 MeshRenderer: @@ -15985,6 +16428,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16009,6 +16453,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1771681644 MeshFilter: m_ObjectHideFlags: 0 @@ -16078,6 +16523,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16102,6 +16548,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777647186 MeshFilter: m_ObjectHideFlags: 0 @@ -16157,6 +16604,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16181,6 +16629,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1789371758 MeshFilter: m_ObjectHideFlags: 0 @@ -16236,6 +16685,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16260,6 +16710,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791411182 MeshFilter: m_ObjectHideFlags: 0 @@ -16315,6 +16766,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16339,6 +16791,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1839709220 MeshFilter: m_ObjectHideFlags: 0 @@ -16394,6 +16847,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16418,6 +16872,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1841428342 MeshFilter: m_ObjectHideFlags: 0 @@ -16473,6 +16928,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16497,6 +16953,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1848109756 MeshFilter: m_ObjectHideFlags: 0 @@ -16534,9 +16991,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1856875282 MeshRenderer: @@ -16553,6 +17010,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16577,6 +17035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1856875283 MeshFilter: m_ObjectHideFlags: 0 @@ -16646,6 +17105,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16670,6 +17130,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1866992478 MeshFilter: m_ObjectHideFlags: 0 @@ -16725,6 +17186,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16749,6 +17211,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1867244841 MeshFilter: m_ObjectHideFlags: 0 @@ -16804,6 +17267,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16828,6 +17292,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1877582089 MeshFilter: m_ObjectHideFlags: 0 @@ -16883,6 +17348,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16907,6 +17373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1885217152 MeshFilter: m_ObjectHideFlags: 0 @@ -16962,6 +17429,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16986,6 +17454,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1887731496 MeshFilter: m_ObjectHideFlags: 0 @@ -17041,6 +17510,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17065,6 +17535,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1895596062 MeshFilter: m_ObjectHideFlags: 0 @@ -17120,6 +17591,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17144,6 +17616,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1901667384 MeshFilter: m_ObjectHideFlags: 0 @@ -17152,82 +17625,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901667381} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1907606003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1926583767 GameObject: m_ObjectHideFlags: 0 @@ -17275,6 +17672,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17299,6 +17697,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1926583770 MeshFilter: m_ObjectHideFlags: 0 @@ -17354,6 +17753,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17378,6 +17778,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1928970123 MeshFilter: m_ObjectHideFlags: 0 @@ -17433,6 +17834,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17457,6 +17859,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1957957041 MeshFilter: m_ObjectHideFlags: 0 @@ -17512,6 +17915,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17536,6 +17940,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1970018806 MeshFilter: m_ObjectHideFlags: 0 @@ -17591,6 +17996,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17615,6 +18021,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1974510906 MeshFilter: m_ObjectHideFlags: 0 @@ -17670,6 +18077,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17694,6 +18102,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1981351887 MeshFilter: m_ObjectHideFlags: 0 @@ -17749,6 +18158,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17773,6 +18183,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2006189128 MeshFilter: m_ObjectHideFlags: 0 @@ -17828,6 +18239,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17852,6 +18264,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2019026764 MeshFilter: m_ObjectHideFlags: 0 @@ -17907,6 +18320,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17931,6 +18345,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2027312071 MeshFilter: m_ObjectHideFlags: 0 @@ -17986,6 +18401,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18010,6 +18426,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2036693317 MeshFilter: m_ObjectHideFlags: 0 @@ -18065,6 +18482,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18089,6 +18507,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2037183620 MeshFilter: m_ObjectHideFlags: 0 @@ -18144,6 +18563,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18168,6 +18588,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2038469265 MeshFilter: m_ObjectHideFlags: 0 @@ -18223,6 +18644,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18247,6 +18669,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2039296765 MeshFilter: m_ObjectHideFlags: 0 @@ -18302,6 +18725,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18326,6 +18750,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2040827661 MeshFilter: m_ObjectHideFlags: 0 @@ -18341,16 +18766,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -18421,46 +18876,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &2064361793 @@ -18510,6 +18935,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18534,6 +18960,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2064361796 MeshFilter: m_ObjectHideFlags: 0 @@ -18589,6 +19016,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18613,6 +19041,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2070414141 MeshFilter: m_ObjectHideFlags: 0 @@ -18668,6 +19097,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18692,6 +19122,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079107238 MeshFilter: m_ObjectHideFlags: 0 @@ -18747,6 +19178,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18771,6 +19203,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2084708072 MeshFilter: m_ObjectHideFlags: 0 @@ -18826,6 +19259,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18850,6 +19284,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2090701780 MeshFilter: m_ObjectHideFlags: 0 @@ -18905,6 +19340,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18929,6 +19365,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2096080274 MeshFilter: m_ObjectHideFlags: 0 @@ -18984,6 +19421,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19008,6 +19446,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2097382540 MeshFilter: m_ObjectHideFlags: 0 @@ -19045,9 +19484,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2106720174 MeshRenderer: @@ -19064,6 +19503,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19088,6 +19528,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2106720175 MeshFilter: m_ObjectHideFlags: 0 @@ -19157,6 +19598,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19181,6 +19623,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2119204914 MeshFilter: m_ObjectHideFlags: 0 @@ -19236,6 +19679,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19260,6 +19704,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2127647011 MeshFilter: m_ObjectHideFlags: 0 @@ -19315,6 +19760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19339,6 +19785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136776845 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity index 0821d36bd72..d8a50c2b3a5 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity @@ -318,6 +318,11 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity index 6f16b5df781..054b0799b05 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity @@ -323,6 +323,11 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped @@ -461,6 +466,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -479,6 +485,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &85208911 Light: m_ObjectHideFlags: 0 @@ -1107,8 +1114,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 8192 @@ -1399,8 +1404,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 10 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 1024 @@ -1543,8 +1546,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 4096 @@ -2809,6 +2810,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2827,6 +2829,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1302253251 Light: m_ObjectHideFlags: 0 @@ -3575,8 +3578,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 2048 @@ -4080,8 +4081,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 1 @@ -4158,8 +4157,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 16384 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity index 2464d215047..bc04e6e63c3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity @@ -714,6 +714,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -723,6 +728,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -741,6 +747,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -830,6 +839,8 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0 AverageCorrectnessThreshold: 0 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -837,6 +848,7 @@ MonoBehaviour: waitFrames: 5 xrCompatible: 1 xrThresholdMultiplier: 1 + renderGraphCompatible: 1 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 0} --- !u!1 &593565746 @@ -1143,6 +1155,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &764415611 @@ -1171,7 +1184,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 2048 @@ -1252,6 +1265,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1270,6 +1284,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!21 &808236715 Material: serializedVersion: 6 @@ -1438,6 +1453,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -1601,6 +1617,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &899885052 GameObject: @@ -1900,6 +1917,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -2063,6 +2081,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &1266377334 GameObject: @@ -2589,6 +2608,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2598,6 +2622,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2616,6 +2641,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2795,6 +2823,11 @@ PrefabInstance: propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1569434673 @@ -3252,6 +3285,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3415,6 +3449,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2074857581 GameObject: @@ -3620,6 +3655,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3783,6 +3819,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2085158283 GameObject: @@ -4047,6 +4084,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4210,6 +4248,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2099876030 GameObject: @@ -4475,6 +4514,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4638,4 +4678,5 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] From ec2a4af58e61d168e80c4f026c127c20b8be1b4d Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 13:07:43 +0200 Subject: [PATCH 22/53] Reenabled 4021 --- .../Scenes/4x_PostProcessing/4021_LensDistortion.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index 6cb43095307..f144fd69883 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -531,7 +531,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderGraphCompatible - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 399512c217604474637824d755b47e6b29b3bc59 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 14:29:48 +0200 Subject: [PATCH 23/53] Updated yamato script to add the RenderGraph pipeline. --- .yamato/all-hdrp.yml | 6 ++ .yamato/hdrp-linux-vulkan.yml | 64 +++++++++++++++++++ .yamato/hdrp-osx-metal.yml | 85 +++++++++++++++++++++++++ .yamato/hdrp-win-dx11.yml | 61 ++++++++++++++++++ .yamato/hdrp-win-dx12.yml | 61 ++++++++++++++++++ .yamato/hdrp-win-vulkan.yml | 61 ++++++++++++++++++ .yamato/ruamel/config/__shared.metafile | 1 + .yamato/ruamel/config/hdrp.metafile | 2 + .yamato/universal-android-opengles3.yml | 6 +- .yamato/universal-android-vulkan.yml | 6 +- 10 files changed, 347 insertions(+), 6 deletions(-) diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index afefcfb3c78..ab38a10fc9c 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -7,6 +7,8 @@ All_HDRP_trunk: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk @@ -26,6 +28,8 @@ All_HDRP_fast-trunk: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_fast-trunk + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk @@ -45,6 +49,8 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index 9fb50fa81e3..6c0de12a922 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -40,6 +40,27 @@ HDRP_Linux_Vulkan_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Linux_Vulkan_playmode_RenderGraph_trunk: + name: HDRP on Linux_Vulkan_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:linux + rerun: always + commands: + - sudo -H pip install --upgrade pip + - sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Linux_Vulkan_editmode_trunk: name: HDRP on Linux_Vulkan_editmode on version trunk agent: @@ -124,6 +145,27 @@ HDRP_Linux_Vulkan_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Linux_Vulkan_playmode_RenderGraph_fast-trunk: + name: HDRP on Linux_Vulkan_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:linux + rerun: always + commands: + - sudo -H pip install --upgrade pip + - sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Linux_Vulkan_editmode_fast-trunk: name: HDRP on Linux_Vulkan_editmode on version fast-trunk agent: @@ -210,6 +252,28 @@ HDRP_Linux_Vulkan_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Linux_Vulkan_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Linux_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + commands: + - sudo -H pip install --upgrade pip + - sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index 88e76ce66ab..924792c3879 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -54,6 +54,34 @@ HDRP_OSX_Metal_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_OSX_Metal_playmode_RenderGraph_trunk: + name: HDRP on OSX_Metal_playmode_RenderGraph on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:macos + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' + - |5- + + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results' + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_Tests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_OSX_Metal_editmode_trunk: name: HDRP on OSX_Metal_editmode on version trunk agent: @@ -166,6 +194,34 @@ HDRP_OSX_Metal_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_OSX_Metal_playmode_RenderGraph_fast-trunk: + name: HDRP on OSX_Metal_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:macos + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' + - |5- + + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results' + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_Tests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_OSX_Metal_editmode_fast-trunk: name: HDRP on OSX_Metal_editmode on version fast-trunk agent: @@ -280,6 +336,35 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_OSX_Metal_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on OSX_Metal_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' + - |5- + + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results' + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_Tests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_OSX_Metal_editmode_CUSTOM-REVISION: name: HDRP on OSX_Metal_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 63d6ccf808c..c6e30b686e1 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -38,6 +38,26 @@ HDRP_Win_DX11_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_trunk: + name: HDRP on Win_DX11_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_trunk: name: HDRP on Win_DX11_editmode on version trunk agent: @@ -144,6 +164,26 @@ HDRP_Win_DX11_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_DX11_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_fast-trunk: name: HDRP on Win_DX11_editmode on version fast-trunk agent: @@ -252,6 +292,27 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_DX11_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-dx12.yml b/.yamato/hdrp-win-dx12.yml index 838ce270d01..d737430c738 100644 --- a/.yamato/hdrp-win-dx12.yml +++ b/.yamato/hdrp-win-dx12.yml @@ -38,6 +38,26 @@ HDRP_Win_DX12_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX12_playmode_RenderGraph_trunk: + name: HDRP on Win_DX12_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX12_editmode_trunk: name: HDRP on Win_DX12_editmode on version trunk agent: @@ -144,6 +164,26 @@ HDRP_Win_DX12_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX12_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_DX12_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX12_editmode_fast-trunk: name: HDRP on Win_DX12_editmode on version fast-trunk agent: @@ -252,6 +292,27 @@ HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_DX12_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_DX12_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX12_editmode_CUSTOM-REVISION: name: HDRP on Win_DX12_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-vulkan.yml b/.yamato/hdrp-win-vulkan.yml index d4a3d38b8aa..f59371f4fba 100644 --- a/.yamato/hdrp-win-vulkan.yml +++ b/.yamato/hdrp-win-vulkan.yml @@ -38,6 +38,26 @@ HDRP_Win_Vulkan_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_Vulkan_playmode_RenderGraph_trunk: + name: HDRP on Win_Vulkan_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_Vulkan_editmode_trunk: name: HDRP on Win_Vulkan_editmode on version trunk agent: @@ -144,6 +164,26 @@ HDRP_Win_Vulkan_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_Vulkan_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_Vulkan_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_Vulkan_editmode_fast-trunk: name: HDRP on Win_Vulkan_editmode on version fast-trunk agent: @@ -252,6 +292,27 @@ HDRP_Win_Vulkan_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_Vulkan_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Win_Vulkan_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/ruamel/config/__shared.metafile b/.yamato/ruamel/config/__shared.metafile index cc2f3ecd4af..726fd1a4b69 100644 --- a/.yamato/ruamel/config/__shared.metafile +++ b/.yamato/ruamel/config/__shared.metafile @@ -19,6 +19,7 @@ test_platforms: Standalone: --suite=playmode --platform=Standalone playmode: --suite=playmode playmode_XR: --suite=playmode --extra-editor-arg="-xr-tests" + playmode_RenderGraph: --suite=playmode --extra-editor-arg="-rendergraph-tests" editmode: --suite=editor --platform=editmode project_platforms: Win: diff --git a/.yamato/ruamel/config/hdrp.metafile b/.yamato/ruamel/config/hdrp.metafile index f836b150c37..233ee1f0d65 100644 --- a/.yamato/ruamel/config/hdrp.metafile +++ b/.yamato/ruamel/config/hdrp.metafile @@ -5,6 +5,7 @@ project: test_platforms: - playmode - playmode_XR + - playmode_RenderGraph - editmode - Standalone platforms: @@ -27,6 +28,7 @@ all: - editmode - playmode - playmode_XR + - playmode_RenderGraph - Standalone - platform: Win api: DX12 diff --git a/.yamato/universal-android-opengles3.yml b/.yamato/universal-android-opengles3.yml index afe425b3078..3a3a544b605 100644 --- a/.yamato/universal-android-opengles3.yml +++ b/.yamato/universal-android-opengles3.yml @@ -21,7 +21,7 @@ Universal_Android_OpenGLES3_Standalone_trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -77,7 +77,7 @@ Universal_Android_OpenGLES3_Standalone_fast-trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -134,7 +134,7 @@ Universal_Android_OpenGLES3_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: diff --git a/.yamato/universal-android-vulkan.yml b/.yamato/universal-android-vulkan.yml index f4799d96cf4..d3b09005e74 100644 --- a/.yamato/universal-android-vulkan.yml +++ b/.yamato/universal-android-vulkan.yml @@ -21,7 +21,7 @@ Universal_Android_Vulkan_Standalone_trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -77,7 +77,7 @@ Universal_Android_Vulkan_Standalone_fast-trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -134,7 +134,7 @@ Universal_Android_Vulkan_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: From 68fb303f9f2bfa0af0530c3b31b60080ee285569 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 14:49:31 +0200 Subject: [PATCH 24/53] Revert "Reenabled 4021" This reverts commit 76a7c003456f40c5e84dd454a9c291b2b57ade64. --- .../Scenes/4x_PostProcessing/4021_LensDistortion.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index f144fd69883..6cb43095307 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -531,7 +531,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderGraphCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From fb085d0f7236c46d0b073c9df9cb3adc01d0248c Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 14:49:39 +0200 Subject: [PATCH 25/53] Revert "Updated yamato with new render graph configurations" This reverts commit 7b8acc08944df4b11244ee97a1877cee91d55be9. --- .yamato/all-hdrp.yml | 6 ---- .yamato/hdrp-win-dx11.yml | 61 --------------------------------------- 2 files changed, 67 deletions(-) diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index b42c3c659f7..afefcfb3c78 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -7,8 +7,6 @@ All_HDRP_trunk: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk rerun: always - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk - rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk @@ -28,8 +26,6 @@ All_HDRP_fast-trunk: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk rerun: always - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk - rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk @@ -49,8 +45,6 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION - rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index c6e30b686e1..63d6ccf808c 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -38,26 +38,6 @@ HDRP_Win_DX11_playmode_XR_trunk: logs: paths: - "**/test-results/**" -HDRP_Win_DX11_playmode_RenderGraph_trunk: - name: HDRP on Win_DX11_playmode_RenderGraph on version trunk - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:trunk:windows - rerun: always - commands: - - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr - - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" - artifacts: - logs: - paths: - - "**/test-results/**" HDRP_Win_DX11_editmode_trunk: name: HDRP on Win_DX11_editmode on version trunk agent: @@ -164,26 +144,6 @@ HDRP_Win_DX11_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" -HDRP_Win_DX11_playmode_RenderGraph_fast-trunk: - name: HDRP on Win_DX11_playmode_RenderGraph on version fast-trunk - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows - rerun: always - commands: - - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr - - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" - artifacts: - logs: - paths: - - "**/test-results/**" HDRP_Win_DX11_editmode_fast-trunk: name: HDRP on Win_DX11_editmode on version fast-trunk agent: @@ -292,27 +252,6 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" -HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION: - name: HDRP on Win_DX11_playmode_RenderGraph on version CUSTOM-REVISION - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - commands: - - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr - - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" - artifacts: - logs: - paths: - - "**/test-results/**" HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: From b3ac2993ec5557f5d205b293cab88a459da4298c Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 14:49:46 +0200 Subject: [PATCH 26/53] Revert "Disabled for render graph tests that are currently broken." This reverts commit 84467f6956c1f14d0d0d302bdf6f8d220c5f9026. --- .../2x_Lighting/2402_Area_Rect_Shadow.unity | 178 ++- .../Scenes/2x_Lighting/2501_LightLayers.unity | 178 ++- .../2x_Lighting/2601_SSAO_HalfRes.unity | 254 ++-- .../2x_Lighting/2602_SSAO_FullRes.unity | 253 ++-- .../2x_Lighting/2701_TransparentSSR.unity | 41 +- .../3x_DebugView/3002_DebugLightLayers.unity | 41 +- .../4011_MotionBlur_PerObject.unity | 275 ++-- .../4013_TransparentMotionVector.unity | 282 ++-- .../4021_LensDistortion.unity | 20 +- .../4022_PaniniProjection.unity | 20 +- .../Scenes/4x_PostProcessing/4051_SMAA.unity | 380 ++---- .../Scenes/4x_PostProcessing/4052_TAA.unity | 31 +- .../4053_TAA-FP16Alpha.unity | 5 - .../4060_CustomPostProcess.unity | 20 +- .../4x_PostProcessing/4080_DepthOfField.unity | 19 +- .../4081_DepthOfField-FP16Alpha.unity | 30 +- .../5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 5 - .../8x_ShaderGraph/8103_PrePostPass.unity | 40 +- .../8106_UnlitShadowMatte.unity | 259 ++-- .../9x_Other/9401_MSAAForwardBoth.unity | 59 +- .../9x_Other/9401_MSAAForwardOnly.unity | 59 +- .../9x_Other/9402_AlphaToMask-Graph.unity | 12 +- .../9x_Other/9402_AlphaToMask-HDRP.unity | 12 +- .../Scenes/9x_Other/9500_LightScripting.unity | 29 +- .../9601_SkinnedMeshBatching-Off.unity | 163 +-- .../9602_SkinnedMeshBatching-On.unity | 176 +-- .../9603_MeshRendererBatching-Off.unity | 1193 ++++++----------- .../9604_MeshRendererBatching-On.unity | 1149 +++++----------- .../9x_Other/9700_CustomPass_FullScreen.unity | 5 - .../9701_CustomPass_DrawRenderers.unity | 21 +- .../Scenes/9x_Other/9901_AOV_buffers.unity | 43 +- 31 files changed, 1766 insertions(+), 3486 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity index f957e14a6e1..868997590c3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: d1e6b80487b4523419f8b0808a8fe032, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -131,6 +128,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (2) + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -191,11 +193,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (2) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &189362331 @@ -228,14 +225,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 6 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 1024 m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 200 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -247,11 +241,12 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 + m_LightTypeExtent: 1 + m_SpotLightShape: 0 m_ShapeWidth: 0.5 m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -262,21 +257,7 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15.5 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -284,9 +265,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -298,18 +280,13 @@ MonoBehaviour: m_VolumetricShadowDimmer: 1 m_ShadowFadeDistance: 10000 m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 m_Level: 0 - m_RayTracedContactShadow: 0 + m_UseOverride: 1 + m_Override: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 - m_SlopeBias: 0.5 + m_ConstantBias: 0.15 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -326,9 +303,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &189362334 Light: m_ObjectHideFlags: 0 @@ -388,7 +362,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 10} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &189362335 @@ -412,6 +385,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (3) + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -472,13 +450,84 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (3) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} +--- !u!114 &557812783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + sunSize: + m_OverrideState: 0 + m_Value: 0.04 + min: 0 + max: 1 + sunSizeConvergence: + m_OverrideState: 0 + m_Value: 5 + min: 1 + max: 10 + atmosphereThickness: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 5 + skyTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + groundColor: + m_OverrideState: 0 + m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + enableSunDisk: + m_OverrideState: 0 + m_Value: 1 --- !u!1001 &972798640 PrefabInstance: m_ObjectHideFlags: 0 @@ -486,6 +535,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (1) + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -546,11 +600,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (1) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1001 &1071061321 @@ -560,6 +609,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -620,11 +674,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &1126674573 @@ -659,6 +708,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: a435593e8df5fec4ab2279b9647b1816, type: 2} m_StaticLightingSkyUniqueID: 2 + m_SkySettings: {fileID: 557812783} + m_SkySettingsFromProfile: {fileID: -8584095877685573462, guid: a435593e8df5fec4ab2279b9647b1816, + type: 2} --- !u!114 &1126674575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -761,11 +813,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2115918006 @@ -797,9 +844,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2115918008 MeshRenderer: @@ -816,7 +863,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity index fd382b4c0df..32b374d9d61 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity @@ -358,7 +358,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -406,7 +406,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -439,7 +438,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -458,7 +456,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &58980334 Light: m_ObjectHideFlags: 0 @@ -518,7 +515,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.7318046} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &65356095 @@ -565,7 +561,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -613,7 +609,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -646,7 +641,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -665,7 +659,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &65356099 Light: m_ObjectHideFlags: 0 @@ -725,7 +718,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.6893601} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &96461834 @@ -1819,7 +1811,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1867,7 +1859,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1900,7 +1891,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1919,7 +1909,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &253966103 Light: m_ObjectHideFlags: 0 @@ -1979,7 +1968,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &266337115 @@ -2158,6 +2146,107 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274728986} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &306112926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 200 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + hdriSky: + m_OverrideState: 0 + m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + enableBackplate: + m_OverrideState: 0 + m_Value: 0 + backplateType: + m_OverrideState: 0 + m_Value: 0 + groundLevel: + m_OverrideState: 0 + m_Value: 0 + scale: + m_OverrideState: 0 + m_Value: {x: 32, y: 32} + projectionDistance: + m_OverrideState: 0 + m_Value: 16 + min: 0.0000001 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 100 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 --- !u!1 &331787933 GameObject: m_ObjectHideFlags: 0 @@ -2643,7 +2732,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2691,7 +2780,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2724,7 +2812,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2743,7 +2830,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &677342031 Light: m_ObjectHideFlags: 0 @@ -2803,7 +2889,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &698110940 @@ -3223,9 +3308,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4108,7 +4190,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4156,7 +4238,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4189,7 +4270,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4208,7 +4288,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &985985205 Light: m_ObjectHideFlags: 0 @@ -4268,7 +4347,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &990865355 @@ -5601,7 +5679,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5649,7 +5727,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5682,7 +5759,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5701,7 +5777,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386441945 Light: m_ObjectHideFlags: 0 @@ -5761,7 +5836,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1422636729 @@ -5808,7 +5882,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5856,7 +5930,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5889,7 +5962,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5908,7 +5980,6 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1422636733 Light: m_ObjectHideFlags: 0 @@ -5968,7 +6039,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 1.441993, w: 3.2154703} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1433395784 @@ -6594,7 +6664,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6642,7 +6712,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6675,7 +6744,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6694,7 +6762,6 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1687167846 Light: m_ObjectHideFlags: 0 @@ -6754,7 +6821,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1730395417 @@ -7205,11 +7271,6 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -7626,9 +7687,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -8893,11 +8951,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -8907,7 +8960,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -8926,9 +8978,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9006,11 +9055,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -9020,7 +9064,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -9039,9 +9082,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity index 68d9cc8b2ae..ac782911aea 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: a5b7c221c4f9f984c9dfa998b2f282ce, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -261,42 +257,15 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818654557 + value: 69284264148765 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -508,15 +477,32 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: checkMemoryAllocation - value: 1 + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 0 + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -552,8 +538,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -578,7 +562,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820961446 MeshFilter: m_ObjectHideFlags: 0 @@ -647,8 +630,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -673,7 +654,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1832587852 MeshFilter: m_ObjectHideFlags: 0 @@ -742,8 +722,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -768,7 +746,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1873845493 MeshFilter: m_ObjectHideFlags: 0 @@ -802,6 +779,7 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} + - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -809,7 +787,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700541 +--- !u!114 &2023700540 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -818,110 +796,98 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 3.1415927 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 2 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + volumetricShadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.2 + viewBiasMax: 100 + viewBiasScale: 1 + normalBiasMin: 0.5 + normalBiasMax: 0.5 + normalBiasScale: 1 + sampleBiasScale: 0 + edgeLeakFixup: 0 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 +--- !u!114 &2023700541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023700539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 + m_Version: 5 + directionalIntensity: 3.1415927 + punctualIntensity: 600 + areaIntensity: 200 + enableSpotReflector: 0 + luxAtDistance: 1 + m_InnerSpotPercent: 0 + lightDimmer: 1 + m_VolumetricDimmer: 1 + lightUnit: 2 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + m_SpotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 0.99 + applyRangeAttenuation: 1 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 3.1415927 + displayAreaLightEmissiveMesh: 0 + areaLightCookie: {fileID: 0} + areaLightShadowCone: 120 + evsmExponent: 15 + evsmLightLeakBias: 0 + evsmVarianceBias: 0.00001 + evsmBlurPasses: 0 + lightLayers: 1 + lightlayersMask: 1 + linkShadowLayers: 1 + shadowNearPlane: 0.1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 16 + minFilterSize: 0.00001 + kernelSize: 5 + lightAngle: 1 + maxDepthBias: 0.001 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -930,9 +896,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 9 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -981,7 +946,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity index fdb0950f687..65d9f609cd2 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 87f2cf15e682aa241982fc3c774314bc, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -261,42 +257,15 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818654557 + value: 69284264148765 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -508,10 +477,32 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 0 + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -547,8 +538,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -573,7 +562,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &908551374 MeshFilter: m_ObjectHideFlags: 0 @@ -642,8 +630,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -668,7 +654,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1063449301 MeshFilter: m_ObjectHideFlags: 0 @@ -737,8 +722,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -763,7 +746,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1931848246 MeshFilter: m_ObjectHideFlags: 0 @@ -797,6 +779,7 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} + - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -804,7 +787,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700541 +--- !u!114 &2023700540 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -813,110 +796,98 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 3.1415927 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 2 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + volumetricShadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.2 + viewBiasMax: 100 + viewBiasScale: 1 + normalBiasMin: 0.5 + normalBiasMax: 0.5 + normalBiasScale: 1 + sampleBiasScale: 0 + edgeLeakFixup: 0 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 +--- !u!114 &2023700541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023700539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 + m_Version: 5 + directionalIntensity: 3.1415927 + punctualIntensity: 600 + areaIntensity: 200 + enableSpotReflector: 0 + luxAtDistance: 1 + m_InnerSpotPercent: 0 + lightDimmer: 1 + m_VolumetricDimmer: 1 + lightUnit: 2 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + m_SpotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 0.99 + applyRangeAttenuation: 1 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 3.1415927 + displayAreaLightEmissiveMesh: 0 + areaLightCookie: {fileID: 0} + areaLightShadowCone: 120 + evsmExponent: 15 + evsmLightLeakBias: 0 + evsmVarianceBias: 0.00001 + evsmBlurPasses: 0 + lightLayers: 1 + lightlayersMask: 1 + linkShadowLayers: 1 + shadowNearPlane: 0.1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 16 + minFilterSize: 0.00001 + kernelSize: 5 + lightAngle: 1 + maxDepthBias: 0.001 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -925,9 +896,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 9 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -976,7 +946,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity index c5d8ab351eb..c06dd265b91 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity @@ -118,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -166,7 +164,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -472,7 +470,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -520,7 +518,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -553,7 +550,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -570,9 +566,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &280720572 Light: m_ObjectHideFlags: 0 @@ -632,7 +625,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &280720573 @@ -787,7 +779,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -904,6 +896,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &491657228 Transform: m_ObjectHideFlags: 1 @@ -1407,7 +1401,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1631,7 +1625,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1856,7 +1850,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2526,7 +2520,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2717,7 +2711,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2813,7 +2807,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2909,7 +2903,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2991,7 +2985,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3101,7 +3095,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3230,7 +3224,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3554,11 +3548,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 3558f110980f9af48b96167a74d9bf69, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2024456295 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity index e68822c81df..f7f9b1a295d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity @@ -121,7 +121,7 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 + keepTiles: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -155,7 +155,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -203,7 +203,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -236,7 +235,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -253,9 +251,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &16453702 Light: m_ObjectHideFlags: 0 @@ -315,7 +310,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &16453703 @@ -362,7 +356,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -410,7 +404,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -443,7 +436,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -460,9 +452,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &83800134 Light: m_ObjectHideFlags: 0 @@ -522,7 +511,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.34} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &83800135 @@ -665,6 +653,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -866,11 +856,6 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: DebugViewController, Unity.RenderPipelines.HighDefinition-Tests.Runtime objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &719009298 @@ -1374,7 +1359,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1422,7 +1407,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1455,7 +1439,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1472,9 +1455,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1629224201 Light: m_ObjectHideFlags: 0 @@ -1534,7 +1514,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1629224202 @@ -2114,7 +2093,6 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0.53 --- !u!4 &2035111235 @@ -2143,7 +2121,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 2 m_ObsoleteUseShadowQualitySettings: 1 m_ObsoleteCustomShadowResolution: 1024 @@ -2191,7 +2169,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2224,7 +2201,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.005 - 0.015 @@ -2241,9 +2217,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &2132904863 GameObject: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity index 7871e0c33d1..e95f3cfdc26 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: c35a6f302d21bc0409b93c78214222e3, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -178,8 +174,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -204,7 +198,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &102126622 Transform: m_ObjectHideFlags: 0 @@ -274,6 +267,31 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -297,12 +315,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69284264410909 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -494,41 +512,6 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_ObsoleteRenderingPath - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &177840196 stripped @@ -613,8 +596,6 @@ MeshRenderer: m_MotionVectors: 0 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -639,7 +620,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -726,8 +706,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -752,7 +730,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &428956473 MeshFilter: m_ObjectHideFlags: 0 @@ -839,8 +816,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -865,7 +840,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &710282033 MeshFilter: m_ObjectHideFlags: 0 @@ -899,6 +873,7 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} + - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -906,7 +881,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016621 +--- !u!114 &795016620 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -915,110 +890,100 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 3.1415927 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 2 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + volumetricShadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.2 + viewBiasMax: 100 + viewBiasScale: 1 + normalBiasMin: 0.5 + normalBiasMax: 0.5 + normalBiasScale: 1 + sampleBiasScale: 0 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &795016621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795016619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 + m_Version: 4 + directionalIntensity: 3.1415927 + punctualIntensity: 600 + areaIntensity: 200 + enableSpotReflector: 0 + luxAtDistance: 1 + m_InnerSpotPercent: 0 + lightDimmer: 1 + m_VolumetricDimmer: 1 + lightUnit: 2 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + m_SpotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 0.99 + applyRangeAttenuation: 1 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 3.1415927 + displayAreaLightEmissiveMesh: 0 + areaLightCookie: {fileID: 0} + areaLightShadowCone: 120 + evsmExponent: 15 + evsmLightLeakBias: 0 + evsmVarianceBias: 0.00001 + evsmBlurPasses: 0 + lightLayers: 1 + shadowNearPlane: 0.1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 16 + minFilterSize: 0.00001 + kernelSize: 5 + lightAngle: 1 + maxDepthBias: 0.001 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -1027,9 +992,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 9 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -1078,7 +1042,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &795016623 @@ -1159,8 +1122,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1185,7 +1146,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1071859215 MeshFilter: m_ObjectHideFlags: 0 @@ -1262,8 +1222,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1288,7 +1246,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1316705464 Transform: m_ObjectHideFlags: 0 @@ -1430,8 +1387,6 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1456,7 +1411,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1934046221 MeshFilter: m_ObjectHideFlags: 0 @@ -1533,8 +1487,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1559,7 +1511,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &2058568487 Transform: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity index 7c0300c865a..cc313b94bbd 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 65750d7cf7c87af4bb393c06fcbc9907, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -179,6 +175,41 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 180 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -202,12 +233,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69284264410909 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -399,51 +430,6 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_ObsoleteRenderingPath - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 320 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &309473258 @@ -510,8 +496,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -536,7 +520,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -570,6 +553,7 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} + - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -577,7 +561,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016621 +--- !u!114 &795016620 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -586,110 +570,100 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 3.1415927 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 2 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + volumetricShadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.2 + viewBiasMax: 100 + viewBiasScale: 1 + normalBiasMin: 0.5 + normalBiasMax: 0.5 + normalBiasScale: 1 + sampleBiasScale: 0 + edgeLeakFixup: 1 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &795016621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795016619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 + m_Version: 4 + directionalIntensity: 3.1415927 + punctualIntensity: 600 + areaIntensity: 200 + enableSpotReflector: 0 + luxAtDistance: 1 + m_InnerSpotPercent: 0 + lightDimmer: 1 + m_VolumetricDimmer: 1 + lightUnit: 2 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + m_SpotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 0.99 + applyRangeAttenuation: 1 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 3.1415927 + displayAreaLightEmissiveMesh: 0 + areaLightCookie: {fileID: 0} + areaLightShadowCone: 120 + evsmExponent: 15 + evsmLightLeakBias: 0 + evsmVarianceBias: 0.00001 + evsmBlurPasses: 0 + lightLayers: 1 + shadowNearPlane: 0.1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 16 + minFilterSize: 0.00001 + kernelSize: 5 + lightAngle: 1 + maxDepthBias: 0.001 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -698,9 +672,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 9 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -749,7 +722,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &795016623 @@ -858,9 +830,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1483280835 MeshRenderer: @@ -876,8 +848,6 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -902,7 +872,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1483280836 MeshFilter: m_ObjectHideFlags: 0 @@ -963,7 +932,6 @@ MonoBehaviour: settingType: 1 gBuffer: 0 fullScreenDebugMode: 14 - lightlayers: 0 --- !u!114 &1618510980 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index 6cb43095307..733a1cfd5be 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 1219cfc7625a6e34e9b81f20088b6c94, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -204,8 +200,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -230,7 +224,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -321,12 +314,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69284264410909 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -528,10 +521,5 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity index bc8bd1f9681..8f377bac91c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 1dea28949d52d764fa2f6f75a37f742c, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -204,8 +200,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -230,7 +224,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -326,12 +319,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69284264410909 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -533,10 +526,5 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity index 8944b649e7b..590ae2d5a80 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 8dc0d3965082d3b44a051ebc67373c24, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -184,8 +180,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -210,7 +204,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &40006672 MeshFilter: m_ObjectHideFlags: 0 @@ -335,8 +328,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -361,7 +352,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158095357 MeshFilter: m_ObjectHideFlags: 0 @@ -430,8 +420,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -456,7 +444,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172909229 MeshFilter: m_ObjectHideFlags: 0 @@ -525,8 +512,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -551,7 +536,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &234304205 MeshFilter: m_ObjectHideFlags: 0 @@ -620,8 +604,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -646,7 +628,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &307441730 MeshFilter: m_ObjectHideFlags: 0 @@ -715,8 +696,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -741,7 +720,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &329988774 MeshFilter: m_ObjectHideFlags: 0 @@ -810,8 +788,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -836,7 +812,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385520400 MeshFilter: m_ObjectHideFlags: 0 @@ -905,8 +880,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -931,7 +904,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &396827034 MeshFilter: m_ObjectHideFlags: 0 @@ -1000,8 +972,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1026,7 +996,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403782451 MeshFilter: m_ObjectHideFlags: 0 @@ -1095,8 +1064,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1121,7 +1088,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &408685716 MeshFilter: m_ObjectHideFlags: 0 @@ -1190,8 +1156,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1216,7 +1180,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &438277602 MeshFilter: m_ObjectHideFlags: 0 @@ -1285,8 +1248,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1311,7 +1272,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447990307 MeshFilter: m_ObjectHideFlags: 0 @@ -1380,8 +1340,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1406,7 +1364,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &466247374 MeshFilter: m_ObjectHideFlags: 0 @@ -1475,8 +1432,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1501,7 +1456,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &470233058 MeshFilter: m_ObjectHideFlags: 0 @@ -1570,8 +1524,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1596,7 +1548,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475510514 MeshFilter: m_ObjectHideFlags: 0 @@ -1665,8 +1616,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1691,7 +1640,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545534896 MeshFilter: m_ObjectHideFlags: 0 @@ -1729,9 +1677,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -1747,8 +1695,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1773,7 +1719,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &552920928 MeshFilter: m_ObjectHideFlags: 0 @@ -1856,8 +1801,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1882,7 +1825,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &574338704 MeshFilter: m_ObjectHideFlags: 0 @@ -1951,8 +1893,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1977,7 +1917,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &590011005 MeshFilter: m_ObjectHideFlags: 0 @@ -2046,8 +1985,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2072,7 +2009,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &627111561 MeshFilter: m_ObjectHideFlags: 0 @@ -2141,8 +2077,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2167,7 +2101,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &663310342 MeshFilter: m_ObjectHideFlags: 0 @@ -2236,8 +2169,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2262,7 +2193,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &692812422 MeshFilter: m_ObjectHideFlags: 0 @@ -2331,8 +2261,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2357,7 +2285,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &695012948 MeshFilter: m_ObjectHideFlags: 0 @@ -2426,8 +2353,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2452,7 +2377,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &747987085 MeshFilter: m_ObjectHideFlags: 0 @@ -2521,8 +2445,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2547,7 +2469,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &769543522 MeshFilter: m_ObjectHideFlags: 0 @@ -2616,8 +2537,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2642,7 +2561,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &794411577 MeshFilter: m_ObjectHideFlags: 0 @@ -2711,8 +2629,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2737,7 +2653,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809298687 MeshFilter: m_ObjectHideFlags: 0 @@ -2806,8 +2721,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2832,7 +2745,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &810879982 MeshFilter: m_ObjectHideFlags: 0 @@ -2901,8 +2813,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2927,7 +2837,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &815359632 MeshFilter: m_ObjectHideFlags: 0 @@ -2996,8 +2905,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3022,7 +2929,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &835098136 MeshFilter: m_ObjectHideFlags: 0 @@ -3091,8 +2997,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3117,7 +3021,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &865880060 MeshFilter: m_ObjectHideFlags: 0 @@ -3186,8 +3089,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3212,7 +3113,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &927672921 MeshFilter: m_ObjectHideFlags: 0 @@ -3281,8 +3181,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3307,7 +3205,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &973608318 MeshFilter: m_ObjectHideFlags: 0 @@ -3376,8 +3273,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3402,7 +3297,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1017656388 MeshFilter: m_ObjectHideFlags: 0 @@ -3471,8 +3365,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3497,7 +3389,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1042596661 MeshFilter: m_ObjectHideFlags: 0 @@ -3566,8 +3457,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3592,7 +3481,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1060853707 MeshFilter: m_ObjectHideFlags: 0 @@ -3612,6 +3500,7 @@ GameObject: - component: {fileID: 1079224357} - component: {fileID: 1079224356} - component: {fileID: 1079224355} + - component: {fileID: 1079224354} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -3619,7 +3508,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1079224355 +--- !u!114 &1079224354 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3628,110 +3517,100 @@ MonoBehaviour: m_GameObject: {fileID: 1079224353} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 - m_Intensity: 3.1415927 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 - m_LightUnit: 2 - m_FadeDistance: 10000 - m_AffectDiffuse: 1 - m_AffectSpecular: 1 - m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 - m_SoftnessScale: 1 - m_UseCustomSpotLightShadowCone: 0 - m_CustomSpotLightShadowCone: 30 - m_MaxSmoothness: 0.99 - m_ApplyRangeAttenuation: 1 - m_DisplayAreaLightEmissiveMesh: 0 - m_AreaLightCookie: {fileID: 0} - m_AreaLightShadowCone: 120 - m_UseScreenSpaceShadows: 0 - m_InteractsWithSky: 1 - m_AngularDiameter: 0.5 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} - m_Distance: 1.5e+11 - m_UseRayTracedShadows: 0 - m_NumRayTracingSamples: 4 - m_FilterTracedShadow: 1 - m_FilterSizeTraced: 16 - m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 - m_EvsmExponent: 15 - m_EvsmLightLeakBias: 0 - m_EvsmVarianceBias: 0.00001 - m_EvsmBlurPasses: 0 - m_LightlayersMask: 1 - m_LinkShadowLayers: 1 - m_ShadowNearPlane: 0.1 - m_BlockerSampleCount: 24 - m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 - m_KernelSize: 5 - m_LightAngle: 1 - m_MaxDepthBias: 0.001 - m_ShadowResolution: - m_Override: 512 - m_UseOverride: 1 - m_Level: 1 - m_ShadowDimmer: 1 - m_VolumetricShadowDimmer: 1 - m_ShadowFadeDistance: 10000 - m_UseContactShadow: - m_Override: 0 - m_UseOverride: 1 - m_Level: 0 - m_RayTracedContactShadow: 0 - m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 - m_NormalBias: 0.75 - m_SlopeBias: 0.5 - m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_ShadowCascadeRatios: + m_Version: 1 + shadowResolution: 512 + shadowDimmer: 1 + volumetricShadowDimmer: 1 + shadowFadeDistance: 10000 + contactShadows: 0 + viewBiasMin: 0.2 + viewBiasMax: 100 + viewBiasScale: 1 + normalBiasMin: 0.5 + normalBiasMax: 0.5 + normalBiasScale: 1 + sampleBiasScale: 0 + edgeLeakFixup: 0 + edgeToleranceNormal: 1 + edgeTolerance: 1 + shadowCascadeCount: 4 + shadowCascadeRatios: - 0.05 - 0.2 - 0.3 - m_ShadowCascadeBorders: + shadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - m_ShadowAlgorithm: 0 - m_ShadowVariant: 0 - m_ShadowPrecision: 0 + shadowAlgorithm: 0 + shadowVariant: 0 + shadowPrecision: 0 + shadowData: + format: 0 + data: + shadowDatas: [] +--- !u!114 &1079224355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079224353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 + m_Version: 4 + directionalIntensity: 3.1415927 + punctualIntensity: 600 + areaIntensity: 200 + enableSpotReflector: 0 + luxAtDistance: 1 + m_InnerSpotPercent: 0 + lightDimmer: 1 + m_VolumetricDimmer: 1 + lightUnit: 2 + sunDiskSize: 1 + sunHaloSize: 0.1 + fadeDistance: 10000 + affectDiffuse: 1 + affectSpecular: 1 + nonLightmappedOnly: 0 + lightTypeExtent: 0 + m_SpotLightShape: 0 + shapeWidth: 0.5 + shapeHeight: 0.5 + aspectRatio: 1 + shapeRadius: 0 + maxSmoothness: 0.99 + applyRangeAttenuation: 1 useOldInspector: 0 useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 + displayLightIntensity: 3.1415927 + displayAreaLightEmissiveMesh: 0 + areaLightCookie: {fileID: 0} + areaLightShadowCone: 120 + evsmExponent: 15 + evsmLightLeakBias: 0 + evsmVarianceBias: 0.00001 + evsmBlurPasses: 0 + lightLayers: 1 + shadowNearPlane: 0.1 + shadowSoftness: 0.5 + blockerSampleCount: 24 + filterSampleCount: 16 + minFilterSize: 0.00001 + kernelSize: 5 + lightAngle: 1 + maxDepthBias: 0.001 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -3740,9 +3619,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079224353} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 9 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -3791,7 +3669,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1079224357 @@ -3876,12 +3753,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69284264410909 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -4108,11 +3985,6 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 512 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 @@ -4175,8 +4047,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4201,7 +4071,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1121401768 MeshFilter: m_ObjectHideFlags: 0 @@ -4270,8 +4139,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4296,7 +4163,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1141094899 MeshFilter: m_ObjectHideFlags: 0 @@ -4365,8 +4231,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4391,7 +4255,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1158666092 MeshFilter: m_ObjectHideFlags: 0 @@ -4460,8 +4323,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4486,7 +4347,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1164744979 MeshFilter: m_ObjectHideFlags: 0 @@ -4555,8 +4415,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4581,7 +4439,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1212374789 MeshFilter: m_ObjectHideFlags: 0 @@ -4650,8 +4507,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4676,7 +4531,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321506414 MeshFilter: m_ObjectHideFlags: 0 @@ -4745,8 +4599,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4771,7 +4623,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1403629108 MeshFilter: m_ObjectHideFlags: 0 @@ -4840,8 +4691,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4866,7 +4715,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417593602 MeshFilter: m_ObjectHideFlags: 0 @@ -4935,8 +4783,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4961,7 +4807,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460963255 MeshFilter: m_ObjectHideFlags: 0 @@ -5030,8 +4875,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5056,7 +4899,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1489396295 MeshFilter: m_ObjectHideFlags: 0 @@ -5125,8 +4967,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5151,7 +4991,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1556045220 MeshFilter: m_ObjectHideFlags: 0 @@ -5220,8 +5059,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5246,7 +5083,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1578692525 MeshFilter: m_ObjectHideFlags: 0 @@ -5315,8 +5151,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5341,7 +5175,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591606731 MeshFilter: m_ObjectHideFlags: 0 @@ -5410,8 +5243,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5436,7 +5267,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1636842448 MeshFilter: m_ObjectHideFlags: 0 @@ -5505,8 +5335,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5531,7 +5359,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1662777384 MeshFilter: m_ObjectHideFlags: 0 @@ -5600,8 +5427,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5626,7 +5451,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680240288 MeshFilter: m_ObjectHideFlags: 0 @@ -5695,8 +5519,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5721,7 +5543,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1702910558 MeshFilter: m_ObjectHideFlags: 0 @@ -5790,8 +5611,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5816,7 +5635,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1718495713 MeshFilter: m_ObjectHideFlags: 0 @@ -5885,8 +5703,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5911,7 +5727,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1768881573 MeshFilter: m_ObjectHideFlags: 0 @@ -5980,8 +5795,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6006,7 +5819,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1812995122 MeshFilter: m_ObjectHideFlags: 0 @@ -6075,8 +5887,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6101,7 +5911,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1837835318 MeshFilter: m_ObjectHideFlags: 0 @@ -6207,8 +6016,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6233,7 +6040,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1913705761 MeshFilter: m_ObjectHideFlags: 0 @@ -6302,8 +6108,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6328,7 +6132,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1988598091 MeshFilter: m_ObjectHideFlags: 0 @@ -6453,8 +6256,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6479,7 +6280,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2077504822 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity index 936393226d7..a9175d91f8a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity @@ -120,8 +120,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -875,7 +873,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1032,11 +1030,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1046,7 +1039,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1065,9 +1057,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2023,9 +2012,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -3925,7 +3914,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3971,9 +3960,7 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4006,7 +3993,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4023,9 +4009,6 @@ MonoBehaviour: useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -4085,7 +4068,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1079224357 @@ -4418,11 +4400,6 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity index f2d252f5ab5..55a06d44306 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity @@ -4418,11 +4418,6 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity index a343f089f62..1e0cb3d7094 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 85e59e6fb918b384290a9820ad83d27f, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -205,7 +202,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -230,7 +226,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -321,12 +316,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 69456063102749 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -543,11 +538,6 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1312917302 @@ -583,7 +573,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -608,7 +597,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1312917304 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity index b07a4044f28..cdc8bb1f5af 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity @@ -118,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -375,7 +373,6 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -390,7 +387,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_LightmapParameters: {fileID: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -499,7 +496,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803629126 @@ -528,7 +524,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -574,9 +570,7 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -609,7 +603,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -626,9 +619,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -809,11 +799,6 @@ PrefabInstance: propertyPath: backgroundColorHDR.b value: 0.29107332 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1175354105 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity index 12be196607f..a32049a39e2 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -376,7 +374,6 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -391,7 +388,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_LightmapParameters: {fileID: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -500,7 +497,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803629126 @@ -529,7 +525,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -575,9 +571,7 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -610,7 +604,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -627,9 +620,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -821,11 +811,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d39c8f0447409a541a78d12c526207ee, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1122444516 @@ -857,7 +842,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1109,11 +1094,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1123,7 +1103,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1142,9 +1121,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 81c4659c77f..51c3bdbdc9c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -285,10 +285,5 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity index 36d34a60910..91936fec90c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity @@ -215,11 +215,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -229,7 +224,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -248,9 +242,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -340,8 +331,6 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0.001 AverageCorrectnessThreshold: 0.0001 UseHDR: 0 - UseBackBuffer: 0 - ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -349,7 +338,6 @@ MonoBehaviour: waitFrames: 0 xrCompatible: 0 xrThresholdMultiplier: 1 - renderGraphCompatible: 0 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} @@ -459,11 +447,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -473,7 +456,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -492,9 +474,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -764,7 +743,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -812,7 +791,6 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -845,7 +823,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -862,9 +839,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &214615002 Light: m_ObjectHideFlags: 0 @@ -924,7 +898,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &214615003 @@ -2933,11 +2906,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2947,7 +2915,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2966,9 +2933,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3078,6 +3042,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: d96c2fdce7fa1e24fa2e6a67853cec3f, type: 2} m_StaticLightingSkyUniqueID: 2 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &2102952965 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity index 475be4f7c07..225992a0eb6 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -153,7 +151,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -172,7 +170,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -282,7 +279,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -377,7 +373,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -440,7 +435,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -459,7 +454,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -631,7 +625,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -650,7 +644,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -760,7 +753,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -855,7 +847,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1017,7 +1008,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1036,7 +1027,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1146,7 +1136,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1213,7 +1202,7 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 0} + sharedProfile: {fileID: 11400000, guid: 62ad55275245cad4290c3d0f370a6be8, type: 2} --- !u!4 &701793308 Transform: m_ObjectHideFlags: 0 @@ -1369,11 +1358,6 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 1290 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &717487235 @@ -1405,7 +1389,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1424,7 +1408,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1534,7 +1517,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1568,6 +1550,98 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759676931} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &776767567 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Area Light + m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _DistortionVectorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UnlitColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlbedoAffectEmissive: 0 + - _AlphaCutoff: 0.5 + - _AlphaCutoffEnable: 0 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _BlendMode: 0 + - _CullMode: 2 + - _Cutoff: 0.5 + - _DistortionBlendMode: 0 + - _DistortionBlurBlendMode: 0 + - _DistortionBlurDstBlend: 0 + - _DistortionBlurRemapMax: 1 + - _DistortionBlurRemapMin: 0 + - _DistortionBlurScale: 1 + - _DistortionBlurSrcBlend: 0 + - _DistortionDepthTest: 1 + - _DistortionDstBlend: 0 + - _DistortionEnable: 0 + - _DistortionOnly: 0 + - _DistortionScale: 1 + - _DistortionSrcBlend: 0 + - _DistortionVectorBias: -1 + - _DistortionVectorScale: 2 + - _DoubleSidedEnable: 0 + - _DstBlend: 0 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 + - _EnableFogOnTransparent: 0 + - _HdrpVersion: 2 + - _IncludeIndirectLighting: 0 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 0 + - _StencilRefDistortionVec: 64 + - _StencilRefMV: 128 + - _StencilWriteMask: 3 + - _StencilWriteMaskDepth: 32 + - _StencilWriteMaskDistortionVec: 64 + - _StencilWriteMaskMV: 128 + - _SurfaceType: 0 + - _TransparentCullMode: 2 + - _TransparentSortPriority: 0 + - _UseEmissiveIntensity: 0 + - _ZTestDepthEqualForOpaque: 4 + - _ZTestModeDistortion: 8 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissiveColor: {r: 0.12732396, g: 0.12732396, b: 0.12732396, a: 0.12732396} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} + - _UnlitColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] --- !u!1 &831104153 GameObject: m_ObjectHideFlags: 0 @@ -1598,7 +1672,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1632,11 +1706,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1644,9 +1713,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1679,7 +1745,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1696,9 +1761,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &831104155 Light: m_ObjectHideFlags: 0 @@ -1758,7 +1820,6 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &831104156 @@ -1930,7 +1991,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2025,7 +2085,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2088,7 +2147,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2107,7 +2166,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2167,6 +2225,8 @@ GameObject: - component: {fileID: 1062541562} - component: {fileID: 1062541561} - component: {fileID: 1062541560} + - component: {fileID: 1062541559} + - component: {fileID: 1062541558} m_Layer: 0 m_Name: Area Light m_TagString: Untagged @@ -2174,6 +2234,54 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!33 &1062541558 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1062541557} + m_Mesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} +--- !u!23 &1062541559 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1062541557} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 776767567} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1062541560 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2186,7 +2294,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2220,11 +2328,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2232,9 +2335,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 10 m_EvsmLightLeakBias: 0.448 m_EvsmVarianceBias: 0 @@ -2267,7 +2367,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2284,9 +2383,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 12 - m_AreaLightEmissiveMeshShadowCastingMode: 1 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 1 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1062541561 Light: m_ObjectHideFlags: 0 @@ -2346,7 +2442,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 64} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1062541562 @@ -2424,7 +2519,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2519,7 +2613,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2614,7 +2707,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2678,7 +2770,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2712,11 +2804,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2724,9 +2811,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2759,7 +2843,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2776,9 +2859,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1562174630 Light: m_ObjectHideFlags: 0 @@ -2838,7 +2918,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1562174631 @@ -2884,7 +2963,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2903,7 +2982,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3013,7 +3091,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3076,7 +3153,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3095,7 +3172,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3173,7 +3249,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3192,7 +3268,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3270,7 +3345,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3289,7 +3364,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3367,7 +3441,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3386,7 +3460,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3464,7 +3537,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3483,7 +3556,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3562,7 +3634,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3596,11 +3668,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3608,9 +3675,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3643,7 +3707,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3660,9 +3723,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1992832556 Light: m_ObjectHideFlags: 0 @@ -3722,7 +3782,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1992832557 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity index 4e0883eca5f..e7d6c6dfe9d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} + m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: adeb6e0e8d1cb2a4f88df26fcda87bac, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,11 +196,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1693911544 @@ -214,6 +205,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -269,44 +265,7 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Version - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_MinFilterSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_ShadowResolution.m_Level - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Version - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_MinFilterSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_ShadowResolution.m_Level - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} - - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} --- !u!1 &1916420829 GameObject: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity index bf2527a1a48..7da9c830d94 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} + m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: d38511e38b409a745a47b6eaa41c92c5, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -263,11 +259,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5493111667791475096 @@ -277,6 +268,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -332,52 +328,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Version - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_MinFilterSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_ShadowResolution.m_Level - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5493111666879982181, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Version - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_MinFilterSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_ShadowResolution.m_Level - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5493111667044481732, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_Shadows.m_Type value: 0 objectReference: {fileID: 0} - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} - - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity index 7ff9f32fa58..d4032c6bd49 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity @@ -156,6 +156,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -350,11 +352,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -543,11 +540,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.36045727 objectReference: {fileID: 0} - - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_Version - value: 11 - objectReference: {fileID: 0} - target: {fileID: 4722329110712897087, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalScale.x diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity index cfe54217c21..20f002649cc 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity @@ -156,6 +156,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -350,11 +352,6 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -638,11 +635,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 20cc6a2b7d30ae54c9bd8673cafeac38, type: 2} - - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_Version - value: 11 - objectReference: {fileID: 0} - target: {fileID: 4722329110318162793, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_RootOrder diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity index 76c89b16f8d..ccd36a54ee2 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,10 +96,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: c751d73340dd34b42bbd5ae17c28848c, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +117,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -131,14 +127,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -208,10 +196,13 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -393,7 +384,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -418,7 +408,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828622937 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity index b2d28d062bb..d3a23be3c72 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -688,11 +686,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -702,7 +695,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -721,9 +713,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -803,7 +792,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -837,11 +826,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -849,9 +833,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -884,7 +865,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -901,9 +881,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &316708079 Light: m_ObjectHideFlags: 0 @@ -963,7 +940,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &316708080 @@ -1058,7 +1034,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1923,6 +1898,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &627418905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2125,7 +2102,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2159,11 +2136,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2171,9 +2143,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2206,7 +2175,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2223,9 +2191,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &739942738 Light: m_ObjectHideFlags: 0 @@ -2285,7 +2250,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &739942739 @@ -2546,7 +2510,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2580,11 +2544,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2592,9 +2551,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2627,7 +2583,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2644,9 +2599,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &803090226 Light: m_ObjectHideFlags: 0 @@ -2706,7 +2658,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803090227 @@ -2893,7 +2844,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2927,11 +2878,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2939,9 +2885,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2974,7 +2917,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2991,9 +2933,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &928375464 Light: m_ObjectHideFlags: 0 @@ -3053,7 +2992,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &928375465 @@ -3221,7 +3159,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3238,11 +3176,6 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -3251,7 +3184,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3268,11 +3201,6 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -3341,7 +3269,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3358,11 +3286,6 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowNearPlane - value: 0.2 - objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3896,7 +3819,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3930,11 +3853,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3942,9 +3860,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3977,7 +3892,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3994,9 +3908,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1237229781 Light: m_ObjectHideFlags: 0 @@ -4056,7 +3967,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1237229782 @@ -4140,7 +4050,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4174,11 +4084,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4186,9 +4091,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4221,7 +4123,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4238,9 +4139,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1274396916 Light: m_ObjectHideFlags: 0 @@ -4300,7 +4198,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1274396917 @@ -5591,11 +5488,6 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1789434830 stripped @@ -5709,11 +5601,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5723,7 +5610,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5742,9 +5628,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6204,7 +6087,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6238,11 +6121,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6250,9 +6128,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6285,7 +6160,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6302,9 +6176,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2010550058 Light: m_ObjectHideFlags: 0 @@ -6364,7 +6235,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2010550059 @@ -6528,11 +6398,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6542,7 +6407,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6561,9 +6425,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity index c5feef8b2a1..bd63f5f084e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -677,6 +675,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &160564957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1095,7 +1095,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1129,11 +1129,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1141,9 +1136,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1176,7 +1168,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1193,9 +1184,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &376190249 Light: m_ObjectHideFlags: 0 @@ -1255,7 +1243,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &376190250 @@ -1622,7 +1609,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1656,11 +1643,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1668,9 +1650,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1703,7 +1682,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1720,9 +1698,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &597864850 Light: m_ObjectHideFlags: 0 @@ -1782,7 +1757,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &597864851 @@ -1829,7 +1803,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1863,11 +1837,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1875,9 +1844,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1910,7 +1876,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1927,9 +1892,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &632939249 Light: m_ObjectHideFlags: 0 @@ -1989,7 +1951,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &632939250 @@ -2156,7 +2117,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2190,11 +2151,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2202,9 +2158,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2237,7 +2190,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2254,9 +2206,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &667701177 Light: m_ObjectHideFlags: 0 @@ -2316,7 +2265,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &667701178 @@ -3562,11 +3510,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3574,9 +3517,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3609,7 +3549,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3626,9 +3565,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1190946901 Light: m_ObjectHideFlags: 0 @@ -3688,7 +3624,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1190946902 @@ -3794,11 +3729,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -3808,7 +3738,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3827,9 +3756,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3940,7 +3866,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4410,11 +4335,6 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1311907884 @@ -4564,7 +4484,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4598,11 +4518,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4610,9 +4525,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4645,7 +4557,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4662,9 +4573,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1313756196 Light: m_ObjectHideFlags: 0 @@ -4724,7 +4632,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1313756197 @@ -4998,7 +4905,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -5032,11 +4939,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -5044,9 +4946,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5079,7 +4978,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5096,9 +4994,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1503478094 Light: m_ObjectHideFlags: 0 @@ -5158,7 +5053,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1503478095 @@ -5824,7 +5718,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5841,11 +5735,6 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -5854,7 +5743,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5871,11 +5760,6 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -5944,7 +5828,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5961,11 +5845,6 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowNearPlane - value: 0.2 - objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -6074,11 +5953,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6088,7 +5962,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6107,9 +5980,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6403,7 +6273,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 9 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6437,11 +6307,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6449,9 +6314,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6484,7 +6346,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6501,9 +6362,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1970729143 Light: m_ObjectHideFlags: 0 @@ -6563,7 +6421,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1970729144 @@ -6950,11 +6807,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6964,7 +6816,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6983,9 +6834,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity index b45c2598498..0c143444d60 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 96be6728ca2a96a4595a4df0242dfd52, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -131,46 +128,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -241,16 +208,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &36551380 @@ -286,7 +283,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -311,7 +307,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &36551382 MeshFilter: m_ObjectHideFlags: 0 @@ -367,7 +362,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -392,7 +386,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &46421382 MeshFilter: m_ObjectHideFlags: 0 @@ -448,7 +441,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -473,7 +465,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &60506766 MeshFilter: m_ObjectHideFlags: 0 @@ -529,7 +520,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -554,7 +544,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65113829 MeshFilter: m_ObjectHideFlags: 0 @@ -610,7 +599,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -635,7 +623,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &66120961 MeshFilter: m_ObjectHideFlags: 0 @@ -691,7 +678,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -716,7 +702,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77076703 MeshFilter: m_ObjectHideFlags: 0 @@ -768,9 +753,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &101861481 MeshRenderer: @@ -787,7 +772,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -812,7 +796,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &101861482 MeshFilter: m_ObjectHideFlags: 0 @@ -867,6 +850,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 + m_SkySettings: {fileID: 1500180839} + m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, + type: 2} --- !u!114 &115701100 MonoBehaviour: m_ObjectHideFlags: 0 @@ -931,7 +917,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -956,7 +941,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &127095559 MeshFilter: m_ObjectHideFlags: 0 @@ -986,51 +970,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: 'Batching(OFF) test with 4 materials - - and 4 meshes checking - shadow behavior - - with different light type shadows' - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -1101,16 +1050,51 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(OFF) test with 4 materials + + and 4 meshes checking + shadow behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &150582942 @@ -1146,7 +1130,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1171,7 +1154,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &150582944 MeshFilter: m_ObjectHideFlags: 0 @@ -1227,7 +1209,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1252,7 +1233,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &153531923 MeshFilter: m_ObjectHideFlags: 0 @@ -1308,7 +1288,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1333,7 +1312,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &155155688 MeshFilter: m_ObjectHideFlags: 0 @@ -1389,7 +1367,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1414,7 +1391,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &170534014 MeshFilter: m_ObjectHideFlags: 0 @@ -1470,7 +1446,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1495,7 +1470,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &174301839 MeshFilter: m_ObjectHideFlags: 0 @@ -1551,7 +1525,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1576,7 +1549,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &182072262 MeshFilter: m_ObjectHideFlags: 0 @@ -1632,7 +1604,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1657,7 +1628,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &186477293 MeshFilter: m_ObjectHideFlags: 0 @@ -1713,7 +1683,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1738,7 +1707,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &200455129 MeshFilter: m_ObjectHideFlags: 0 @@ -1794,7 +1762,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1819,7 +1786,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &204257016 MeshFilter: m_ObjectHideFlags: 0 @@ -1875,7 +1841,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1900,7 +1865,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &227477080 MeshFilter: m_ObjectHideFlags: 0 @@ -1956,7 +1920,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1981,7 +1944,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &238349023 MeshFilter: m_ObjectHideFlags: 0 @@ -2011,46 +1973,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2121,16 +2053,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &243558409 @@ -2166,7 +2128,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2191,7 +2152,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &243558411 MeshFilter: m_ObjectHideFlags: 0 @@ -2247,7 +2207,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2272,7 +2231,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &253909733 MeshFilter: m_ObjectHideFlags: 0 @@ -2328,7 +2286,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2353,7 +2310,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259622049 MeshFilter: m_ObjectHideFlags: 0 @@ -2409,7 +2365,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2434,7 +2389,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &261850620 MeshFilter: m_ObjectHideFlags: 0 @@ -2490,7 +2444,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2515,7 +2468,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &264730788 MeshFilter: m_ObjectHideFlags: 0 @@ -2571,7 +2523,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2596,7 +2547,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &265628708 MeshFilter: m_ObjectHideFlags: 0 @@ -2652,7 +2602,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2677,7 +2626,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &268124353 MeshFilter: m_ObjectHideFlags: 0 @@ -2729,9 +2677,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &286673898 MeshRenderer: @@ -2748,7 +2696,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2773,7 +2720,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286673899 MeshFilter: m_ObjectHideFlags: 0 @@ -2829,7 +2775,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2854,7 +2799,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &288435795 MeshFilter: m_ObjectHideFlags: 0 @@ -2884,45 +2828,15 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Anchor - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Alignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2994,16 +2908,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &311832186 @@ -3039,7 +2983,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3064,7 +3007,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311832188 MeshFilter: m_ObjectHideFlags: 0 @@ -3120,7 +3062,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3145,7 +3086,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &315335065 MeshFilter: m_ObjectHideFlags: 0 @@ -3201,7 +3141,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3226,7 +3165,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &323337983 MeshFilter: m_ObjectHideFlags: 0 @@ -3282,7 +3220,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3307,7 +3244,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &347980535 MeshFilter: m_ObjectHideFlags: 0 @@ -3363,7 +3299,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3388,7 +3323,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &353743933 MeshFilter: m_ObjectHideFlags: 0 @@ -3444,7 +3378,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3469,7 +3402,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &358891137 MeshFilter: m_ObjectHideFlags: 0 @@ -3525,7 +3457,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3550,7 +3481,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &371112390 MeshFilter: m_ObjectHideFlags: 0 @@ -3606,7 +3536,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3631,7 +3560,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385211676 MeshFilter: m_ObjectHideFlags: 0 @@ -3687,7 +3615,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3712,7 +3639,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &393485934 MeshFilter: m_ObjectHideFlags: 0 @@ -3768,7 +3694,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3793,7 +3718,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414712806 MeshFilter: m_ObjectHideFlags: 0 @@ -3849,7 +3773,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3874,7 +3797,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &442248312 MeshFilter: m_ObjectHideFlags: 0 @@ -3930,7 +3852,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3955,7 +3876,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &451218266 MeshFilter: m_ObjectHideFlags: 0 @@ -4011,7 +3931,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4036,7 +3955,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &454545252 MeshFilter: m_ObjectHideFlags: 0 @@ -4106,7 +4024,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4131,7 +4048,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &456409600 MeshFilter: m_ObjectHideFlags: 0 @@ -4173,7 +4089,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4198,7 +4113,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &463589548 MeshFilter: m_ObjectHideFlags: 0 @@ -4254,7 +4168,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4279,7 +4192,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475376730 MeshFilter: m_ObjectHideFlags: 0 @@ -4335,7 +4247,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4360,7 +4271,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &481317919 MeshFilter: m_ObjectHideFlags: 0 @@ -4416,7 +4326,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4441,7 +4350,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483495094 MeshFilter: m_ObjectHideFlags: 0 @@ -4497,7 +4405,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4522,7 +4429,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483928023 MeshFilter: m_ObjectHideFlags: 0 @@ -4578,7 +4484,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4603,7 +4508,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &485852219 MeshFilter: m_ObjectHideFlags: 0 @@ -4655,9 +4559,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &507304597 MeshRenderer: @@ -4674,7 +4578,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4699,7 +4602,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &507304598 MeshFilter: m_ObjectHideFlags: 0 @@ -4755,7 +4657,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4780,7 +4681,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515052764 MeshFilter: m_ObjectHideFlags: 0 @@ -4832,9 +4732,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &515113725 MeshRenderer: @@ -4851,7 +4751,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4876,7 +4775,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515113726 MeshFilter: m_ObjectHideFlags: 0 @@ -4932,7 +4830,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4957,7 +4854,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515981675 MeshFilter: m_ObjectHideFlags: 0 @@ -5013,7 +4909,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5038,7 +4933,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &524115670 MeshFilter: m_ObjectHideFlags: 0 @@ -5094,7 +4988,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5119,7 +5012,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531014866 MeshFilter: m_ObjectHideFlags: 0 @@ -5175,7 +5067,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5200,7 +5091,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &535988451 MeshFilter: m_ObjectHideFlags: 0 @@ -5256,7 +5146,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5281,7 +5170,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545110250 MeshFilter: m_ObjectHideFlags: 0 @@ -5337,7 +5225,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5362,7 +5249,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545921550 MeshFilter: m_ObjectHideFlags: 0 @@ -5418,7 +5304,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5443,7 +5328,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &549211337 MeshFilter: m_ObjectHideFlags: 0 @@ -5535,7 +5419,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5560,7 +5443,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &554062274 MeshFilter: m_ObjectHideFlags: 0 @@ -5616,7 +5498,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5641,7 +5522,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &585238646 MeshFilter: m_ObjectHideFlags: 0 @@ -5697,7 +5577,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5722,7 +5601,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &593985934 MeshFilter: m_ObjectHideFlags: 0 @@ -5778,7 +5656,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5803,7 +5680,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &600499765 MeshFilter: m_ObjectHideFlags: 0 @@ -5859,7 +5735,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5884,7 +5759,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602785436 MeshFilter: m_ObjectHideFlags: 0 @@ -5940,7 +5814,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5965,7 +5838,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &606501518 MeshFilter: m_ObjectHideFlags: 0 @@ -6021,7 +5893,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6046,7 +5917,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &635086611 MeshFilter: m_ObjectHideFlags: 0 @@ -6102,7 +5972,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6127,7 +5996,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &644832025 MeshFilter: m_ObjectHideFlags: 0 @@ -6179,9 +6047,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &675722532 MeshRenderer: @@ -6198,7 +6066,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6223,7 +6090,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &675722533 MeshFilter: m_ObjectHideFlags: 0 @@ -6279,7 +6145,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6304,7 +6169,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &680093780 MeshFilter: m_ObjectHideFlags: 0 @@ -6360,7 +6224,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6385,7 +6248,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &705903101 MeshFilter: m_ObjectHideFlags: 0 @@ -6441,7 +6303,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6466,7 +6327,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &728083195 MeshFilter: m_ObjectHideFlags: 0 @@ -6522,7 +6382,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6547,7 +6406,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &734490762 MeshFilter: m_ObjectHideFlags: 0 @@ -6603,7 +6461,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6628,7 +6485,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &737650306 MeshFilter: m_ObjectHideFlags: 0 @@ -6684,7 +6540,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6709,7 +6564,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &751044735 MeshFilter: m_ObjectHideFlags: 0 @@ -6765,7 +6619,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6790,7 +6643,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &756692492 MeshFilter: m_ObjectHideFlags: 0 @@ -6846,7 +6698,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6871,7 +6722,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &757283832 MeshFilter: m_ObjectHideFlags: 0 @@ -6927,7 +6777,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6952,7 +6801,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &772931098 MeshFilter: m_ObjectHideFlags: 0 @@ -7008,7 +6856,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7033,7 +6880,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &774742369 MeshFilter: m_ObjectHideFlags: 0 @@ -7089,7 +6935,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7114,7 +6959,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &777150796 MeshFilter: m_ObjectHideFlags: 0 @@ -7170,7 +7014,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7195,7 +7038,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &784485898 MeshFilter: m_ObjectHideFlags: 0 @@ -7251,7 +7093,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7276,7 +7117,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &824852118 MeshFilter: m_ObjectHideFlags: 0 @@ -7332,7 +7172,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7357,7 +7196,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &831555554 MeshFilter: m_ObjectHideFlags: 0 @@ -7413,7 +7251,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7438,7 +7275,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &841086743 MeshFilter: m_ObjectHideFlags: 0 @@ -7494,7 +7330,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7519,7 +7354,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886695358 MeshFilter: m_ObjectHideFlags: 0 @@ -7575,7 +7409,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7600,7 +7433,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901920340 MeshFilter: m_ObjectHideFlags: 0 @@ -7656,7 +7488,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7681,7 +7512,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &913545789 MeshFilter: m_ObjectHideFlags: 0 @@ -7737,7 +7567,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7762,7 +7591,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917358696 MeshFilter: m_ObjectHideFlags: 0 @@ -7818,7 +7646,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7843,7 +7670,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917574245 MeshFilter: m_ObjectHideFlags: 0 @@ -7899,7 +7725,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7924,7 +7749,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &939069929 MeshFilter: m_ObjectHideFlags: 0 @@ -7980,7 +7804,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8005,7 +7828,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &942091866 MeshFilter: m_ObjectHideFlags: 0 @@ -8061,7 +7883,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8086,7 +7907,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &943532141 MeshFilter: m_ObjectHideFlags: 0 @@ -8142,7 +7962,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8167,7 +7986,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &987125021 MeshFilter: m_ObjectHideFlags: 0 @@ -8223,7 +8041,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8248,7 +8065,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991365373 MeshFilter: m_ObjectHideFlags: 0 @@ -8304,7 +8120,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8329,7 +8144,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1008620057 MeshFilter: m_ObjectHideFlags: 0 @@ -8399,7 +8213,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8424,7 +8237,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1021467115 MeshFilter: m_ObjectHideFlags: 0 @@ -8466,7 +8278,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8491,7 +8302,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1056257243 MeshFilter: m_ObjectHideFlags: 0 @@ -8547,7 +8357,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8572,7 +8381,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1062953899 MeshFilter: m_ObjectHideFlags: 0 @@ -8628,7 +8436,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8653,7 +8460,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064303137 MeshFilter: m_ObjectHideFlags: 0 @@ -8709,7 +8515,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8734,7 +8539,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064782782 MeshFilter: m_ObjectHideFlags: 0 @@ -8790,7 +8594,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8815,7 +8618,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1069142520 MeshFilter: m_ObjectHideFlags: 0 @@ -8871,7 +8673,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8896,7 +8697,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1090690753 MeshFilter: m_ObjectHideFlags: 0 @@ -8995,7 +8795,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9020,7 +8819,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1101367492 MeshFilter: m_ObjectHideFlags: 0 @@ -9076,7 +8874,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9101,7 +8898,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1102238839 MeshFilter: m_ObjectHideFlags: 0 @@ -9157,7 +8953,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9182,7 +8977,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1114955574 MeshFilter: m_ObjectHideFlags: 0 @@ -9238,7 +9032,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9263,7 +9056,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1115857959 MeshFilter: m_ObjectHideFlags: 0 @@ -9319,7 +9111,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9344,7 +9135,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123583534 MeshFilter: m_ObjectHideFlags: 0 @@ -9400,7 +9190,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9425,7 +9214,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1136865338 MeshFilter: m_ObjectHideFlags: 0 @@ -9481,7 +9269,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9506,7 +9293,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1139714605 MeshFilter: m_ObjectHideFlags: 0 @@ -9562,7 +9348,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9587,7 +9372,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1146692006 MeshFilter: m_ObjectHideFlags: 0 @@ -9643,7 +9427,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9668,7 +9451,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1150003263 MeshFilter: m_ObjectHideFlags: 0 @@ -9724,7 +9506,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9749,7 +9530,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1155367716 MeshFilter: m_ObjectHideFlags: 0 @@ -9805,7 +9585,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9830,7 +9609,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167055085 MeshFilter: m_ObjectHideFlags: 0 @@ -9886,7 +9664,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9911,7 +9688,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169402463 MeshFilter: m_ObjectHideFlags: 0 @@ -9967,7 +9743,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9992,7 +9767,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169459259 MeshFilter: m_ObjectHideFlags: 0 @@ -10048,7 +9822,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10073,7 +9846,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173661556 MeshFilter: m_ObjectHideFlags: 0 @@ -10129,7 +9901,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10154,7 +9925,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173941889 MeshFilter: m_ObjectHideFlags: 0 @@ -10221,7 +9991,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -10244,7 +10014,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -10255,11 +10024,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -10267,9 +10031,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -10277,9 +10038,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -10296,13 +10058,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10319,9 +10077,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1186812977 Light: m_ObjectHideFlags: 0 @@ -10381,7 +10136,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1189427210 @@ -10417,7 +10171,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10442,7 +10195,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1189427212 MeshFilter: m_ObjectHideFlags: 0 @@ -10498,7 +10250,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10523,7 +10274,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1191893181 MeshFilter: m_ObjectHideFlags: 0 @@ -10579,7 +10329,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10604,7 +10353,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1200757313 MeshFilter: m_ObjectHideFlags: 0 @@ -10660,7 +10408,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10685,7 +10432,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1219120707 MeshFilter: m_ObjectHideFlags: 0 @@ -10741,7 +10487,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10766,7 +10511,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1222561854 MeshFilter: m_ObjectHideFlags: 0 @@ -10822,7 +10566,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10847,7 +10590,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1224740520 MeshFilter: m_ObjectHideFlags: 0 @@ -10903,7 +10645,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10928,7 +10669,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236603816 MeshFilter: m_ObjectHideFlags: 0 @@ -10998,7 +10738,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11023,7 +10762,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1242223686 MeshFilter: m_ObjectHideFlags: 0 @@ -11065,7 +10803,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11090,7 +10827,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1243024348 MeshFilter: m_ObjectHideFlags: 0 @@ -11146,7 +10882,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11171,7 +10906,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1247850078 MeshFilter: m_ObjectHideFlags: 0 @@ -11227,7 +10961,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11252,7 +10985,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1259711087 MeshFilter: m_ObjectHideFlags: 0 @@ -11308,7 +11040,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11333,7 +11064,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1262205734 MeshFilter: m_ObjectHideFlags: 0 @@ -11389,7 +11119,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11414,7 +11143,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275508096 MeshFilter: m_ObjectHideFlags: 0 @@ -11470,7 +11198,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11495,7 +11222,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275917559 MeshFilter: m_ObjectHideFlags: 0 @@ -11551,7 +11277,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11576,7 +11301,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1287832517 MeshFilter: m_ObjectHideFlags: 0 @@ -11632,7 +11356,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11657,7 +11380,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1289313402 MeshFilter: m_ObjectHideFlags: 0 @@ -11713,7 +11435,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11738,7 +11459,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1298995558 MeshFilter: m_ObjectHideFlags: 0 @@ -11794,7 +11514,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11819,7 +11538,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1302983124 MeshFilter: m_ObjectHideFlags: 0 @@ -11875,7 +11593,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11900,7 +11617,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1310388112 MeshFilter: m_ObjectHideFlags: 0 @@ -11956,7 +11672,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11981,7 +11696,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1313496688 MeshFilter: m_ObjectHideFlags: 0 @@ -12037,7 +11751,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12062,7 +11775,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321236503 MeshFilter: m_ObjectHideFlags: 0 @@ -12129,7 +11841,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -12152,7 +11864,6 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -12163,11 +11874,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -12175,9 +11881,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -12185,9 +11888,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -12204,13 +11908,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12227,9 +11927,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1334092060 Light: m_ObjectHideFlags: 0 @@ -12289,7 +11986,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1344180423 @@ -12339,7 +12035,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12364,7 +12059,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344180426 MeshFilter: m_ObjectHideFlags: 0 @@ -12406,7 +12100,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12431,7 +12124,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1350933908 MeshFilter: m_ObjectHideFlags: 0 @@ -12487,7 +12179,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12512,7 +12203,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368252137 MeshFilter: m_ObjectHideFlags: 0 @@ -12568,7 +12258,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12593,7 +12282,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368802139 MeshFilter: m_ObjectHideFlags: 0 @@ -12649,7 +12337,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12674,7 +12361,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1381569253 MeshFilter: m_ObjectHideFlags: 0 @@ -12730,7 +12416,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12755,7 +12440,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1383163231 MeshFilter: m_ObjectHideFlags: 0 @@ -12811,7 +12495,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12836,7 +12519,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1396529170 MeshFilter: m_ObjectHideFlags: 0 @@ -12892,7 +12574,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12917,7 +12598,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1402937276 MeshFilter: m_ObjectHideFlags: 0 @@ -12973,7 +12653,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12998,7 +12677,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1414587696 MeshFilter: m_ObjectHideFlags: 0 @@ -13054,7 +12732,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13079,7 +12756,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417253615 MeshFilter: m_ObjectHideFlags: 0 @@ -13135,7 +12811,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13160,7 +12835,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1419332792 MeshFilter: m_ObjectHideFlags: 0 @@ -13216,7 +12890,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13241,7 +12914,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1434700136 MeshFilter: m_ObjectHideFlags: 0 @@ -13297,7 +12969,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13322,7 +12993,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1453744377 MeshFilter: m_ObjectHideFlags: 0 @@ -13378,7 +13048,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13403,7 +13072,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1476022556 MeshFilter: m_ObjectHideFlags: 0 @@ -13456,7 +13124,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13479,7 +13147,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -13490,11 +13157,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13502,9 +13164,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13512,9 +13171,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13531,13 +13191,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13554,9 +13210,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1481024265 Light: m_ObjectHideFlags: 0 @@ -13616,7 +13269,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1481024266 @@ -13666,7 +13318,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13691,7 +13342,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1490167730 MeshFilter: m_ObjectHideFlags: 0 @@ -13714,6 +13364,82 @@ Transform: m_Father: {fileID: 1603355434} m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1500180839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + sunSize: + m_OverrideState: 0 + m_Value: 0.04 + min: 0 + max: 1 + sunSizeConvergence: + m_OverrideState: 0 + m_Value: 5 + min: 1 + max: 10 + atmosphereThickness: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 5 + skyTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + groundColor: + m_OverrideState: 0 + m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + enableSunDisk: + m_OverrideState: 0 + m_Value: 1 --- !u!1 &1505593270 GameObject: m_ObjectHideFlags: 0 @@ -13747,7 +13473,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13772,7 +13497,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1505593272 MeshFilter: m_ObjectHideFlags: 0 @@ -13828,7 +13552,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13853,7 +13576,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1507424699 MeshFilter: m_ObjectHideFlags: 0 @@ -13909,7 +13631,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13934,7 +13655,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1514978764 MeshFilter: m_ObjectHideFlags: 0 @@ -13990,7 +13710,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14015,7 +13734,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1519772559 MeshFilter: m_ObjectHideFlags: 0 @@ -14071,7 +13789,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14096,7 +13813,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1538025914 MeshFilter: m_ObjectHideFlags: 0 @@ -14152,7 +13868,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14177,7 +13892,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1543193733 MeshFilter: m_ObjectHideFlags: 0 @@ -14233,7 +13947,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14258,7 +13971,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1545245265 MeshFilter: m_ObjectHideFlags: 0 @@ -14314,7 +14026,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14339,7 +14050,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1574710584 MeshFilter: m_ObjectHideFlags: 0 @@ -14395,7 +14105,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14420,7 +14129,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1598618972 MeshFilter: m_ObjectHideFlags: 0 @@ -14712,7 +14420,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14737,7 +14444,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1645498030 MeshFilter: m_ObjectHideFlags: 0 @@ -14793,7 +14499,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14818,7 +14523,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1655537782 MeshFilter: m_ObjectHideFlags: 0 @@ -14874,7 +14578,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14899,7 +14602,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1677565070 MeshFilter: m_ObjectHideFlags: 0 @@ -14955,7 +14657,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14980,7 +14681,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680464722 MeshFilter: m_ObjectHideFlags: 0 @@ -15036,7 +14736,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15061,7 +14760,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1694320345 MeshFilter: m_ObjectHideFlags: 0 @@ -15117,7 +14815,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15142,7 +14839,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1701473976 MeshFilter: m_ObjectHideFlags: 0 @@ -15198,7 +14894,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15223,7 +14918,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723268422 MeshFilter: m_ObjectHideFlags: 0 @@ -15253,51 +14947,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Anchor - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Alignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: targetCamera - value: + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: overrideTestSettings - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15368,16 +15027,51 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: overrideTestSettings + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1733495935 @@ -15413,7 +15107,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15438,7 +15131,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1733495937 MeshFilter: m_ObjectHideFlags: 0 @@ -15494,7 +15186,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15519,7 +15210,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1737097214 MeshFilter: m_ObjectHideFlags: 0 @@ -15575,7 +15265,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15600,7 +15289,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1742747597 MeshFilter: m_ObjectHideFlags: 0 @@ -15656,7 +15344,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15681,7 +15368,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1745614621 MeshFilter: m_ObjectHideFlags: 0 @@ -15737,7 +15423,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15762,7 +15447,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750054272 MeshFilter: m_ObjectHideFlags: 0 @@ -15818,7 +15502,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15843,7 +15526,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1770933946 MeshFilter: m_ObjectHideFlags: 0 @@ -15899,7 +15581,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15924,7 +15605,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1772511680 MeshFilter: m_ObjectHideFlags: 0 @@ -15980,7 +15660,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16005,7 +15684,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777553420 MeshFilter: m_ObjectHideFlags: 0 @@ -16093,21 +15771,6 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: clearColorMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -16169,11 +15832,21 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible + propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1788602647 @@ -16183,46 +15856,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -16293,16 +15936,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (3) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Pyramid Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1791778916 @@ -16338,7 +16011,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16363,7 +16035,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791778918 MeshFilter: m_ObjectHideFlags: 0 @@ -16419,7 +16090,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16444,7 +16114,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1795726768 MeshFilter: m_ObjectHideFlags: 0 @@ -16500,7 +16169,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16525,7 +16193,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805369059 MeshFilter: m_ObjectHideFlags: 0 @@ -16581,7 +16248,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16606,7 +16272,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805418746 MeshFilter: m_ObjectHideFlags: 0 @@ -16662,7 +16327,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16687,7 +16351,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1806486486 MeshFilter: m_ObjectHideFlags: 0 @@ -16743,7 +16406,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16768,7 +16430,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1811672316 MeshFilter: m_ObjectHideFlags: 0 @@ -16824,7 +16485,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16849,7 +16509,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820677218 MeshFilter: m_ObjectHideFlags: 0 @@ -16905,7 +16564,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16930,7 +16588,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828202885 MeshFilter: m_ObjectHideFlags: 0 @@ -16986,7 +16643,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17011,7 +16667,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828337667 MeshFilter: m_ObjectHideFlags: 0 @@ -17067,7 +16722,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17092,7 +16746,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1845195892 MeshFilter: m_ObjectHideFlags: 0 @@ -17148,7 +16801,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17173,7 +16825,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1851237859 MeshFilter: m_ObjectHideFlags: 0 @@ -17229,7 +16880,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17254,7 +16904,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1905441408 MeshFilter: m_ObjectHideFlags: 0 @@ -17310,7 +16959,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17335,7 +16983,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1922813201 MeshFilter: m_ObjectHideFlags: 0 @@ -17391,7 +17038,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17416,7 +17062,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1924402466 MeshFilter: m_ObjectHideFlags: 0 @@ -17472,7 +17117,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17497,7 +17141,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1930622162 MeshFilter: m_ObjectHideFlags: 0 @@ -17564,7 +17207,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17587,7 +17230,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -17598,11 +17240,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17610,9 +17247,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17620,9 +17254,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17639,13 +17274,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17662,9 +17293,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1934754985 Light: m_ObjectHideFlags: 0 @@ -17724,7 +17352,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1944444714 @@ -17760,7 +17387,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17785,7 +17411,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1944444716 MeshFilter: m_ObjectHideFlags: 0 @@ -17841,7 +17466,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17866,7 +17490,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1950934447 MeshFilter: m_ObjectHideFlags: 0 @@ -17922,7 +17545,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17947,7 +17569,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1951027920 MeshFilter: m_ObjectHideFlags: 0 @@ -18003,7 +17624,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18028,7 +17648,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1952346156 MeshFilter: m_ObjectHideFlags: 0 @@ -18084,7 +17703,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18109,7 +17727,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1972269529 MeshFilter: m_ObjectHideFlags: 0 @@ -18165,7 +17782,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18190,7 +17806,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1973997287 MeshFilter: m_ObjectHideFlags: 0 @@ -18243,7 +17858,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -18266,7 +17881,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -18277,11 +17891,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -18289,9 +17898,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -18299,9 +17905,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -18318,13 +17925,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -18341,9 +17944,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2000975652 Light: m_ObjectHideFlags: 0 @@ -18403,7 +18003,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2000975653 @@ -18453,7 +18052,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18478,7 +18076,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2004796537 MeshFilter: m_ObjectHideFlags: 0 @@ -18534,7 +18131,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18559,7 +18155,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2007878966 MeshFilter: m_ObjectHideFlags: 0 @@ -18615,7 +18210,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18640,7 +18234,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2009971746 MeshFilter: m_ObjectHideFlags: 0 @@ -18696,7 +18289,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18721,7 +18313,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2012882290 MeshFilter: m_ObjectHideFlags: 0 @@ -18777,7 +18368,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18802,7 +18392,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2041816170 MeshFilter: m_ObjectHideFlags: 0 @@ -18858,7 +18447,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18883,7 +18471,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2055222863 MeshFilter: m_ObjectHideFlags: 0 @@ -18939,7 +18526,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18964,7 +18550,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2057234449 MeshFilter: m_ObjectHideFlags: 0 @@ -19031,7 +18616,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -19054,7 +18639,6 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -19065,11 +18649,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -19077,9 +18656,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -19087,9 +18663,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -19106,13 +18683,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -19129,9 +18702,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2063225983 Light: m_ObjectHideFlags: 0 @@ -19191,7 +18761,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2073048139 @@ -19227,7 +18796,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19252,7 +18820,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2073048141 MeshFilter: m_ObjectHideFlags: 0 @@ -19308,7 +18875,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19333,7 +18899,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079882538 MeshFilter: m_ObjectHideFlags: 0 @@ -19389,7 +18954,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19414,7 +18978,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099243441 MeshFilter: m_ObjectHideFlags: 0 @@ -19470,7 +19033,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19495,7 +19057,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099775709 MeshFilter: m_ObjectHideFlags: 0 @@ -19565,7 +19126,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19590,7 +19150,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2103916467 MeshFilter: m_ObjectHideFlags: 0 @@ -19646,7 +19205,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19671,7 +19229,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2111003287 MeshFilter: m_ObjectHideFlags: 0 @@ -19713,7 +19270,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19738,7 +19294,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2121451157 MeshFilter: m_ObjectHideFlags: 0 @@ -19794,7 +19349,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19819,7 +19373,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2133598721 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity index 60e90f83425..5747be64a64 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 8dcf44329359b844c8aa48f80ab59bbb, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -171,7 +168,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -196,7 +192,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1710004 MeshFilter: m_ObjectHideFlags: 0 @@ -252,7 +247,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -277,7 +271,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &18051140 MeshFilter: m_ObjectHideFlags: 0 @@ -333,7 +326,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -358,7 +350,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &27279487 MeshFilter: m_ObjectHideFlags: 0 @@ -399,6 +390,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 + m_SkySettings: {fileID: 1907606003} + m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, + type: 2} --- !u!114 &63803591 MonoBehaviour: m_ObjectHideFlags: 0 @@ -477,7 +471,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -502,7 +495,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65574162 MeshFilter: m_ObjectHideFlags: 0 @@ -558,7 +550,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -583,7 +574,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77199700 MeshFilter: m_ObjectHideFlags: 0 @@ -639,7 +629,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -664,7 +653,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &115102200 MeshFilter: m_ObjectHideFlags: 0 @@ -720,7 +708,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -745,7 +732,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &118990961 MeshFilter: m_ObjectHideFlags: 0 @@ -801,7 +787,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -826,7 +811,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &119543197 MeshFilter: m_ObjectHideFlags: 0 @@ -882,7 +866,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -907,7 +890,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &121141773 MeshFilter: m_ObjectHideFlags: 0 @@ -963,7 +945,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -988,7 +969,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &144936673 MeshFilter: m_ObjectHideFlags: 0 @@ -1041,7 +1021,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1064,7 +1044,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -1075,11 +1054,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1087,9 +1061,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1097,9 +1068,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1116,13 +1088,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1139,9 +1107,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &154133178 Light: m_ObjectHideFlags: 0 @@ -1201,7 +1166,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &158924534 @@ -1251,7 +1215,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1276,7 +1239,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158924537 MeshFilter: m_ObjectHideFlags: 0 @@ -1332,7 +1294,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1357,7 +1318,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172004985 MeshFilter: m_ObjectHideFlags: 0 @@ -1413,7 +1373,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1438,7 +1397,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &193875014 MeshFilter: m_ObjectHideFlags: 0 @@ -1494,7 +1452,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1519,7 +1476,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &197171319 MeshFilter: m_ObjectHideFlags: 0 @@ -1575,7 +1531,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1600,7 +1555,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &206141925 MeshFilter: m_ObjectHideFlags: 0 @@ -1656,7 +1610,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1681,7 +1634,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &207934261 MeshFilter: m_ObjectHideFlags: 0 @@ -1734,7 +1686,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1757,7 +1709,6 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -1768,11 +1719,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1780,9 +1726,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1790,9 +1733,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1809,13 +1753,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1832,9 +1772,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &208533895 Light: m_ObjectHideFlags: 0 @@ -1894,7 +1831,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &216458700 @@ -1980,7 +1916,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2005,7 +1940,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &230260784 MeshFilter: m_ObjectHideFlags: 0 @@ -2061,7 +1995,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2086,7 +2019,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &239392583 MeshFilter: m_ObjectHideFlags: 0 @@ -2142,7 +2074,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2167,7 +2098,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259433369 MeshFilter: m_ObjectHideFlags: 0 @@ -2223,7 +2153,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2248,7 +2177,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &270927042 MeshFilter: m_ObjectHideFlags: 0 @@ -2304,7 +2232,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2329,7 +2256,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &276492018 MeshFilter: m_ObjectHideFlags: 0 @@ -2385,7 +2311,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2410,7 +2335,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &279874603 MeshFilter: m_ObjectHideFlags: 0 @@ -2466,7 +2390,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2491,7 +2414,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286864260 MeshFilter: m_ObjectHideFlags: 0 @@ -2547,7 +2469,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2572,7 +2493,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &290550682 MeshFilter: m_ObjectHideFlags: 0 @@ -2628,7 +2548,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2653,7 +2572,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &296839945 MeshFilter: m_ObjectHideFlags: 0 @@ -2709,7 +2627,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2734,7 +2651,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303394831 MeshFilter: m_ObjectHideFlags: 0 @@ -2790,7 +2706,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2815,7 +2730,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303878567 MeshFilter: m_ObjectHideFlags: 0 @@ -2871,7 +2785,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2896,7 +2809,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311038003 MeshFilter: m_ObjectHideFlags: 0 @@ -2952,7 +2864,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2977,7 +2888,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &326053888 MeshFilter: m_ObjectHideFlags: 0 @@ -2993,46 +2903,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -3103,16 +2983,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &328796436 @@ -3162,7 +3072,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3187,7 +3096,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &328796439 MeshFilter: m_ObjectHideFlags: 0 @@ -3243,7 +3151,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3268,7 +3175,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &341756822 MeshFilter: m_ObjectHideFlags: 0 @@ -3324,7 +3230,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3349,7 +3254,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &350374762 MeshFilter: m_ObjectHideFlags: 0 @@ -3405,7 +3309,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3430,7 +3333,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &360110942 MeshFilter: m_ObjectHideFlags: 0 @@ -3486,7 +3388,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3511,7 +3412,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &372328438 MeshFilter: m_ObjectHideFlags: 0 @@ -3567,7 +3467,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3592,7 +3491,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &395776440 MeshFilter: m_ObjectHideFlags: 0 @@ -3648,7 +3546,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3673,7 +3570,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &402203564 MeshFilter: m_ObjectHideFlags: 0 @@ -3729,7 +3625,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3754,7 +3649,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403989726 MeshFilter: m_ObjectHideFlags: 0 @@ -3810,7 +3704,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3835,7 +3728,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &413571831 MeshFilter: m_ObjectHideFlags: 0 @@ -3891,7 +3783,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3916,7 +3807,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414367076 MeshFilter: m_ObjectHideFlags: 0 @@ -3969,7 +3859,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3992,7 +3882,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -4003,11 +3892,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4015,9 +3899,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4025,9 +3906,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -4044,13 +3926,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4067,9 +3945,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &426295405 Light: m_ObjectHideFlags: 0 @@ -4129,7 +4004,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &430017949 @@ -4161,9 +4035,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &430017951 MeshRenderer: @@ -4180,7 +4054,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4205,7 +4078,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &430017952 MeshFilter: m_ObjectHideFlags: 0 @@ -4275,7 +4147,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4300,7 +4171,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437055873 MeshFilter: m_ObjectHideFlags: 0 @@ -4356,7 +4226,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4381,7 +4250,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437361371 MeshFilter: m_ObjectHideFlags: 0 @@ -4437,7 +4305,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4462,7 +4329,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &444731604 MeshFilter: m_ObjectHideFlags: 0 @@ -4518,7 +4384,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4543,7 +4408,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447696771 MeshFilter: m_ObjectHideFlags: 0 @@ -4596,7 +4460,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4619,7 +4483,6 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -4630,11 +4493,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4642,9 +4500,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4652,9 +4507,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -4671,13 +4527,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4694,9 +4546,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &461319428 Light: m_ObjectHideFlags: 0 @@ -4756,7 +4605,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &469890627 @@ -4806,7 +4654,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4831,7 +4678,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &469890630 MeshFilter: m_ObjectHideFlags: 0 @@ -4887,7 +4733,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4912,7 +4757,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &505552224 MeshFilter: m_ObjectHideFlags: 0 @@ -4968,7 +4812,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4993,7 +4836,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531559732 MeshFilter: m_ObjectHideFlags: 0 @@ -5049,7 +4891,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5074,7 +4915,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &557952777 MeshFilter: m_ObjectHideFlags: 0 @@ -5130,7 +4970,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5155,7 +4994,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559229149 MeshFilter: m_ObjectHideFlags: 0 @@ -5211,7 +5049,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5236,7 +5073,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559689558 MeshFilter: m_ObjectHideFlags: 0 @@ -5292,7 +5128,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5317,7 +5152,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &572130308 MeshFilter: m_ObjectHideFlags: 0 @@ -5373,7 +5207,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5398,7 +5231,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &578472782 MeshFilter: m_ObjectHideFlags: 0 @@ -5454,7 +5286,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5479,7 +5310,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &588295910 MeshFilter: m_ObjectHideFlags: 0 @@ -5535,7 +5365,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5560,7 +5389,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602930598 MeshFilter: m_ObjectHideFlags: 0 @@ -5616,7 +5444,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5641,7 +5468,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &607221212 MeshFilter: m_ObjectHideFlags: 0 @@ -5697,7 +5523,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5722,7 +5547,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &628528525 MeshFilter: m_ObjectHideFlags: 0 @@ -5778,7 +5602,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5803,7 +5626,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &637490629 MeshFilter: m_ObjectHideFlags: 0 @@ -5859,7 +5681,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5884,7 +5705,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &640826958 MeshFilter: m_ObjectHideFlags: 0 @@ -5940,7 +5760,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5965,7 +5784,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &642911914 MeshFilter: m_ObjectHideFlags: 0 @@ -6021,7 +5839,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6046,7 +5863,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &643134898 MeshFilter: m_ObjectHideFlags: 0 @@ -6102,7 +5918,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6127,7 +5942,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &645820563 MeshFilter: m_ObjectHideFlags: 0 @@ -6183,7 +5997,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6208,7 +6021,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &647684059 MeshFilter: m_ObjectHideFlags: 0 @@ -6264,7 +6076,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6289,7 +6100,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &648188782 MeshFilter: m_ObjectHideFlags: 0 @@ -6345,7 +6155,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6370,7 +6179,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &649749382 MeshFilter: m_ObjectHideFlags: 0 @@ -6426,7 +6234,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6451,7 +6258,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &668693072 MeshFilter: m_ObjectHideFlags: 0 @@ -6507,7 +6313,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6532,7 +6337,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &669754239 MeshFilter: m_ObjectHideFlags: 0 @@ -6588,7 +6392,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6613,7 +6416,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &671857626 MeshFilter: m_ObjectHideFlags: 0 @@ -6669,7 +6471,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6694,7 +6495,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &682974520 MeshFilter: m_ObjectHideFlags: 0 @@ -6750,7 +6550,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6775,7 +6574,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &697148330 MeshFilter: m_ObjectHideFlags: 0 @@ -6831,7 +6629,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6856,7 +6653,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &712399915 MeshFilter: m_ObjectHideFlags: 0 @@ -6912,7 +6708,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6937,7 +6732,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &719811194 MeshFilter: m_ObjectHideFlags: 0 @@ -6993,7 +6787,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7018,7 +6811,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &744018712 MeshFilter: m_ObjectHideFlags: 0 @@ -7074,7 +6866,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7099,7 +6890,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &758209044 MeshFilter: m_ObjectHideFlags: 0 @@ -7152,7 +6942,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -7175,7 +6965,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -7186,11 +6975,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -7198,9 +6982,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -7208,9 +6989,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -7227,13 +7009,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7250,9 +7028,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &762691883 Light: m_ObjectHideFlags: 0 @@ -7312,7 +7087,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &777871935 @@ -7598,7 +7372,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7623,7 +7396,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &779875687 MeshFilter: m_ObjectHideFlags: 0 @@ -7679,7 +7451,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7704,7 +7475,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &781345256 MeshFilter: m_ObjectHideFlags: 0 @@ -7760,7 +7530,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7785,7 +7554,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &789731996 MeshFilter: m_ObjectHideFlags: 0 @@ -7841,7 +7609,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7866,7 +7633,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809657012 MeshFilter: m_ObjectHideFlags: 0 @@ -7922,7 +7688,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7947,7 +7712,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &813923243 MeshFilter: m_ObjectHideFlags: 0 @@ -8003,7 +7767,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8028,7 +7791,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &820566438 MeshFilter: m_ObjectHideFlags: 0 @@ -8084,7 +7846,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8109,7 +7870,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825050274 MeshFilter: m_ObjectHideFlags: 0 @@ -8165,7 +7925,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8190,7 +7949,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825718158 MeshFilter: m_ObjectHideFlags: 0 @@ -8246,7 +8004,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8271,7 +8028,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &842571686 MeshFilter: m_ObjectHideFlags: 0 @@ -8327,7 +8083,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8352,7 +8107,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &853547569 MeshFilter: m_ObjectHideFlags: 0 @@ -8408,7 +8162,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8433,7 +8186,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &869079679 MeshFilter: m_ObjectHideFlags: 0 @@ -8489,7 +8241,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8514,7 +8265,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &875492872 MeshFilter: m_ObjectHideFlags: 0 @@ -8570,7 +8320,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8595,7 +8344,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886690332 MeshFilter: m_ObjectHideFlags: 0 @@ -8651,7 +8399,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8676,7 +8423,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &888245113 MeshFilter: m_ObjectHideFlags: 0 @@ -8732,7 +8478,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8757,7 +8502,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &891847955 MeshFilter: m_ObjectHideFlags: 0 @@ -8813,7 +8557,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8838,7 +8581,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901521603 MeshFilter: m_ObjectHideFlags: 0 @@ -8894,7 +8636,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8919,7 +8660,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &904353995 MeshFilter: m_ObjectHideFlags: 0 @@ -8935,46 +8675,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -9045,16 +8755,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &921921080 @@ -9104,7 +8844,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9129,7 +8868,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &921921083 MeshFilter: m_ObjectHideFlags: 0 @@ -9185,7 +8923,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9210,7 +8947,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &930171902 MeshFilter: m_ObjectHideFlags: 0 @@ -9266,7 +9002,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9291,7 +9026,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &953810097 MeshFilter: m_ObjectHideFlags: 0 @@ -9329,9 +9063,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &960424436 MeshRenderer: @@ -9348,7 +9082,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9373,7 +9106,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &960424437 MeshFilter: m_ObjectHideFlags: 0 @@ -9443,7 +9175,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9468,7 +9199,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &965748961 MeshFilter: m_ObjectHideFlags: 0 @@ -9524,7 +9254,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9549,7 +9278,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &980798177 MeshFilter: m_ObjectHideFlags: 0 @@ -9605,7 +9333,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9630,7 +9357,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &981646854 MeshFilter: m_ObjectHideFlags: 0 @@ -9686,7 +9412,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9711,7 +9436,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991737266 MeshFilter: m_ObjectHideFlags: 0 @@ -9767,7 +9491,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9792,7 +9515,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1001326874 MeshFilter: m_ObjectHideFlags: 0 @@ -9848,7 +9570,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9873,7 +9594,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1012989238 MeshFilter: m_ObjectHideFlags: 0 @@ -9929,7 +9649,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9954,7 +9673,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1031276030 MeshFilter: m_ObjectHideFlags: 0 @@ -10010,7 +9728,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10035,7 +9752,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1038229444 MeshFilter: m_ObjectHideFlags: 0 @@ -10091,7 +9807,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10116,7 +9831,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1040771379 MeshFilter: m_ObjectHideFlags: 0 @@ -10172,7 +9886,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10197,7 +9910,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1043930410 MeshFilter: m_ObjectHideFlags: 0 @@ -10253,7 +9965,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10278,7 +9989,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1046327772 MeshFilter: m_ObjectHideFlags: 0 @@ -10334,7 +10044,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10359,7 +10068,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1057088725 MeshFilter: m_ObjectHideFlags: 0 @@ -10415,7 +10123,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10440,7 +10147,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1061504061 MeshFilter: m_ObjectHideFlags: 0 @@ -10496,7 +10202,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10521,7 +10226,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1080468800 MeshFilter: m_ObjectHideFlags: 0 @@ -10577,7 +10281,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10602,7 +10305,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1096914707 MeshFilter: m_ObjectHideFlags: 0 @@ -10658,7 +10360,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10683,7 +10384,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1108541228 MeshFilter: m_ObjectHideFlags: 0 @@ -10739,7 +10439,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10764,7 +10463,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123246062 MeshFilter: m_ObjectHideFlags: 0 @@ -10820,7 +10518,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10845,7 +10542,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1127700270 MeshFilter: m_ObjectHideFlags: 0 @@ -10901,7 +10597,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10926,7 +10621,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1166530868 MeshFilter: m_ObjectHideFlags: 0 @@ -10982,7 +10676,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11007,7 +10700,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167094695 MeshFilter: m_ObjectHideFlags: 0 @@ -11063,7 +10755,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11088,7 +10779,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1168327892 MeshFilter: m_ObjectHideFlags: 0 @@ -11144,7 +10834,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11169,7 +10858,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1183782476 MeshFilter: m_ObjectHideFlags: 0 @@ -11225,7 +10913,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11250,7 +10937,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1184022654 MeshFilter: m_ObjectHideFlags: 0 @@ -11306,7 +10992,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11331,7 +11016,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1185794389 MeshFilter: m_ObjectHideFlags: 0 @@ -11387,7 +11071,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11412,7 +11095,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1204878890 MeshFilter: m_ObjectHideFlags: 0 @@ -11468,7 +11150,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11493,7 +11174,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1213431291 MeshFilter: m_ObjectHideFlags: 0 @@ -11549,7 +11229,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11574,7 +11253,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1215106502 MeshFilter: m_ObjectHideFlags: 0 @@ -11630,7 +11308,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11655,7 +11332,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1220612084 MeshFilter: m_ObjectHideFlags: 0 @@ -11711,7 +11387,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11736,7 +11411,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1221260582 MeshFilter: m_ObjectHideFlags: 0 @@ -11792,7 +11466,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11817,7 +11490,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1231156226 MeshFilter: m_ObjectHideFlags: 0 @@ -11873,7 +11545,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11898,7 +11569,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1234711635 MeshFilter: m_ObjectHideFlags: 0 @@ -11954,7 +11624,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11979,7 +11648,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236035745 MeshFilter: m_ObjectHideFlags: 0 @@ -12035,7 +11703,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12060,7 +11727,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1239462281 MeshFilter: m_ObjectHideFlags: 0 @@ -12116,7 +11782,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12141,7 +11806,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1257610671 MeshFilter: m_ObjectHideFlags: 0 @@ -12197,7 +11861,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12222,7 +11885,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1266980223 MeshFilter: m_ObjectHideFlags: 0 @@ -12278,7 +11940,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12303,7 +11964,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1282175057 MeshFilter: m_ObjectHideFlags: 0 @@ -12359,7 +12019,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12384,7 +12043,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1285940584 MeshFilter: m_ObjectHideFlags: 0 @@ -12440,7 +12098,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12465,7 +12122,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1293709081 MeshFilter: m_ObjectHideFlags: 0 @@ -12521,7 +12177,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12546,7 +12201,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1296742209 MeshFilter: m_ObjectHideFlags: 0 @@ -12620,21 +12274,6 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: clearColorMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -12696,11 +12335,21 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible + propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1314322408 @@ -12750,7 +12399,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12775,7 +12423,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1314322411 MeshFilter: m_ObjectHideFlags: 0 @@ -12831,7 +12478,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12856,7 +12502,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1322864851 MeshFilter: m_ObjectHideFlags: 0 @@ -12912,7 +12557,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12937,7 +12581,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1325976481 MeshFilter: m_ObjectHideFlags: 0 @@ -12993,7 +12636,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13018,7 +12660,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1339361874 MeshFilter: m_ObjectHideFlags: 0 @@ -13074,7 +12715,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13099,7 +12739,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344659076 MeshFilter: m_ObjectHideFlags: 0 @@ -13155,7 +12794,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13180,7 +12818,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1353796882 MeshFilter: m_ObjectHideFlags: 0 @@ -13236,7 +12873,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13261,7 +12897,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1355408080 MeshFilter: m_ObjectHideFlags: 0 @@ -13317,7 +12952,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13342,7 +12976,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1359668098 MeshFilter: m_ObjectHideFlags: 0 @@ -13398,7 +13031,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13423,7 +13055,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1361440978 MeshFilter: m_ObjectHideFlags: 0 @@ -13479,7 +13110,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13504,7 +13134,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1363775923 MeshFilter: m_ObjectHideFlags: 0 @@ -13560,7 +13189,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13585,7 +13213,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1378795295 MeshFilter: m_ObjectHideFlags: 0 @@ -13641,7 +13268,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13666,7 +13292,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1379653303 MeshFilter: m_ObjectHideFlags: 0 @@ -13719,7 +13344,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 8 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13742,7 +13367,6 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 - m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -13753,11 +13377,6 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13765,9 +13384,6 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 - m_SemiTransparentShadow: 0 - m_ColorShadow: 1 - m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13775,9 +13391,10 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 + m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.01 + m_MinFilterSize: 0.00001 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13794,13 +13411,9 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} - m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13817,9 +13430,6 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386862605 Light: m_ObjectHideFlags: 0 @@ -13879,7 +13489,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1388287949 @@ -13929,7 +13538,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13954,7 +13562,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1388287952 MeshFilter: m_ObjectHideFlags: 0 @@ -14010,7 +13617,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14035,7 +13641,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1389526138 MeshFilter: m_ObjectHideFlags: 0 @@ -14091,7 +13696,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14116,7 +13720,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1422354403 MeshFilter: m_ObjectHideFlags: 0 @@ -14172,7 +13775,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14197,7 +13799,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1428342881 MeshFilter: m_ObjectHideFlags: 0 @@ -14213,46 +13814,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -14323,16 +13894,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1460143124 @@ -14382,7 +13983,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14407,7 +14007,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460143127 MeshFilter: m_ObjectHideFlags: 0 @@ -14463,7 +14062,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14488,7 +14086,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1463956016 MeshFilter: m_ObjectHideFlags: 0 @@ -14544,7 +14141,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14569,7 +14165,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1482492333 MeshFilter: m_ObjectHideFlags: 0 @@ -14625,7 +14220,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14650,7 +14244,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1493613822 MeshFilter: m_ObjectHideFlags: 0 @@ -14706,7 +14299,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14731,7 +14323,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1511303639 MeshFilter: m_ObjectHideFlags: 0 @@ -14787,7 +14378,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14812,7 +14402,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1521266381 MeshFilter: m_ObjectHideFlags: 0 @@ -14868,7 +14457,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14893,7 +14481,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1528394421 MeshFilter: m_ObjectHideFlags: 0 @@ -14949,7 +14536,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14974,7 +14560,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1531121810 MeshFilter: m_ObjectHideFlags: 0 @@ -15030,7 +14615,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15055,7 +14639,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1566466870 MeshFilter: m_ObjectHideFlags: 0 @@ -15111,7 +14694,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15136,7 +14718,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1577879441 MeshFilter: m_ObjectHideFlags: 0 @@ -15192,7 +14773,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15217,7 +14797,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1587290154 MeshFilter: m_ObjectHideFlags: 0 @@ -15273,7 +14852,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15298,7 +14876,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591162017 MeshFilter: m_ObjectHideFlags: 0 @@ -15314,51 +14891,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: 'Batching(ON) test with 4 materials - - and 4 meshes checking shadow - behavior - - with different light type shadows' - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15429,30 +14971,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Name - value: Text - objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} ---- !u!1001 &1606173312 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_CharacterSize @@ -15461,7 +14979,12 @@ PrefabInstance: - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text - value: Spot Pyramid Shape + value: 'Batching(ON) test with 4 materials + + and 4 meshes checking shadow + behavior + + with different light type shadows' objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15488,6 +15011,30 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} +--- !u!1001 &1606173312 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Name + value: Text (3) + objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15558,16 +15105,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (3) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Pyramid Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1621115680 @@ -15617,7 +15194,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15642,7 +15218,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1621115683 MeshFilter: m_ObjectHideFlags: 0 @@ -15698,7 +15273,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15723,7 +15297,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1681693788 MeshFilter: m_ObjectHideFlags: 0 @@ -15779,7 +15352,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15804,7 +15376,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1687574455 MeshFilter: m_ObjectHideFlags: 0 @@ -15860,7 +15431,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15885,7 +15455,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1689229584 MeshFilter: m_ObjectHideFlags: 0 @@ -15941,7 +15510,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15966,7 +15534,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1696616959 MeshFilter: m_ObjectHideFlags: 0 @@ -16022,7 +15589,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16047,7 +15613,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705199462 MeshFilter: m_ObjectHideFlags: 0 @@ -16103,7 +15668,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16128,7 +15692,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705921691 MeshFilter: m_ObjectHideFlags: 0 @@ -16184,7 +15747,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16209,7 +15771,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723596831 MeshFilter: m_ObjectHideFlags: 0 @@ -16265,7 +15826,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16290,7 +15850,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1726899976 MeshFilter: m_ObjectHideFlags: 0 @@ -16346,7 +15905,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16371,7 +15929,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750460725 MeshFilter: m_ObjectHideFlags: 0 @@ -16409,9 +15966,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1771681643 MeshRenderer: @@ -16428,7 +15985,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16453,7 +16009,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1771681644 MeshFilter: m_ObjectHideFlags: 0 @@ -16523,7 +16078,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16548,7 +16102,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777647186 MeshFilter: m_ObjectHideFlags: 0 @@ -16604,7 +16157,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16629,7 +16181,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1789371758 MeshFilter: m_ObjectHideFlags: 0 @@ -16685,7 +16236,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16710,7 +16260,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791411182 MeshFilter: m_ObjectHideFlags: 0 @@ -16766,7 +16315,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16791,7 +16339,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1839709220 MeshFilter: m_ObjectHideFlags: 0 @@ -16847,7 +16394,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16872,7 +16418,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1841428342 MeshFilter: m_ObjectHideFlags: 0 @@ -16928,7 +16473,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16953,7 +16497,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1848109756 MeshFilter: m_ObjectHideFlags: 0 @@ -16991,9 +16534,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1856875282 MeshRenderer: @@ -17010,7 +16553,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17035,7 +16577,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1856875283 MeshFilter: m_ObjectHideFlags: 0 @@ -17105,7 +16646,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17130,7 +16670,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1866992478 MeshFilter: m_ObjectHideFlags: 0 @@ -17186,7 +16725,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17211,7 +16749,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1867244841 MeshFilter: m_ObjectHideFlags: 0 @@ -17267,7 +16804,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17292,7 +16828,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1877582089 MeshFilter: m_ObjectHideFlags: 0 @@ -17348,7 +16883,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17373,7 +16907,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1885217152 MeshFilter: m_ObjectHideFlags: 0 @@ -17429,7 +16962,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17454,7 +16986,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1887731496 MeshFilter: m_ObjectHideFlags: 0 @@ -17510,7 +17041,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17535,7 +17065,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1895596062 MeshFilter: m_ObjectHideFlags: 0 @@ -17591,7 +17120,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17616,7 +17144,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1901667384 MeshFilter: m_ObjectHideFlags: 0 @@ -17625,6 +17152,82 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901667381} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1907606003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + sunSize: + m_OverrideState: 0 + m_Value: 0.04 + min: 0 + max: 1 + sunSizeConvergence: + m_OverrideState: 0 + m_Value: 5 + min: 1 + max: 10 + atmosphereThickness: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 5 + skyTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + groundColor: + m_OverrideState: 0 + m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + enableSunDisk: + m_OverrideState: 0 + m_Value: 1 --- !u!1 &1926583767 GameObject: m_ObjectHideFlags: 0 @@ -17672,7 +17275,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17697,7 +17299,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1926583770 MeshFilter: m_ObjectHideFlags: 0 @@ -17753,7 +17354,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17778,7 +17378,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1928970123 MeshFilter: m_ObjectHideFlags: 0 @@ -17834,7 +17433,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17859,7 +17457,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1957957041 MeshFilter: m_ObjectHideFlags: 0 @@ -17915,7 +17512,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17940,7 +17536,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1970018806 MeshFilter: m_ObjectHideFlags: 0 @@ -17996,7 +17591,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18021,7 +17615,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1974510906 MeshFilter: m_ObjectHideFlags: 0 @@ -18077,7 +17670,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18102,7 +17694,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1981351887 MeshFilter: m_ObjectHideFlags: 0 @@ -18158,7 +17749,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18183,7 +17773,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2006189128 MeshFilter: m_ObjectHideFlags: 0 @@ -18239,7 +17828,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18264,7 +17852,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2019026764 MeshFilter: m_ObjectHideFlags: 0 @@ -18320,7 +17907,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18345,7 +17931,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2027312071 MeshFilter: m_ObjectHideFlags: 0 @@ -18401,7 +17986,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18426,7 +18010,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2036693317 MeshFilter: m_ObjectHideFlags: 0 @@ -18482,7 +18065,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18507,7 +18089,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2037183620 MeshFilter: m_ObjectHideFlags: 0 @@ -18563,7 +18144,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18588,7 +18168,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2038469265 MeshFilter: m_ObjectHideFlags: 0 @@ -18644,7 +18223,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18669,7 +18247,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2039296765 MeshFilter: m_ObjectHideFlags: 0 @@ -18725,7 +18302,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18750,7 +18326,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2040827661 MeshFilter: m_ObjectHideFlags: 0 @@ -18766,46 +18341,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -18876,16 +18421,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &2064361793 @@ -18935,7 +18510,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18960,7 +18534,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2064361796 MeshFilter: m_ObjectHideFlags: 0 @@ -19016,7 +18589,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19041,7 +18613,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2070414141 MeshFilter: m_ObjectHideFlags: 0 @@ -19097,7 +18668,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19122,7 +18692,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079107238 MeshFilter: m_ObjectHideFlags: 0 @@ -19178,7 +18747,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19203,7 +18771,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2084708072 MeshFilter: m_ObjectHideFlags: 0 @@ -19259,7 +18826,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19284,7 +18850,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2090701780 MeshFilter: m_ObjectHideFlags: 0 @@ -19340,7 +18905,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19365,7 +18929,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2096080274 MeshFilter: m_ObjectHideFlags: 0 @@ -19421,7 +18984,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19446,7 +19008,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2097382540 MeshFilter: m_ObjectHideFlags: 0 @@ -19484,9 +19045,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2106720174 MeshRenderer: @@ -19503,7 +19064,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19528,7 +19088,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2106720175 MeshFilter: m_ObjectHideFlags: 0 @@ -19598,7 +19157,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19623,7 +19181,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2119204914 MeshFilter: m_ObjectHideFlags: 0 @@ -19679,7 +19236,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19704,7 +19260,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2127647011 MeshFilter: m_ObjectHideFlags: 0 @@ -19760,7 +19315,6 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19785,7 +19339,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136776845 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity index d8a50c2b3a5..0821d36bd72 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity @@ -318,11 +318,6 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity index 054b0799b05..6f16b5df781 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity @@ -323,11 +323,6 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped @@ -466,7 +461,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -485,7 +479,6 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &85208911 Light: m_ObjectHideFlags: 0 @@ -1114,6 +1107,8 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 + passNames: + - Forward layerMask: serializedVersion: 2 m_Bits: 8192 @@ -1404,6 +1399,8 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 10 + passNames: + - Forward layerMask: serializedVersion: 2 m_Bits: 1024 @@ -1546,6 +1543,8 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 + passNames: + - Forward layerMask: serializedVersion: 2 m_Bits: 4096 @@ -2810,7 +2809,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2829,7 +2827,6 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1302253251 Light: m_ObjectHideFlags: 0 @@ -3578,6 +3575,8 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 + passNames: + - Forward layerMask: serializedVersion: 2 m_Bits: 2048 @@ -4081,6 +4080,8 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 + passNames: + - Forward layerMask: serializedVersion: 2 m_Bits: 1 @@ -4157,6 +4158,8 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 + passNames: + - Forward layerMask: serializedVersion: 2 m_Bits: 16384 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity index bc04e6e63c3..2464d215047 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity @@ -714,11 +714,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -728,7 +723,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -747,9 +741,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -839,8 +830,6 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0 AverageCorrectnessThreshold: 0 UseHDR: 0 - UseBackBuffer: 0 - ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -848,7 +837,6 @@ MonoBehaviour: waitFrames: 5 xrCompatible: 1 xrThresholdMultiplier: 1 - renderGraphCompatible: 1 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 0} --- !u!1 &593565746 @@ -1155,7 +1143,6 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &764415611 @@ -1184,7 +1171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 + m_Version: 10 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 2048 @@ -1265,7 +1252,6 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1284,7 +1270,6 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 --- !u!21 &808236715 Material: serializedVersion: 6 @@ -1453,7 +1438,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -1617,7 +1601,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &899885052 GameObject: @@ -1917,7 +1900,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -2081,7 +2063,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &1266377334 GameObject: @@ -2608,11 +2589,6 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2622,7 +2598,6 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2641,9 +2616,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2823,11 +2795,6 @@ PrefabInstance: propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: renderGraphCompatible - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1569434673 @@ -3285,7 +3252,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3449,7 +3415,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2074857581 GameObject: @@ -3655,7 +3620,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3819,7 +3783,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2085158283 GameObject: @@ -4084,7 +4047,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4248,7 +4210,6 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2099876030 GameObject: @@ -4514,7 +4475,6 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 - - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4678,5 +4638,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} - - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] From d0bb7fad219483c3f2ad19ebf64c17b8d6b5c9bf Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 14:50:27 +0200 Subject: [PATCH 27/53] Reverted HDRP test framework files (will go to another PR) --- .../TestRunner/HDRP_GraphicTestRunner.cs | 8 -------- com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs | 1 - 2 files changed, 9 deletions(-) diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs index db677ae9feb..094e27a628a 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs @@ -58,14 +58,6 @@ public IEnumerator Run(GraphicsTestCase testCase) } } - if (HDRenderPipeline.enableRenderGraphTests) - { - if (!settings.renderGraphCompatible) - { - Assert.Ignore("Test scene is not compatible with Render Graph and will be skipped."); - } - } - if (settings.doBeforeTest != null) { settings.doBeforeTest.Invoke(); diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs index bd2fa578af2..fd673a19472 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs @@ -23,7 +23,6 @@ public class HDRP_TestSettings : GraphicsTestSettings [UnityEngine.Range(1.0f, 10.0f)] public float xrThresholdMultiplier = 1.0f; - public bool renderGraphCompatible = true; public bool checkMemoryAllocation = true; From 4ac6aa2021551c0cd8e5ce7591f08aa536477c64 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 4 Jun 2020 14:56:47 +0200 Subject: [PATCH 28/53] Revert "Fixed HDRP asset for test 5009" This reverts commit 95952b08e785daef2bbf7788849c5f661b9eb1fc. --- .../GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 51c3bdbdc9c..790cabb29f8 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -283,7 +283,7 @@ PrefabInstance: type: 3} propertyPath: renderPipelineAsset value: - objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, + objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 0e1d25001f8fbb0666454d59969af6b2a9cd43e0 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 3 Jun 2020 17:00:18 +0200 Subject: [PATCH 29/53] Fixed HDRP asset for test 5009 --- .../GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 97a5d28ce5b..81c4659c77f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -283,7 +283,7 @@ PrefabInstance: type: 3} propertyPath: renderPipelineAsset value: - objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, + objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 4d1cc107a0ea105b1d6c5a52cbf484506884c3b7 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Fri, 5 Jun 2020 15:54:16 +0200 Subject: [PATCH 30/53] Adding purge of unused resources in render graph. --- .../Runtime/RenderGraph/RenderGraph.cs | 11 +- .../RenderGraphResourceRegistry.cs | 147 ++++++++++++------ .../HDRenderPipeline.RenderGraph.cs | 7 +- 3 files changed, 112 insertions(+), 53 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 35eda53f4a8..a207779aee7 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -42,11 +42,13 @@ public ref struct RenderGraphContext public struct RenderGraphExecuteParams { ///Rendering width. - public int renderingWidth; + public int renderingWidth; ///Rendering height. - public int renderingHeight; + public int renderingHeight; ///Number of MSAA samples. - public MSAASamples msaaSamples; + public MSAASamples msaaSamples; + ///Index of the current frame being rendered. + public int currentFrameIndex; } class RenderGraphDebugParams @@ -362,8 +364,7 @@ public void Execute(ScriptableRenderContext renderContext, CommandBuffer cmd, in { m_Logger.Initialize(); - // Update RTHandleSystem with size for this rendering pass. - m_Resources.SetRTHandleReferenceSize(parameters.renderingWidth, parameters.renderingHeight, parameters.msaaSamples); + m_Resources.BeginRender(parameters.renderingWidth, parameters.renderingHeight, parameters.msaaSamples, parameters.currentFrameIndex); LogFrameInformation(parameters.renderingWidth, parameters.renderingHeight); diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 4046b669f3e..b2eb1987865 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -307,6 +307,85 @@ public override int GetHashCode() } #endregion + class RenderGraphTexturePool + { + // Dictionary tracks resources by hash and stores resources with same hash in a List (list instead of a stack because we need to be able to remove stale allocations). + Dictionary> m_ResourcePool = new Dictionary>(); + static int s_CurrentFrameIndex; + + public void ReleaseResource(int hash, RTHandle rt, int currentFrameIndex) + { + if (!m_ResourcePool.TryGetValue(hash, out var list)) + { + list = new List<(RTHandle rt, int frameIndex)>(); + m_ResourcePool.Add(hash, list); + } + + list.Add((rt, currentFrameIndex)); + } + + public bool TryGetResource(int hashCode, out RTHandle rt) + { + if (m_ResourcePool.TryGetValue(hashCode, out var list) && list.Count > 0) + { + rt = list[list.Count - 1].resource; + list.RemoveAt(list.Count - 1); // O(1) since it's the last element. + return true; + } + + rt = null; + return false; + } + + public void PurgeUnusedResources(int currentFrameIndex) + { + // Update the frame index for the lambda. Static because we don't want to capture. + s_CurrentFrameIndex = currentFrameIndex; + + foreach(var kvp in m_ResourcePool) + { + var list = kvp.Value; + list.RemoveAll(obj => + { + if (obj.frameIndex < s_CurrentFrameIndex) + { + obj.resource.Release(); + return true; + } + return false; + }); + } + } + + public void Cleanup() + { + foreach (var kvp in m_ResourcePool) + { + foreach (var res in kvp.Value) + { + res.resource.Release(); + } + } + } + + public void LogResources(RenderGraphLogger logger) + { + List allocationList = new List(); + foreach (var kvp in m_ResourcePool) + { + foreach (var res in kvp.Value) + { + allocationList.Add(res.resource.rt.name); + } + } + + allocationList.Sort(); + int index = 0; + foreach (var element in allocationList) + logger.LogLine("[{0}] {1}", index++, element); + } + } + /// /// The RenderGraphResourceRegistry holds all resource allocated during Render Graph execution. /// @@ -378,17 +457,19 @@ internal ComputeBufferResource(ComputeBuffer computeBuffer, bool imported) #endregion DynamicArray m_TextureResources = new DynamicArray(); - Dictionary> m_TexturePool = new Dictionary>(); + RenderGraphTexturePool m_TexturePool = new RenderGraphTexturePool(); DynamicArray m_RendererListResources = new DynamicArray(); DynamicArray m_ComputeBufferResources = new DynamicArray(); RTHandleSystem m_RTHandleSystem = new RTHandleSystem(); RenderGraphDebugParams m_RenderGraphDebug; RenderGraphLogger m_Logger; + int m_CurrentFrameIndex; RTHandle m_CurrentBackbuffer; // Diagnostic only - List<(int, RTHandle)> m_AllocatedTextures = new List<(int, RTHandle)>(); + // This list allows us to determine if all textures were correctly released in the frame. + List<(int, RTHandle)> m_FrameAllocatedTextures = new List<(int, RTHandle)>(); #region Public Interface /// @@ -454,8 +535,10 @@ internal RenderGraphResourceRegistry(bool supportMSAA, MSAASamples initialSample m_Logger = logger; } - internal void SetRTHandleReferenceSize(int width, int height, MSAASamples msaaSamples) + internal void BeginRender(int width, int height, MSAASamples msaaSamples, int currentFrameIndex) { + m_CurrentFrameIndex = currentFrameIndex; + // Update RTHandleSystem with size for this rendering pass. m_RTHandleSystem.SetReferenceSize(width, height, msaaSamples); } @@ -596,7 +679,7 @@ void CreateTextureForPass(ref TextureResource resource) #if DEVELOPMENT_BUILD || UNITY_EDITOR if (hashCode != -1) { - m_AllocatedTextures.Add((hashCode, resource.rt)); + m_FrameAllocatedTextures.Add((hashCode, resource.rt)); } #endif @@ -654,16 +737,10 @@ internal void ReleaseTexture(RenderGraphContext rgContext, TextureHandle resourc void ReleaseTextureResource(int hash, RTHandle rt) { - if (!m_TexturePool.TryGetValue(hash, out var stack)) - { - stack = new Stack(); - m_TexturePool.Add(hash, stack); - } - - stack.Push(rt); + m_TexturePool.ReleaseResource(hash, rt, m_CurrentFrameIndex); #if DEVELOPMENT_BUILD || UNITY_EDITOR - m_AllocatedTextures.Remove((hash, rt)); + m_FrameAllocatedTextures.Remove((hash, rt)); #endif } @@ -725,14 +802,7 @@ void ValidateRendererListDesc(in RendererListDesc desc) bool TryGetRenderTarget(int hashCode, out RTHandle rt) { - if (m_TexturePool.TryGetValue(hashCode, out var stack) && stack.Count > 0) - { - rt = stack.Pop(); - return true; - } - - rt = null; - return false; + return m_TexturePool.TryGetResource(hashCode, out rt); } internal void CreateRendererLists(List rendererLists) @@ -757,11 +827,11 @@ internal void Clear(bool onException) m_ComputeBufferResources.Clear(); #if DEVELOPMENT_BUILD || UNITY_EDITOR - if (m_AllocatedTextures.Count != 0 && !onException) + if (m_FrameAllocatedTextures.Count != 0 && !onException) { - string logMessage = "RenderGraph: Not all textures were released."; + string logMessage = "RenderGraph: Not all textures were released. This can be caused by a textures being allocated but never read by any pass."; - List<(int, RTHandle)> tempList = new List<(int, RTHandle)>(m_AllocatedTextures); + List<(int, RTHandle)> tempList = new List<(int, RTHandle)>(m_FrameAllocatedTextures); foreach (var value in tempList) { logMessage = $"{logMessage}\n\t{value.Item2.name}"; @@ -771,10 +841,15 @@ internal void Clear(bool onException) Debug.LogWarning(logMessage); } - // If an error occurred during execution, it's expected that textures are not all release so we clear the trakcing list. + // If an error occurred during execution, it's expected that textures are not all released so we clear the tracking list. if (onException) - m_AllocatedTextures.Clear(); + m_FrameAllocatedTextures.Clear(); #endif + + // TODO RENDERGRAPH: Might not be ideal to purge stale resources every frame. + // In case users enable/disable features along a level it might provoke performance spikes when things are reallocated... + // Will be much better when we have actual resource aliasing and we can manage memory more efficiently. + m_TexturePool.PurgeUnusedResources(m_CurrentFrameIndex); } internal void ResetRTHandleReferenceSize(int width, int height) @@ -784,13 +859,7 @@ internal void ResetRTHandleReferenceSize(int width, int height) internal void Cleanup() { - foreach (var value in m_TexturePool) - { - foreach (var rt in value.Value) - { - m_RTHandleSystem.Release(rt); - } - } + m_TexturePool.Cleanup(); } void LogTextureCreation(RTHandle rt, bool cleared) @@ -815,19 +884,7 @@ void LogResources() { m_Logger.LogLine("==== Allocated Resources ====\n"); - List allocationList = new List(); - foreach (var stack in m_TexturePool) - { - foreach (var rt in stack.Value) - { - allocationList.Add(rt.rt.name); - } - } - - allocationList.Sort(); - int index = 0; - foreach (var element in allocationList) - m_Logger.LogLine("[{0}] {1}", index++, element); + m_TexturePool.LogResources(m_Logger); } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 2545d5366b8..640c7ddb041 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -251,18 +251,19 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, RenderGizmos(m_RenderGraph, hdCamera, colorBuffer, GizmoSubset.PostImageEffects); - ExecuteRenderGraph(m_RenderGraph, hdCamera, m_MSAASamples, renderContext, commandBuffer ); + ExecuteRenderGraph(m_RenderGraph, hdCamera, m_MSAASamples, m_FrameCount, renderContext, commandBuffer ); aovRequest.Execute(commandBuffer, aovBuffers, RenderOutputProperties.From(hdCamera)); } - static void ExecuteRenderGraph(RenderGraph renderGraph, HDCamera hdCamera, MSAASamples msaaSample, ScriptableRenderContext renderContext, CommandBuffer cmd) + static void ExecuteRenderGraph(RenderGraph renderGraph, HDCamera hdCamera, MSAASamples msaaSample, int frameIndex, ScriptableRenderContext renderContext, CommandBuffer cmd) { var renderGraphParams = new RenderGraphExecuteParams() { renderingWidth = hdCamera.actualWidth, renderingHeight = hdCamera.actualHeight, - msaaSamples = msaaSample + msaaSamples = msaaSample, + currentFrameIndex = frameIndex }; renderGraph.Execute(renderContext, cmd, renderGraphParams); From fc9f7391b89351d54af36bdb1ff0b390acc7214d Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Mon, 8 Jun 2020 13:18:06 +0200 Subject: [PATCH 31/53] Revert unrelated yml files changes due to old configuration (#714) --- .yamato/universal-android-opengles3.yml | 6 +++--- .yamato/universal-android-vulkan.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.yamato/universal-android-opengles3.yml b/.yamato/universal-android-opengles3.yml index 3a3a544b605..afe425b3078 100644 --- a/.yamato/universal-android-opengles3.yml +++ b/.yamato/universal-android-opengles3.yml @@ -21,7 +21,7 @@ Universal_Android_OpenGLES3_Standalone_trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -77,7 +77,7 @@ Universal_Android_OpenGLES3_Standalone_fast-trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -134,7 +134,7 @@ Universal_Android_OpenGLES3_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: diff --git a/.yamato/universal-android-vulkan.yml b/.yamato/universal-android-vulkan.yml index d3b09005e74..f4799d96cf4 100644 --- a/.yamato/universal-android-vulkan.yml +++ b/.yamato/universal-android-vulkan.yml @@ -21,7 +21,7 @@ Universal_Android_Vulkan_Standalone_trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -77,7 +77,7 @@ Universal_Android_Vulkan_Standalone_fast-trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -134,7 +134,7 @@ Universal_Android_Vulkan_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: From 01de7e6185c076e777401d02761f1cb0ff5cabf0 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 8 Jun 2020 13:44:18 +0200 Subject: [PATCH 32/53] Fixed an issue with not unregistering render graph debug. Disabled test 9401 for render graph after merge conflict. --- .../GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity | 5 +++++ .../Runtime/RenderPipeline/HDRenderPipeline.cs | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity index 03022a17eea..742c65ecd0c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity @@ -268,6 +268,11 @@ PrefabInstance: propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5493111667791475096 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index a4f08a4cc44..843bab0836e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -1151,6 +1151,8 @@ void DisposeProbeCameraPool() #if UNITY_EDITOR } #endif + + CleanupRenderGraph(); } ConstantBuffer.ReleaseAll(); @@ -1671,7 +1673,7 @@ void AddVisibleProbeVisibleIndexIfUpdateIsRequired(HDProbe probe, int visibleInI // NOTE: If the probe was rendered on the very first frame, we could have some data that was used and it wasn't in a fully initialized state, which is fine on PC, but on console // might lead to NaNs due to lack of complete initialization. To circumvent this, we force the probe to render again only if it was rendered on the first frame. Note that the problem // doesn't apply if probe is enable any frame other than the very first. Also note that we are likely to be re-rendering the probe anyway due to the issue on sky ambient probe - // (see m_SkyManager.HasSetValidAmbientProbe in this function). + // (see m_SkyManager.HasSetValidAmbientProbe in this function). if (m_FrameCount > 1) probe.SetIsRendered(m_FrameCount); @@ -2123,7 +2125,7 @@ ref _cullingResults // Render XR mirror view once all render requests have been completed if (i == 0 && renderRequest.hdCamera.camera.cameraType == CameraType.Game && renderRequest.hdCamera.camera.targetTexture == null) - { + { if (HDUtils.TryGetAdditionalCameraDataOrDefault(renderRequest.hdCamera.camera).xrRendering) { m_XRSystem.RenderMirrorView(cmd); From 1fa74519eb87a213119ba711e5e231bf92a1eb19 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 8 Jun 2020 14:17:52 +0200 Subject: [PATCH 33/53] Disabled 9800 for render graph --- .../Scenes/9x_Other/9800_Compositor.unity | 314 +++++++++--------- 1 file changed, 162 insertions(+), 152 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity index ad80798f82b..e18c7c2ef15 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity @@ -124,41 +124,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!84 &8062103 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 640 - m_Height: 360 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &112555164 GameObject: m_ObjectHideFlags: 0 @@ -254,6 +219,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!84 &180892602 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &236318923 GameObject: m_ObjectHideFlags: 0 @@ -333,8 +334,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &341057513 Transform: m_ObjectHideFlags: 1 @@ -378,7 +377,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -431,19 +430,19 @@ Material: serializedVersion: 3 m_TexEnvs: - GreenScreen: - m_Texture: {fileID: 1847047563} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Layer0: - m_Texture: {fileID: 707328070} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Layer1: - m_Texture: {fileID: 1416341668} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Logo: - m_Texture: {fileID: 8062103} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: [] @@ -626,41 +625,6 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: b6e11bd621edeeb43a64506cf2cac8c5, type: 2} ---- !u!84 &707328070 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 640 - m_Height: 360 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &775050991 GameObject: m_ObjectHideFlags: 0 @@ -709,6 +673,78 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: f702b32cef038544a92000621a19b27f, type: 2} +--- !u!84 &1140031896 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 +--- !u!84 &1186312954 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 960 + m_Height: 540 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &1323211074 GameObject: m_ObjectHideFlags: 0 @@ -804,6 +840,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 22.854002, z: 0} +--- !u!84 &1360668987 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &1378491895 GameObject: m_ObjectHideFlags: 0 @@ -881,6 +953,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1378491897 @@ -909,7 +982,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -990,6 +1063,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1008,41 +1082,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 ---- !u!84 &1416341668 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 320 - m_Height: 180 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &1827381199 GameObject: m_ObjectHideFlags: 0 @@ -1138,41 +1178,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 22.476002, z: 0} ---- !u!84 &1847047563 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 640 - m_Height: 360 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1001 &1987531043 PrefabInstance: m_ObjectHideFlags: 0 @@ -1289,6 +1294,11 @@ PrefabInstance: propertyPath: waitFrames value: 5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!20 &1987531044 stripped @@ -1357,7 +1367,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 707328070} + m_RenderTarget: {fileID: 1140031896} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -1485,7 +1495,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 1416341668} + m_RenderTarget: {fileID: 1186312954} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -1549,7 +1559,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 8062103} + m_RenderTarget: {fileID: 180892602} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -1613,7 +1623,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 1847047563} + m_RenderTarget: {fileID: 1360668987} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} From e05eb9a6df0f53f96ecb70a6cc31cf7770cba1c5 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 8 Jun 2020 14:25:43 +0200 Subject: [PATCH 34/53] Revert hdrp asset for 5009 --- .../GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 81c4659c77f..e8899896feb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -283,7 +283,7 @@ PrefabInstance: type: 3} propertyPath: renderPipelineAsset value: - objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, + objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 14a0cad79e14d7e64916d47bf43d1bdaa7fb6730 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 8 Jun 2020 10:56:55 +0200 Subject: [PATCH 35/53] WIP Creation of compute buffers through render graph. --- .../Runtime/RenderGraph/RenderGraph.cs | 49 ++++-- .../RenderGraphResourceRegistry.cs | 153 ++++++++++++++++-- .../HDRenderPipeline.LightLoop.cs | 1 - 3 files changed, 174 insertions(+), 29 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 7a7d2e8e094..de8b57f141c 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -121,8 +121,8 @@ public void Reset() internal struct CompiledPassInfo { public RenderGraphPass pass; - public List textureCreateList; - public List textureReleaseList; + public List textureCreateList; + public List textureReleaseList; public int refCount; public bool pruned; public bool hasSideEffect; @@ -146,8 +146,8 @@ public void Reset(RenderGraphPass pass) if (textureCreateList == null) { - textureCreateList = new List(); - textureReleaseList = new List(); + textureCreateList = new List(); + textureReleaseList = new List(); #if DEVELOPMENT_BUILD || UNITY_EDITOR debugTextureReads = new List(); @@ -182,8 +182,10 @@ public void Reset(RenderGraphPass pass) bool m_ExecutionExceptionWasRaised; // Compiled Render Graph info. - DynamicArray m_CompiledTextureInfos = new DynamicArray(); - DynamicArray m_CompiledBufferInfos = new DynamicArray(); + DynamicArray[] m_CompiledResourcesInfos = new DynamicArray[(int)RenderGraphResourceType.Count]; + + //DynamicArray m_CompiledTextureInfos = new DynamicArray(); + //DynamicArray m_CompiledBufferInfos = new DynamicArray(); DynamicArray m_CompiledPassInfos = new DynamicArray(); Stack m_PruningStack = new Stack(); @@ -212,6 +214,11 @@ public RenderGraphDefaultResources defaultResources public RenderGraph(bool supportMSAA, MSAASamples initialSampleCount) { m_Resources = new RenderGraphResourceRegistry(supportMSAA, initialSampleCount, m_DebugParameters, m_Logger); + + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + m_CompiledResourcesInfos[i] = new DynamicArray(); + } } /// @@ -278,10 +285,8 @@ public TextureHandle ImportBackbuffer(RenderTargetIdentifier rt) /// Texture descriptor. /// Optional property that allows you to specify a Shader property name to use for automatic resource binding. /// A new TextureHandle. - public TextureHandle CreateTexture(TextureDesc desc, int shaderProperty = 0) + public TextureHandle CreateTexture(in TextureDesc desc, int shaderProperty = 0) { - if (m_DebugParameters.tagResourceNamesWithRG) - desc.name = string.Format("{0}_RenderGraph", desc.name); return m_Resources.CreateTexture(desc, shaderProperty); } @@ -293,10 +298,7 @@ public TextureHandle CreateTexture(TextureDesc desc, int shaderProperty = 0) /// A new TextureHandle. public TextureHandle CreateTexture(TextureHandle texture, int shaderProperty = 0) { - var desc = m_Resources.GetTextureResourceDesc(texture); - if (m_DebugParameters.tagResourceNamesWithRG) - desc.name = string.Format("{0}_RenderGraph", desc.name); - return m_Resources.CreateTexture(desc, shaderProperty); + return m_Resources.CreateTexture(m_Resources.GetTextureResourceDesc(texture), shaderProperty); } /// @@ -330,6 +332,21 @@ public ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) return m_Resources.ImportComputeBuffer(computeBuffer); } + public ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc) + { + return m_Resources.CreateComputeBuffer(desc); + } + + public ComputeBufferHandle CreateComputeBuffer(ComputeBufferHandle computeBuffer) + { + return m_Resources.CreateComputeBuffer(m_Resources.GetComputeBufferResourceDesc(computeBuffer)); + } + + public ComputeBufferDesc GetComputeBufferDesc(ComputeBufferHandle computeBuffer) + { + return m_Resources.GetComputeBufferResourceDesc(computeBuffer); + } + /// /// Add a new Render Pass to the current Render Graph. /// @@ -740,7 +757,7 @@ void UpdateResourceAllocationAndSynchronization() int firstWriteIndex = GetFirstValidWriteIndex(textureInfo); // This can happen for imported textures (for example an imported dummy black texture will never be written to but does not need creation anyway) if (firstWriteIndex != -1) - m_CompiledPassInfos[firstWriteIndex].textureCreateList.Add(new TextureHandle(i)); + m_CompiledPassInfos[firstWriteIndex].textureCreateList.Add(i); // Texture release // Sometimes, a texture can be written by a pass after the last pass that reads it. @@ -765,7 +782,7 @@ void UpdateResourceAllocationAndSynchronization() // Finally add the release command to the pass before the first pass that waits for the compute pipe. ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[Math.Max(0, firstWaitingPassIndex - 1)]; - passInfo.textureReleaseList.Add(new TextureHandle(i)); + passInfo.textureReleaseList.Add(i); // Fail safe in case render graph is badly formed. if (currentPassIndex == m_CompiledPassInfos.size) @@ -777,7 +794,7 @@ void UpdateResourceAllocationAndSynchronization() else { ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[lastReadPassIndex]; - passInfo.textureReleaseList.Add(new TextureHandle(i)); + passInfo.textureReleaseList.Add(i); } } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 8722df245d9..1c2836ebd15 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -5,6 +5,14 @@ namespace UnityEngine.Experimental.Rendering.RenderGraphModule { + // RendererList is a different case so not represented here. + internal enum RenderGraphResourceType + { + Texture = 0, + ComputeBuffer, + Count + } + #region Resource Descriptors // BEHOLD C# COPY PASTA // Struct can't be inherited and can't have default member values @@ -320,6 +328,63 @@ public override int GetHashCode() return hashCode; } } + + /// + /// Descriptor used to create compute buffer resources + /// + public struct ComputeBufferDesc + { + ///Number of elements in the buffer.. + public int count; + ///Size of one element in the buffer. Has to match size of buffer type in the shader. + public int stride; + ///Type of the buffer, default is ComputeBufferType.Default (structured buffer). + public ComputeBufferType type; + /// Compute Buffer name. + public string name; + + /// + /// ComputeBufferDesc constructor. + /// + /// Number of elements in the buffer. + /// Size of one element in the buffer. + public ComputeBufferDesc(int count, int stride) + : this() + { + this.count = count; + this.stride = stride; + type = ComputeBufferType.Default; + } + + /// + /// ComputeBufferDesc constructor. + /// + /// Number of elements in the buffer. + /// Size of one element in the buffer. + /// Type of the buffer. + public ComputeBufferDesc(int count, int stride, ComputeBufferType type) + : this() + { + this.count = count; + this.stride = stride; + this.type = type; + } + + /// + /// Hash function + /// + /// The texture descriptor hash. + public override int GetHashCode() + { + int hashCode = 17; + + hashCode = hashCode * 23 + count; + hashCode = hashCode * 23 + stride; + hashCode = hashCode * 23 + (int)type; + + return hashCode; + } + } #endregion class RenderGraphTexturePool @@ -408,6 +473,17 @@ public class RenderGraphResourceRegistry { static readonly ShaderTagId s_EmptyName = new ShaderTagId(""); + + internal struct RenderGraphResource + { + public DescType desc; + public ResType resource; + public bool imported; + public int cachedHash; + public int shaderProperty; + public bool wasReleased; + } + #region Resources internal struct TextureResource { @@ -460,13 +536,25 @@ internal RendererListResource(in RendererListDesc desc) internal struct ComputeBufferResource { - public ComputeBuffer computeBuffer; - public bool imported; + public ComputeBufferDesc desc; + public ComputeBuffer computeBuffer; + public bool imported; + public bool wasReleased; - internal ComputeBufferResource(ComputeBuffer computeBuffer, bool imported) + internal ComputeBufferResource(ComputeBuffer computeBuffer) + : this() { this.computeBuffer = computeBuffer; - this.imported = imported; + this.imported = true; + wasReleased = false; + } + + internal ComputeBufferResource(in ComputeBufferDesc desc) + : this() + { + this.desc = desc; + computeBuffer = null; + wasReleased = false; } } #endregion @@ -533,6 +621,17 @@ public ComputeBuffer GetComputeBuffer(in ComputeBufferHandle handle) if (!handle.IsValid()) return null; +#if DEVELOPMENT_BUILD || UNITY_EDITOR + + var res = m_ComputeBufferResources[handle]; + + if (res.computeBuffer == null && !res.wasReleased) + throw new InvalidOperationException(string.Format("Trying to access compute buffer \"{0}\" that was never created. Check that it was written at least once before trying to get it.", res.desc.name)); + + if (res.computeBuffer == null && res.wasReleased) + throw new InvalidOperationException(string.Format("Trying to access compute buffer \"{0}\" that was already released. Check that the last pass where it's read is after this one.", res.desc.name)); +#endif + return m_ComputeBufferResources[handle].computeBuffer; } #endregion @@ -596,12 +695,12 @@ internal int GetTextureResourceCount() return m_TextureResources.size; } - ref TextureResource GetTextureResource(TextureHandle res) + ref TextureResource GetTextureResource(int res) { return ref m_TextureResources[res]; } - internal TextureDesc GetTextureResourceDesc(TextureHandle res) + internal TextureDesc GetTextureResourceDesc(int res) { return m_TextureResources[res].desc; } @@ -616,10 +715,23 @@ internal RendererListHandle CreateRendererList(in RendererListDesc desc) internal ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) { - int newHandle = m_ComputeBufferResources.Add(new ComputeBufferResource(computeBuffer, imported: true)); + int newHandle = m_ComputeBufferResources.Add(new ComputeBufferResource(computeBuffer)); + return new ComputeBufferHandle(newHandle); + } + + internal ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc) + { + ValidateComputeBufferDesc(desc); + + int newHandle = m_ComputeBufferResources.Add(new ComputeBufferResource(desc)); return new ComputeBufferHandle(newHandle); } + internal ComputeBufferDesc GetComputeBufferResourceDesc(ComputeBufferHandle res) + { + return m_ComputeBufferResources[res].desc; + } + internal bool IsComputeBufferImported(ComputeBufferHandle handle) { return handle.IsValid() ? GetComputeBufferResource(handle).imported : false; @@ -635,9 +747,9 @@ internal ref ComputeBufferResource GetComputeBufferResource(ComputeBufferHandle return ref m_ComputeBufferResources[res]; } - internal void CreateAndClearTexture(RenderGraphContext rgContext, TextureHandle texture) + internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) { - ref var resource = ref GetTextureResource(texture); + ref var resource = ref GetTextureResource(index); if (!resource.imported) { CreateTextureForPass(ref resource); @@ -675,6 +787,10 @@ void CreateTextureForPass(ref TextureResource resource) resource.rt = null; if (!TryGetRenderTarget(hashCode, out resource.rt)) { + string name = desc.name; + if (m_RenderGraphDebug.tagResourceNamesWithRG) + name = $"RenderGraph_{name}"; + // Note: Name used here will be the one visible in the memory profiler so it means that whatever is the first pass that actually allocate the texture will set the name. // TODO: Find a way to display name by pass. switch (desc.sizeMode) @@ -695,7 +811,7 @@ void CreateTextureForPass(ref TextureResource resource) } //// Try to update name when re-using a texture. - //// TODO: Check if that actually works. + //// TODO RENDERGRAPH: Check if that actually works. //resource.rt.name = desc.name; #if DEVELOPMENT_BUILD || UNITY_EDITOR @@ -734,7 +850,7 @@ internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, L SetGlobalTextures(rgContext, textures, true); } - internal void ReleaseTexture(RenderGraphContext rgContext, TextureHandle resource) + internal void ReleaseTexture(RenderGraphContext rgContext, int resource) { ref var resourceDesc = ref GetTextureResource(resource); if (!resourceDesc.imported) @@ -744,7 +860,9 @@ internal void ReleaseTexture(RenderGraphContext rgContext, TextureHandle resourc using (new ProfilingScope(rgContext.cmd, ProfilingSampler.Get(RenderGraphProfileId.RenderGraphClearDebug))) { var clearFlag = resourceDesc.desc.depthBufferBits != DepthBits.None ? ClearFlag.Depth : ClearFlag.Color; - CoreUtils.SetRenderTarget(rgContext.cmd, GetTexture(resource), clearFlag, Color.magenta); + // Not ideal to do new TextureHandle here but GetTexture is a public API and we rather have it take an explicit TextureHandle parameters. + // Everywhere else internally int is better because it allows us to share more code. + CoreUtils.SetRenderTarget(rgContext.cmd, GetTexture(new TextureHandle(resource)), clearFlag, Color.magenta); } } @@ -821,6 +939,17 @@ void ValidateRendererListDesc(in RendererListDesc desc) #endif } + void ValidateComputeBufferDesc(in ComputeBufferDesc desc) + { +#if DEVELOPMENT_BUILD || UNITY_EDITOR + // TODO RENDERGRAPH: Check actual condition on stride. + //if (desc.stride % 4 != 0) + //{ + // throw new ArgumentException("Compute Buffer stride must be at least 4."); + //} +#endif + } + bool TryGetRenderTarget(int hashCode, out RTHandle rt) { return m_TexturePool.TryGetResource(hashCode, out rt); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 2caf386b69a..9153004940c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -132,7 +132,6 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa BuildDispatchIndirectArguments(data.buildGPULightListParameters, buildLightListResources, tileFlagsWritten, context.cmd); - // TODO RENDERGRAPH WARNING: Note that the three sets of variables are bound here, but it should be handled differently. PushLightLoopGlobalParams(data.lightLoopGlobalParameters, context.cmd); }); From 434797437c5a42791d93570bca5f7ca553374dcb Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 8 Jun 2020 18:36:29 +0200 Subject: [PATCH 36/53] Refactoring internal resource management to share more code (WIP) # Conflicts: # com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs --- .../Runtime/RenderGraph/RenderGraph.cs | 5 +- .../RenderGraphResourceRegistry.cs | 331 +++++++++++------- 2 files changed, 216 insertions(+), 120 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index de8b57f141c..863d2c35ba7 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -420,13 +420,14 @@ internal void ClearCompiledGraph() m_Resources.Clear(m_ExecutionExceptionWasRaised); m_DefaultResources.Clear(); m_RendererLists.Clear(); - m_CompiledBufferInfos.Clear(); - m_CompiledTextureInfos.Clear(); + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + m_CompiledResourcesInfos[i].Clear(); m_CompiledPassInfos.Clear(); } void InitializeCompilationData() { + m_CompiledResourcesInfos[(int)RenderGraphResourceType.Texture] m_CompiledBufferInfos.Resize(m_Resources.GetComputeBufferResourceCount()); for (int i = 0; i < m_CompiledBufferInfos.size; ++i) m_CompiledBufferInfos[i].Reset(); diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 1c2836ebd15..0ca4c165dfd 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -473,55 +473,118 @@ public class RenderGraphResourceRegistry { static readonly ShaderTagId s_EmptyName = new ShaderTagId(""); - - internal struct RenderGraphResource + class IRenderGraphResource { - public DescType desc; - public ResType resource; public bool imported; - public int cachedHash; - public int shaderProperty; + public int cachedHash; + public int shaderProperty; public bool wasReleased; + + public virtual void Reset() + { + imported = false; + cachedHash = -1; + shaderProperty = 0; + wasReleased = false; + } } #region Resources - internal struct TextureResource + class RenderGraphResource + : IRenderGraphResource + where DescType : struct + where ResType : class { - public TextureDesc desc; - public bool imported; - public RTHandle rt; - public int cachedHash; - public int shaderProperty; - public bool wasReleased; - - internal TextureResource(RTHandle rt, int shaderProperty) - : this() + public DescType desc; + public ResType resource; + + protected RenderGraphResource() { - Reset(); - this.rt = rt; - imported = true; - this.shaderProperty = shaderProperty; } - internal TextureResource(in TextureDesc desc, int shaderProperty) - : this() + //internal RenderGraphResource(ResType resource, int shaderProperty) + //{ + // Reset(); + + // this.resource = resource; + // imported = true; + // this.shaderProperty = shaderProperty; + //} + + //internal RenderGraphResource(in DescType desc, int shaderProperty) + //{ + // Reset(); + + // this.desc = desc; + // this.shaderProperty = shaderProperty; + //} + + public override void Reset() { - Reset(); + base.Reset(); + resource = null; + } - this.desc = desc; - this.shaderProperty = shaderProperty; + public virtual string GetName() + { + return ""; } + } - void Reset() + class TextureResource : RenderGraphResource + { + public override string GetName() { - imported = false; - rt = null; - cachedHash = -1; - wasReleased = false; + return desc.name; + } + } + + class ComputeBufferResource : RenderGraphResource + { + public override string GetName() + { + return desc.name; } } + //internal struct TextureResource + //{ + // public TextureDesc desc; + // public bool imported; + // public RTHandle rt; + // public int cachedHash; + // public int shaderProperty; + // public bool wasReleased; + + // internal TextureResource(RTHandle rt, int shaderProperty) + // : this() + // { + // Reset(); + + // this.rt = rt; + // imported = true; + // this.shaderProperty = shaderProperty; + // } + + // internal TextureResource(in TextureDesc desc, int shaderProperty) + // : this() + // { + // Reset(); + + // this.desc = desc; + // this.shaderProperty = shaderProperty; + // } + + // void Reset() + // { + // imported = false; + // rt = null; + // cachedHash = -1; + // wasReleased = false; + // } + //} + internal struct RendererListResource { public RendererListDesc desc; @@ -534,35 +597,41 @@ internal RendererListResource(in RendererListDesc desc) } } - internal struct ComputeBufferResource - { - public ComputeBufferDesc desc; - public ComputeBuffer computeBuffer; - public bool imported; - public bool wasReleased; + //internal struct ComputeBufferResource + //{ + // public ComputeBufferDesc desc; + // public ComputeBuffer computeBuffer; + // public bool imported; + // public bool wasReleased; + + // internal ComputeBufferResource(ComputeBuffer computeBuffer) + // : this() + // { + // this.computeBuffer = computeBuffer; + // this.imported = true; + // wasReleased = false; + // } + + // internal ComputeBufferResource(in ComputeBufferDesc desc) + // : this() + // { + // this.desc = desc; + // computeBuffer = null; + // wasReleased = false; + // } + //} + #endregion - internal ComputeBufferResource(ComputeBuffer computeBuffer) - : this() - { - this.computeBuffer = computeBuffer; - this.imported = true; - wasReleased = false; - } + //DynamicArray m_TextureResources = new DynamicArray(); + //DynamicArray m_ComputeBufferResources = new DynamicArray(); - internal ComputeBufferResource(in ComputeBufferDesc desc) - : this() - { - this.desc = desc; - computeBuffer = null; - wasReleased = false; - } - } - #endregion + //DynamicArray> m_TextureResources = new DynamicArray>(); + //DynamicArray> m_ComputeBufferResources = new DynamicArray>(); + + DynamicArray[] m_Resources = new DynamicArray[(int)RenderGraphResourceType.Count]; - DynamicArray m_TextureResources = new DynamicArray(); RenderGraphTexturePool m_TexturePool = new RenderGraphTexturePool(); DynamicArray m_RendererListResources = new DynamicArray(); - DynamicArray m_ComputeBufferResources = new DynamicArray(); RTHandleSystem m_RTHandleSystem = new RTHandleSystem(); RenderGraphDebugParams m_RenderGraphDebug; RenderGraphLogger m_Logger; @@ -574,6 +643,7 @@ internal ComputeBufferResource(in ComputeBufferDesc desc) // This list allows us to determine if all textures were correctly released in the frame. List<(int, RTHandle)> m_FrameAllocatedTextures = new List<(int, RTHandle)>(); + #region Public Interface /// /// Returns the RTHandle associated with the provided resource handle. @@ -585,17 +655,7 @@ public RTHandle GetTexture(in TextureHandle handle) if (!handle.IsValid()) return null; -#if DEVELOPMENT_BUILD || UNITY_EDITOR - - var res = m_TextureResources[handle]; - - if (res.rt == null && !res.wasReleased) - throw new InvalidOperationException(string.Format("Trying to access texture \"{0}\" that was never created. Check that it was written at least once before trying to get it.", res.desc.name)); - - if (res.rt == null && res.wasReleased) - throw new InvalidOperationException(string.Format("Trying to access texture \"{0}\" that was already released. Check that the last pass where it's read is after this one.", res.desc.name)); -#endif - return m_TextureResources[handle].rt; + return GetTextureResource(handle).resource; } /// @@ -621,18 +681,7 @@ public ComputeBuffer GetComputeBuffer(in ComputeBufferHandle handle) if (!handle.IsValid()) return null; -#if DEVELOPMENT_BUILD || UNITY_EDITOR - - var res = m_ComputeBufferResources[handle]; - - if (res.computeBuffer == null && !res.wasReleased) - throw new InvalidOperationException(string.Format("Trying to access compute buffer \"{0}\" that was never created. Check that it was written at least once before trying to get it.", res.desc.name)); - - if (res.computeBuffer == null && res.wasReleased) - throw new InvalidOperationException(string.Format("Trying to access compute buffer \"{0}\" that was already released. Check that the last pass where it's read is after this one.", res.desc.name)); -#endif - - return m_ComputeBufferResources[handle].computeBuffer; + return GetComputeBufferResource(handle).resource; } #endregion @@ -648,6 +697,25 @@ internal RenderGraphResourceRegistry(bool supportMSAA, MSAASamples initialSample m_RTHandleSystem.Initialize(Screen.width, Screen.height, supportMSAA, initialSampleCount); m_RenderGraphDebug = renderGraphDebug; m_Logger = logger; + + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + m_Resources[i] = new DynamicArray(); + } + + ResType GetResource(DynamicArray resourceArray, int index) + where DescType : struct + where ResType : class + { + var res = resourceArray[index] as RenderGraphResource; + +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (res.resource == null && !res.wasReleased) + throw new InvalidOperationException(string.Format("Trying to access resource \"{0}\" that was never created. Check that it was written at least once before trying to get it.", res.GetName())); + + if (res.resource == null && res.wasReleased) + throw new InvalidOperationException(string.Format("Trying to access resource \"{0}\" that was already released. Check that the last pass where it's read is after this one.", res.GetName())); +#endif + return res.resource; } internal void BeginRender(int width, int height, MSAASamples msaaSamples, int currentFrameIndex) @@ -662,7 +730,11 @@ internal void BeginRender(int width, int height, MSAASamples msaaSamples, int cu // Texture Creation/Import APIs are internal because creation should only go through RenderGraph internal TextureHandle ImportTexture(RTHandle rt, int shaderProperty = 0) { - int newHandle = m_TextureResources.Add(new TextureResource(rt, shaderProperty)); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.Texture], out TextureResource texResource); + texResource.resource = rt; + texResource.imported = true; + texResource.shaderProperty = shaderProperty; + return new TextureHandle(newHandle); } @@ -678,31 +750,49 @@ internal TextureHandle ImportBackbuffer(RenderTargetIdentifier rt) else m_CurrentBackbuffer = m_RTHandleSystem.Alloc(rt); - int newHandle = m_TextureResources.Add(new TextureResource(m_CurrentBackbuffer, 0)); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.Texture], out TextureResource texResource); + texResource.resource = m_CurrentBackbuffer; + texResource.imported = true; + return new TextureHandle(newHandle); } + int AddNewResource(DynamicArray resourceArray, out ResType outRes) where ResType : IRenderGraphResource, new() + { + // In order to not create garbage, instead of using Add, we keep the content of the array while resizing and we just reset the existing ref (or create it if it's null). + int result = resourceArray.size; + resourceArray.Resize(resourceArray.size + 1, true); + if (resourceArray[result] == null) + resourceArray[result] = new ResType(); + + outRes = resourceArray[result] as ResType; + outRes.Reset(); + return result; + } + internal TextureHandle CreateTexture(in TextureDesc desc, int shaderProperty = 0, int transientPassIndex = -1) { ValidateTextureDesc(desc); - int newHandle = m_TextureResources.Add(new TextureResource(desc, shaderProperty)); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.Texture], out TextureResource texResource); + texResource.desc = desc; + texResource.shaderProperty = shaderProperty; return new TextureHandle(newHandle, transientPassIndex); } internal int GetTextureResourceCount() { - return m_TextureResources.size; + return m_Resources[(int)RenderGraphResourceType.Texture].size; } - ref TextureResource GetTextureResource(int res) + TextureResource GetTextureResource(int index) { - return ref m_TextureResources[res]; + return m_Resources[(int)RenderGraphResourceType.Texture][index] as TextureResource; } - internal TextureDesc GetTextureResourceDesc(int res) + internal TextureDesc GetTextureResourceDesc(int index) { - return m_TextureResources[res].desc; + return (m_Resources[(int)RenderGraphResourceType.Texture][index] as TextureResource).desc; } internal RendererListHandle CreateRendererList(in RendererListDesc desc) @@ -715,7 +805,10 @@ internal RendererListHandle CreateRendererList(in RendererListDesc desc) internal ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) { - int newHandle = m_ComputeBufferResources.Add(new ComputeBufferResource(computeBuffer)); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.ComputeBuffer], out ComputeBufferResource bufferResource); + bufferResource.resource = computeBuffer; + bufferResource.imported = true; + return new ComputeBufferHandle(newHandle); } @@ -723,13 +816,15 @@ internal ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc) { ValidateComputeBufferDesc(desc); - int newHandle = m_ComputeBufferResources.Add(new ComputeBufferResource(desc)); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.ComputeBuffer], out ComputeBufferResource bufferResource); + bufferResource.desc = desc; + return new ComputeBufferHandle(newHandle); } - internal ComputeBufferDesc GetComputeBufferResourceDesc(ComputeBufferHandle res) + internal ComputeBufferDesc GetComputeBufferResourceDesc(ComputeBufferHandle index) { - return m_ComputeBufferResources[res].desc; + return (m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource).desc; } internal bool IsComputeBufferImported(ComputeBufferHandle handle) @@ -739,20 +834,20 @@ internal bool IsComputeBufferImported(ComputeBufferHandle handle) internal int GetComputeBufferResourceCount() { - return m_ComputeBufferResources.size; + return m_Resources[(int)RenderGraphResourceType.ComputeBuffer].size; } - internal ref ComputeBufferResource GetComputeBufferResource(ComputeBufferHandle res) + ComputeBufferResource GetComputeBufferResource(ComputeBufferHandle index) { - return ref m_ComputeBufferResources[res]; + return m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource; } internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) { - ref var resource = ref GetTextureResource(index); + var resource = GetTextureResource(index); if (!resource.imported) { - CreateTextureForPass(ref resource); + CreateTextureForPass(resource); var fastMemDesc = resource.desc.fastMemoryDesc; if(fastMemDesc.inFastMemory) @@ -768,24 +863,24 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) { var clearFlag = resource.desc.depthBufferBits != DepthBits.None ? ClearFlag.Depth : ClearFlag.Color; var clearColor = debugClear ? Color.magenta : resource.desc.clearColor; - CoreUtils.SetRenderTarget(rgContext.cmd, resource.rt, clearFlag, clearColor); + CoreUtils.SetRenderTarget(rgContext.cmd, resource.resource, clearFlag, clearColor); } } - LogTextureCreation(resource.rt, resource.desc.clearBuffer || m_RenderGraphDebug.clearRenderTargetsAtCreation); + LogTextureCreation(resource.resource, resource.desc.clearBuffer || m_RenderGraphDebug.clearRenderTargetsAtCreation); } } - void CreateTextureForPass(ref TextureResource resource) + void CreateTextureForPass(TextureResource resource) { var desc = resource.desc; int hashCode = desc.GetHashCode(); - if(resource.rt != null) + if(resource.resource != null) throw new InvalidOperationException(string.Format("Trying to create an already created texture ({0}). Texture was probably declared for writing more than once in the same pass.", resource.desc.name)); - resource.rt = null; - if (!TryGetRenderTarget(hashCode, out resource.rt)) + resource.resource = null; + if (!TryGetRenderTarget(hashCode, out resource.resource)) { string name = desc.name; if (m_RenderGraphDebug.tagResourceNamesWithRG) @@ -796,15 +891,15 @@ void CreateTextureForPass(ref TextureResource resource) switch (desc.sizeMode) { case TextureSizeMode.Explicit: - resource.rt = m_RTHandleSystem.Alloc(desc.width, desc.height, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, + resource.resource = m_RTHandleSystem.Alloc(desc.width, desc.height, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.msaaSamples, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); break; case TextureSizeMode.Scale: - resource.rt = m_RTHandleSystem.Alloc(desc.scale, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, + resource.resource = m_RTHandleSystem.Alloc(desc.scale, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.enableMSAA, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); break; case TextureSizeMode.Functor: - resource.rt = m_RTHandleSystem.Alloc(desc.func, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, + resource.resource = m_RTHandleSystem.Alloc(desc.func, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.enableMSAA, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); break; } @@ -817,7 +912,7 @@ void CreateTextureForPass(ref TextureResource resource) #if DEVELOPMENT_BUILD || UNITY_EDITOR if (hashCode != -1) { - m_FrameAllocatedTextures.Add((hashCode, resource.rt)); + m_FrameAllocatedTextures.Add((hashCode, resource.resource)); } #endif @@ -831,9 +926,9 @@ void SetGlobalTextures(RenderGraphContext rgContext, List texture var resourceDesc = GetTextureResource(resource); if (resourceDesc.shaderProperty != 0) { - if (resourceDesc.rt != null) + if (resourceDesc.resource != null) { - rgContext.cmd.SetGlobalTexture(resourceDesc.shaderProperty, bindDummyTexture ? TextureXR.GetMagentaTexture() : resourceDesc.rt); + rgContext.cmd.SetGlobalTexture(resourceDesc.shaderProperty, bindDummyTexture ? TextureXR.GetMagentaTexture() : resourceDesc.resource); } } } @@ -850,27 +945,27 @@ internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, L SetGlobalTextures(rgContext, textures, true); } - internal void ReleaseTexture(RenderGraphContext rgContext, int resource) + internal void ReleaseTexture(RenderGraphContext rgContext, int handle) { - ref var resourceDesc = ref GetTextureResource(resource); - if (!resourceDesc.imported) + var resource = GetTextureResource(handle); + if (!resource.imported) { if (m_RenderGraphDebug.clearRenderTargetsAtRelease) { using (new ProfilingScope(rgContext.cmd, ProfilingSampler.Get(RenderGraphProfileId.RenderGraphClearDebug))) { - var clearFlag = resourceDesc.desc.depthBufferBits != DepthBits.None ? ClearFlag.Depth : ClearFlag.Color; + var clearFlag = resource.desc.depthBufferBits != DepthBits.None ? ClearFlag.Depth : ClearFlag.Color; // Not ideal to do new TextureHandle here but GetTexture is a public API and we rather have it take an explicit TextureHandle parameters. // Everywhere else internally int is better because it allows us to share more code. - CoreUtils.SetRenderTarget(rgContext.cmd, GetTexture(new TextureHandle(resource)), clearFlag, Color.magenta); + CoreUtils.SetRenderTarget(rgContext.cmd, GetTexture(new TextureHandle(handle)), clearFlag, Color.magenta); } } - LogTextureRelease(resourceDesc.rt); - ReleaseTextureResource(resourceDesc.cachedHash, resourceDesc.rt); - resourceDesc.cachedHash = -1; - resourceDesc.rt = null; - resourceDesc.wasReleased = true; + LogTextureRelease(resource.resource); + ReleaseTextureResource(resource.cachedHash, resource.resource); + resource.cachedHash = -1; + resource.resource = null; + resource.wasReleased = true; } } @@ -972,9 +1067,9 @@ internal void Clear(bool onException) { LogResources(); - m_TextureResources.Clear(); + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + m_Resources[i].Clear(); m_RendererListResources.Clear(); - m_ComputeBufferResources.Clear(); #if DEVELOPMENT_BUILD || UNITY_EDITOR if (m_FrameAllocatedTextures.Count != 0 && !onException) From d126be46c4c629cabe1fdedf57616e81606696b0 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 15 Jun 2020 18:02:06 +0200 Subject: [PATCH 37/53] Share most of the code between compute buffers and textures. --- .../Runtime/RenderGraph/RenderGraph.cs | 369 ++++++++---------- .../Runtime/RenderGraph/RenderGraphBuilder.cs | 66 +++- .../Runtime/RenderGraph/RenderGraphPass.cs | 61 ++- .../RenderGraphResourceRegistry.cs | 82 ++-- 4 files changed, 291 insertions(+), 287 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 863d2c35ba7..b227a972ae0 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -121,8 +121,8 @@ public void Reset() internal struct CompiledPassInfo { public RenderGraphPass pass; - public List textureCreateList; - public List textureReleaseList; + public List[] resourceCreateList; + public List[] resourceReleaseList; public int refCount; public bool pruned; public bool hasSideEffect; @@ -136,27 +136,41 @@ internal struct CompiledPassInfo #if DEVELOPMENT_BUILD || UNITY_EDITOR // This members are only here to ease debugging. - public List debugTextureReads; - public List debugTextureWrites; + public List[] debugResourceReads; + public List[] debugResourceWrites; #endif public void Reset(RenderGraphPass pass) { this.pass = pass; - if (textureCreateList == null) + if (resourceCreateList == null) { - textureCreateList = new List(); - textureReleaseList = new List(); + resourceCreateList = new List[(int)RenderGraphResourceType.Count]; + resourceReleaseList = new List[(int)RenderGraphResourceType.Count]; + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + resourceCreateList[i] = new List(); + resourceReleaseList[i] = new List(); + } #if DEVELOPMENT_BUILD || UNITY_EDITOR - debugTextureReads = new List(); - debugTextureWrites = new List(); + debugResourceReads = new List[(int)RenderGraphResourceType.Count]; + debugResourceWrites = new List[(int)RenderGraphResourceType.Count]; + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + debugResourceReads[i] = new List(); + debugResourceWrites[i] = new List(); + } #endif } - textureCreateList.Clear(); - textureReleaseList.Clear(); + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + resourceCreateList[i].Clear(); + resourceReleaseList[i].Clear(); + } + refCount = 0; pruned = false; hasSideEffect = false; @@ -165,29 +179,29 @@ public void Reset(RenderGraphPass pass) needGraphicsFence = false; #if DEVELOPMENT_BUILD || UNITY_EDITOR - debugTextureReads.Clear(); - debugTextureWrites.Clear(); + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + debugResourceReads[i].Clear(); + debugResourceWrites[i].Clear(); + } #endif } } - RenderGraphResourceRegistry m_Resources; - RenderGraphObjectPool m_RenderGraphPool = new RenderGraphObjectPool(); - List m_RenderPasses = new List(64); - List m_RendererLists = new List(32); - RenderGraphDebugParams m_DebugParameters = new RenderGraphDebugParams(); - RenderGraphLogger m_Logger = new RenderGraphLogger(); - RenderGraphDefaultResources m_DefaultResources = new RenderGraphDefaultResources(); - Dictionary m_DefaultProfilingSamplers = new Dictionary(); - bool m_ExecutionExceptionWasRaised; + RenderGraphResourceRegistry m_Resources; + RenderGraphObjectPool m_RenderGraphPool = new RenderGraphObjectPool(); + List m_RenderPasses = new List(64); + List m_RendererLists = new List(32); + RenderGraphDebugParams m_DebugParameters = new RenderGraphDebugParams(); + RenderGraphLogger m_Logger = new RenderGraphLogger(); + RenderGraphDefaultResources m_DefaultResources = new RenderGraphDefaultResources(); + Dictionary m_DefaultProfilingSamplers = new Dictionary(); + bool m_ExecutionExceptionWasRaised; // Compiled Render Graph info. - DynamicArray[] m_CompiledResourcesInfos = new DynamicArray[(int)RenderGraphResourceType.Count]; - - //DynamicArray m_CompiledTextureInfos = new DynamicArray(); - //DynamicArray m_CompiledBufferInfos = new DynamicArray(); - DynamicArray m_CompiledPassInfos = new DynamicArray(); - Stack m_PruningStack = new Stack(); + DynamicArray[] m_CompiledResourcesInfos = new DynamicArray[(int)RenderGraphResourceType.Count]; + DynamicArray m_CompiledPassInfos = new DynamicArray(); + Stack m_PruningStack = new Stack(); #region Public Interface @@ -408,13 +422,13 @@ public void Execute(ScriptableRenderContext renderContext, CommandBuffer cmd, in } #endregion - #region Internal Interface + #region Private Interface private RenderGraph() { } - internal void ClearCompiledGraph() + void ClearCompiledGraph() { ClearRenderPasses(); m_Resources.Clear(m_ExecutionExceptionWasRaised); @@ -425,83 +439,66 @@ internal void ClearCompiledGraph() m_CompiledPassInfos.Clear(); } + void InitResourceInfosData(DynamicArray resourceInfos, int count) + { + resourceInfos.Resize(count); + for (int i = 0; i < resourceInfos.size; ++i) + resourceInfos[i].Reset(); + } + void InitializeCompilationData() { - m_CompiledResourcesInfos[(int)RenderGraphResourceType.Texture] - m_CompiledBufferInfos.Resize(m_Resources.GetComputeBufferResourceCount()); - for (int i = 0; i < m_CompiledBufferInfos.size; ++i) - m_CompiledBufferInfos[i].Reset(); - m_CompiledTextureInfos.Resize(m_Resources.GetTextureResourceCount()); - for (int i = 0; i < m_CompiledTextureInfos.size; ++i) - m_CompiledTextureInfos[i].Reset(); + InitResourceInfosData(m_CompiledResourcesInfos[(int)RenderGraphResourceType.Texture], m_Resources.GetTextureResourceCount()); + InitResourceInfosData(m_CompiledResourcesInfos[(int)RenderGraphResourceType.ComputeBuffer], m_Resources.GetComputeBufferResourceCount()); + m_CompiledPassInfos.Resize(m_RenderPasses.Count); for (int i = 0; i < m_CompiledPassInfos.size; ++i) m_CompiledPassInfos[i].Reset(m_RenderPasses[i]); } - internal DynamicArray GetCompiledPassInfos() { return m_CompiledPassInfos; } - void CountReferences() { for (int passIndex = 0; passIndex < m_CompiledPassInfos.size; ++passIndex) { ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[passIndex]; - var textureRead = passInfo.pass.textureReadList; - foreach (TextureHandle texture in textureRead) + for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type) { - ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; - info.consumers.Add(passIndex); - info.refCount++; + var resourceRead = passInfo.pass.resourceReadLists[type]; + foreach (int resourceIndex in resourceRead) + { + ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resourceIndex]; + info.consumers.Add(passIndex); + info.refCount++; #if DEVELOPMENT_BUILD || UNITY_EDITOR - passInfo.debugTextureReads.Add(m_Resources.GetTextureResourceDesc(texture).name); + passInfo.debugResourceReads[type].Add(m_Resources.GetResourceName((RenderGraphResourceType)type, resourceIndex)); #endif - } + } - var textureWrite = passInfo.pass.textureWriteList; - foreach (TextureHandle texture in textureWrite) - { - ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; - info.producers.Add(passIndex); - passInfo.refCount++; + var resourceWrite = passInfo.pass.resourceWriteLists[type]; + foreach (int resourceIndex in resourceWrite) + { + ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resourceIndex]; + info.producers.Add(passIndex); + passInfo.refCount++; - // Writing to an imported texture is considered as a side effect because we don't know what users will do with it outside of render graph. - if (m_Resources.IsTextureImported(texture)) - passInfo.hasSideEffect = true; + // Writing to an imported texture is considered as a side effect because we don't know what users will do with it outside of render graph. + if (m_Resources.IsResourceImported((RenderGraphResourceType)type, resourceIndex)) + passInfo.hasSideEffect = true; #if DEVELOPMENT_BUILD || UNITY_EDITOR - passInfo.debugTextureWrites.Add(m_Resources.GetTextureResourceDesc(texture).name); + passInfo.debugResourceWrites[type].Add(m_Resources.GetResourceName((RenderGraphResourceType)type, resourceIndex)); #endif - } - - foreach (TextureHandle texture in passInfo.pass.transientTextureList) - { - ref CompiledResourceInfo info = ref m_CompiledTextureInfos[texture]; - info.refCount++; - info.consumers.Add(passIndex); - info.producers.Add(passIndex); - } - - // Can't share the code with a generic func as TextureHandle and ComputeBufferHandle are both struct and can't inherit from a common struct with a shared API (thanks C#) - var bufferRead = passInfo.pass.bufferReadList; - foreach (ComputeBufferHandle buffer in bufferRead) - { - ref CompiledResourceInfo info = ref m_CompiledBufferInfos[buffer]; - info.consumers.Add(passIndex); - info.refCount++; - } - - var bufferWrite = passInfo.pass.bufferWriteList; - foreach (ComputeBufferHandle buffer in bufferWrite) - { - ref CompiledResourceInfo info = ref m_CompiledBufferInfos[buffer]; - info.producers.Add(passIndex); - passInfo.refCount++; + } - // Writing to an imported compute buffer is considered as a side effect because we don't know what users will do with it outside of render graph. - if (m_Resources.IsComputeBufferImported(buffer)) - passInfo.hasSideEffect = true; + foreach (int resourceIndex in passInfo.pass.transientResourceList[type]) + { + ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resourceIndex]; + info.refCount++; + info.consumers.Add(passIndex); + info.producers.Add(passIndex); + } } } } @@ -510,9 +507,9 @@ void PruneOutputlessPasses() { // Gather passes that don't produce anything and prune them. m_PruningStack.Clear(); - for (int i = 0; i < m_CompiledPassInfos.size; ++i) + for (int pass = 0; pass < m_CompiledPassInfos.size; ++pass) { - ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[i]; + ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[pass]; if (passInfo.refCount == 0 && !passInfo.hasSideEffect && passInfo.allowPassPruning) { @@ -521,85 +518,65 @@ void PruneOutputlessPasses() // We don't need to go recursively here because we decrement ref count of read resources // so the subsequent passes of pruning will detect those and remove the related passes. passInfo.pruned = true; - foreach (var index in passInfo.pass.textureReadList) + for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type) { - m_CompiledTextureInfos[index].refCount--; - } + foreach (var index in passInfo.pass.resourceReadLists[type]) + { + m_CompiledResourcesInfos[type][index].refCount--; - foreach (var index in passInfo.pass.bufferReadList) - { - m_CompiledBufferInfos[index].refCount--; + } } } } } - void PruneUnusedPasses(bool textureResources) + void PruneUnusedPasses() { - DynamicArray resourceUsageList = textureResources ? m_CompiledTextureInfos : m_CompiledBufferInfos; + // TODO RENDERGRAPH: temporarily remove pruning of passes without product. + // Many passes are used just to set global variables so we don't want to force users to disallow pruning on those explicitly every time. + // This will prune passes with no outputs. + //PruneOutputlessPasses(); - // Gather resources that are never read. - m_PruningStack.Clear(); - for (int i = 0; i < resourceUsageList.size; ++i) + // This will prune all passes that produce resource that are never read. + for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type) { - if (resourceUsageList[i].refCount == 0) + DynamicArray resourceUsageList = m_CompiledResourcesInfos[type]; + + // Gather resources that are never read. + m_PruningStack.Clear(); + for (int i = 0; i < resourceUsageList.size; ++i) { - m_PruningStack.Push(i); + if (resourceUsageList[i].refCount == 0) + { + m_PruningStack.Push(i); + } } - } - while (m_PruningStack.Count != 0) - { - var unusedResource = resourceUsageList[m_PruningStack.Pop()]; - foreach (var producerIndex in unusedResource.producers) + while (m_PruningStack.Count != 0) { - ref var producerInfo = ref m_CompiledPassInfos[producerIndex]; - producerInfo.refCount--; - if (producerInfo.refCount == 0 && !producerInfo.hasSideEffect && producerInfo.allowPassPruning) + var unusedResource = resourceUsageList[m_PruningStack.Pop()]; + foreach (var producerIndex in unusedResource.producers) { - // Producer is not necessary anymore as it produces zero resources - // Prune it and decrement refCount of all the textures it reads. - producerInfo.pruned = true; - - // Once again, can't share code because C# (can't have struct inheritance) - // Making all those List could help but we lose a lot of explicitness in the API... - if (textureResources) - { - foreach (var textureIndex in producerInfo.pass.textureReadList) - { - ref CompiledResourceInfo resourceInfo = ref resourceUsageList[textureIndex]; - resourceInfo.refCount--; - // If a resource is not used anymore, add it to the stack to be processed in subsequent iteration. - if (resourceInfo.refCount == 0) - m_PruningStack.Push(textureIndex); - } - } - else + ref var producerInfo = ref m_CompiledPassInfos[producerIndex]; + producerInfo.refCount--; + if (producerInfo.refCount == 0 && !producerInfo.hasSideEffect && producerInfo.allowPassPruning) { - foreach (var bufferIndex in producerInfo.pass.bufferReadList) + // Producer is not necessary anymore as it produces zero resources + // Prune it and decrement refCount of all the textures it reads. + producerInfo.pruned = true; + + foreach (var resourceIndex in producerInfo.pass.resourceReadLists[type]) { - ref CompiledResourceInfo resourceInfo = ref resourceUsageList[bufferIndex]; + ref CompiledResourceInfo resourceInfo = ref resourceUsageList[resourceIndex]; resourceInfo.refCount--; // If a resource is not used anymore, add it to the stack to be processed in subsequent iteration. if (resourceInfo.refCount == 0) - m_PruningStack.Push(bufferIndex); + m_PruningStack.Push(resourceIndex); } } } } } - } - - void PruneUnusedPasses() - { - // TODO RENDERGRAPH: temporarily remove pruning of passes without product. - // Many passes are used just to set global variables so we don't want to force users to disallow pruning on those explicitly every time. - // This will prune passes with no outputs. - //PruneOutputlessPasses(); - - // This will prune all passes that produce resource that are never read. - PruneUnusedPasses(textureResources: true); - PruneUnusedPasses(textureResources: false); LogPrunedPasses(); } @@ -726,77 +703,77 @@ void UpdateResourceAllocationAndSynchronization() if (passInfo.pruned) continue; - foreach (TextureHandle texture in passInfo.pass.textureReadList) + for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type) { - UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledTextureInfos[texture]); - } + var resourcesInfo = m_CompiledResourcesInfos[type]; + foreach (int resource in passInfo.pass.resourceReadLists[type]) + { + UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, resourcesInfo[resource]); + } - foreach (TextureHandle texture in passInfo.pass.textureWriteList) - { - UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledTextureInfos[texture]); - } + foreach (int resource in passInfo.pass.resourceWriteLists[type]) + { + UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, resourcesInfo[resource]); + } - foreach (ComputeBufferHandle texture in passInfo.pass.bufferReadList) - { - UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledBufferInfos[texture]); - } - foreach (ComputeBufferHandle texture in passInfo.pass.bufferWriteList) - { - UpdateResourceSynchronization(ref lastGraphicsPipeSync, ref lastComputePipeSync, passIndex, m_CompiledBufferInfos[texture]); } // Gather all renderer lists m_RendererLists.AddRange(passInfo.pass.usedRendererListList); } - // Now push textures to the release list of the pass that reads it last. - for (int i = 0; i < m_CompiledTextureInfos.size; ++i) + for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type) { - CompiledResourceInfo textureInfo = m_CompiledTextureInfos[i]; + var resourceInfos = m_CompiledResourcesInfos[type]; + // Now push resources to the release list of the pass that reads it last. + for (int i = 0; i < resourceInfos.size; ++i) + { + CompiledResourceInfo resourceInfo = resourceInfos[i]; - // Texture creation - int firstWriteIndex = GetFirstValidWriteIndex(textureInfo); - // This can happen for imported textures (for example an imported dummy black texture will never be written to but does not need creation anyway) - if (firstWriteIndex != -1) - m_CompiledPassInfos[firstWriteIndex].textureCreateList.Add(i); + // Resource creation + int firstWriteIndex = GetFirstValidWriteIndex(resourceInfo); + // Index -1 can happen for imported resources (for example an imported dummy black texture will never be written to but does not need creation anyway) + if (firstWriteIndex != -1) + m_CompiledPassInfos[firstWriteIndex].resourceCreateList[type].Add(i); - // Texture release - // Sometimes, a texture can be written by a pass after the last pass that reads it. - // In this case, we need to extend its lifetime to this pass otherwise the pass would get an invalid texture. - int lastReadPassIndex = Math.Max(GetLatestValidReadIndex(textureInfo), GetLatestValidWriteIndex(textureInfo)); + // Texture release + // Sometimes, a texture can be written by a pass after the last pass that reads it. + // In this case, we need to extend its lifetime to this pass otherwise the pass would get an invalid texture. + int lastReadPassIndex = Math.Max(GetLatestValidReadIndex(resourceInfo), GetLatestValidWriteIndex(resourceInfo)); - if (lastReadPassIndex != -1) - { - // In case of async passes, we need to extend lifetime of resource to the first pass on the graphics pipeline that wait for async passes to be over. - // Otherwise, if we freed the resource right away during an async pass, another non async pass could reuse the resource even though the async pipe is not done. - if (m_CompiledPassInfos[lastReadPassIndex].enableAsyncCompute) + if (lastReadPassIndex != -1) { - int currentPassIndex = lastReadPassIndex; - int firstWaitingPassIndex = m_CompiledPassInfos[currentPassIndex].syncFromPassIndex; - // Find the first async pass that is synchronized by the graphics pipeline (ie: passInfo.syncFromPassIndex != -1) - while (firstWaitingPassIndex == -1 && currentPassIndex < m_CompiledPassInfos.size) + // In case of async passes, we need to extend lifetime of resource to the first pass on the graphics pipeline that wait for async passes to be over. + // Otherwise, if we freed the resource right away during an async pass, another non async pass could reuse the resource even though the async pipe is not done. + if (m_CompiledPassInfos[lastReadPassIndex].enableAsyncCompute) { - currentPassIndex++; - if(m_CompiledPassInfos[currentPassIndex].enableAsyncCompute) - firstWaitingPassIndex = m_CompiledPassInfos[currentPassIndex].syncFromPassIndex; - } + int currentPassIndex = lastReadPassIndex; + int firstWaitingPassIndex = m_CompiledPassInfos[currentPassIndex].syncFromPassIndex; + // Find the first async pass that is synchronized by the graphics pipeline (ie: passInfo.syncFromPassIndex != -1) + while (firstWaitingPassIndex == -1 && currentPassIndex < m_CompiledPassInfos.size) + { + currentPassIndex++; + if (m_CompiledPassInfos[currentPassIndex].enableAsyncCompute) + firstWaitingPassIndex = m_CompiledPassInfos[currentPassIndex].syncFromPassIndex; + } - // Finally add the release command to the pass before the first pass that waits for the compute pipe. - ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[Math.Max(0, firstWaitingPassIndex - 1)]; - passInfo.textureReleaseList.Add(i); + // Finally add the release command to the pass before the first pass that waits for the compute pipe. + ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[Math.Max(0, firstWaitingPassIndex - 1)]; + passInfo.resourceReleaseList[type].Add(i); - // Fail safe in case render graph is badly formed. - if (currentPassIndex == m_CompiledPassInfos.size) + // Fail safe in case render graph is badly formed. + if (currentPassIndex == m_CompiledPassInfos.size) + { + RenderGraphPass invalidPass = m_RenderPasses[lastReadPassIndex]; + throw new InvalidOperationException($"Asynchronous pass {invalidPass.name} was never synchronized on the graphics pipeline."); + } + } + else { - RenderGraphPass invalidPass = m_RenderPasses[lastReadPassIndex]; - throw new InvalidOperationException($"Asynchronous pass {invalidPass.name} was never synchronized on the graphics pipeline."); + ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[lastReadPassIndex]; + passInfo.resourceReleaseList[type].Add(i); } } - else - { - ref CompiledPassInfo passInfo = ref m_CompiledPassInfos[lastReadPassIndex]; - passInfo.textureReleaseList.Add(i); - } } } @@ -808,7 +785,7 @@ void UpdateResourceAllocationAndSynchronization() // - Determines when resources are created/released // - Determines async compute pass synchronization // - Prune unused render passes. - internal void CompileRenderGraph() + void CompileRenderGraph() { InitializeCompilationData(); CountReferences(); @@ -912,9 +889,9 @@ void PreRenderPassExecute(in CompiledPassInfo passInfo, ref RenderGraphContext r // TODO RENDERGRAPH remove this when we do away with auto global texture setup // (can't put it in the profiling scope otherwise it might be executed on compute queue which is not possible for global sets) - m_Resources.PreRenderPassSetGlobalTextures(rgContext, pass.textureReadList); + m_Resources.PreRenderPassSetGlobalTextures(rgContext, pass.resourceReadLists[(int)RenderGraphResourceType.Texture]); - foreach (var texture in passInfo.textureCreateList) + foreach (var texture in passInfo.resourceCreateList[(int)RenderGraphResourceType.Texture]) m_Resources.CreateAndClearTexture(rgContext, texture); PreRenderPassSetRenderTargets(passInfo, rgContext); @@ -953,11 +930,11 @@ void PostRenderPassExecute(CommandBuffer mainCmd, ref CompiledPassInfo passInfo, } if (m_DebugParameters.unbindGlobalTextures) - m_Resources.PostRenderPassUnbindGlobalTextures(rgContext, pass.textureReadList); + m_Resources.PostRenderPassUnbindGlobalTextures(rgContext, pass.resourceReadLists[(int)RenderGraphResourceType.Texture]); m_RenderGraphPool.ReleaseAllTempAlloc(); - foreach (var texture in passInfo.textureReleaseList) + foreach (var texture in passInfo.resourceReleaseList[(int)RenderGraphResourceType.Texture]) m_Resources.ReleaseTexture(rgContext, texture); } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs index fa44c72f73e..501425f4937 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs @@ -22,8 +22,7 @@ public struct RenderGraphBuilder : IDisposable /// An updated resource handle to the input resource. public TextureHandle UseColorBuffer(TextureHandle input, int index) { - CheckTransientTexture(input); - + CheckTransientResource(RenderGraphResourceType.Texture, input); m_RenderPass.SetColorBuffer(input, index); return input; } @@ -36,8 +35,7 @@ public TextureHandle UseColorBuffer(TextureHandle input, int index) /// An updated resource handle to the input resource. public TextureHandle UseDepthBuffer(TextureHandle input, DepthAccess flags) { - CheckTransientTexture(input); - + CheckTransientResource(RenderGraphResourceType.Texture, input); m_RenderPass.SetDepthBuffer(input, flags); return input; } @@ -49,9 +47,8 @@ public TextureHandle UseDepthBuffer(TextureHandle input, DepthAccess flags) /// An updated resource handle to the input resource. public TextureHandle ReadTexture(TextureHandle input) { - CheckTransientTexture(input); - - m_RenderPass.AddTextureRead(input); + CheckTransientResource(RenderGraphResourceType.Texture, input); + m_RenderPass.AddResourceRead(RenderGraphResourceType.Texture, input); return input; } @@ -62,10 +59,9 @@ public TextureHandle ReadTexture(TextureHandle input) /// An updated resource handle to the input resource. public TextureHandle WriteTexture(TextureHandle input) { - CheckTransientTexture(input); - - // TODO: Manage resource "version" for debugging purpose - m_RenderPass.AddTextureWrite(input); + CheckTransientResource(RenderGraphResourceType.Texture, input); + // TODO RENDERGRAPH: Manage resource "version" for debugging purpose + m_RenderPass.AddResourceWrite(RenderGraphResourceType.Texture, input); return input; } @@ -78,7 +74,7 @@ public TextureHandle WriteTexture(TextureHandle input) public TextureHandle CreateTransientTexture(in TextureDesc desc) { var result = m_Resources.CreateTexture(desc, 0, m_RenderPass.index); - m_RenderPass.AddTransientTexture(result); + m_RenderPass.AddTransientResource(RenderGraphResourceType.Texture, result); return result; } @@ -91,7 +87,7 @@ public TextureHandle CreateTransientTexture(TextureHandle texture) { var desc = m_Resources.GetTextureResourceDesc(texture); var result = m_Resources.CreateTexture(desc, 0, m_RenderPass.index); - m_RenderPass.AddTransientTexture(result); + m_RenderPass.AddTransientResource(RenderGraphResourceType.Texture, result); return result; } @@ -113,7 +109,8 @@ public RendererListHandle UseRendererList(RendererListHandle input) /// An updated resource handle to the input resource. public ComputeBufferHandle ReadComputeBuffer(ComputeBufferHandle input) { - m_RenderPass.AddBufferRead(input); + CheckTransientResource(RenderGraphResourceType.ComputeBuffer, input); + m_RenderPass.AddResourceRead(RenderGraphResourceType.ComputeBuffer, input); return input; } @@ -124,10 +121,37 @@ public ComputeBufferHandle ReadComputeBuffer(ComputeBufferHandle input) /// An updated resource handle to the input resource. public ComputeBufferHandle WriteComputeBuffer(ComputeBufferHandle input) { - m_RenderPass.AddBufferWrite(input); + CheckTransientResource(RenderGraphResourceType.ComputeBuffer, input); + m_RenderPass.AddResourceWrite(RenderGraphResourceType.ComputeBuffer, input); return input; } + /// + /// Create a new Render Graph Compute Buffer resource. + /// This buffer will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations. + /// + /// Compute Buffer descriptor. + /// A new transient ComputeBufferHandle. + public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferDesc desc) + { + var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index); + m_RenderPass.AddTransientResource(RenderGraphResourceType.ComputeBuffer, result); + return result; + } + + /// + /// Create a new Render Graph Texture resource using the descriptor from another texture. + /// + /// Texture from which the descriptor should be used. + /// A new transient TextureHandle. + public ComputeBufferHandle CreateTransientComputeBuffer(ComputeBufferHandle buffer) + { + var desc = m_Resources.GetComputeBufferResourceDesc(buffer); + var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index); + m_RenderPass.AddTransientResource(RenderGraphResourceType.ComputeBuffer, result); + return result; + } + /// /// Specify the render function to use for this pass. /// A call to this is mandatory for the pass to be valid. @@ -185,12 +209,18 @@ void Dispose(bool disposing) m_Disposed = true; } - void CheckTransientTexture(TextureHandle input) + void CheckTransientResource(RenderGraphResourceType type, int input) { - if (input.IsValid() && input.transientPassIndex != -1 && input.transientPassIndex != m_RenderPass.index) +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (input != -1) { - throw new ArgumentException($"Trying to use a transient texture (pass index {input.transientPassIndex}) in a different pass (pass index {m_RenderPass.index}."); + int transientIndex = m_Resources.GetResourceTransientIndex(type, input); + if (transientIndex != -1 && transientIndex != m_RenderPass.index) + { + throw new ArgumentException($"Trying to use a transient texture (pass index {transientIndex}) in a different pass (pass index {m_RenderPass.index}."); + } } +#endif } #endregion } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs index 0d282cc3713..2b84a942ce9 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs @@ -26,23 +26,34 @@ public RenderFunc GetExecuteDelegate() public int colorBufferMaxIndex { get; protected set; } = -1; public int refCount { get; protected set; } - public List textureReadList = new List(); - public List textureWriteList = new List(); - public List transientTextureList = new List(); - public List bufferReadList = new List(); - public List bufferWriteList = new List(); + public List[] resourceReadLists = new List[(int)RenderGraphResourceType.Count]; + public List[] resourceWriteLists = new List[(int)RenderGraphResourceType.Count]; + public List[] transientResourceList = new List[(int)RenderGraphResourceType.Count]; + public List usedRendererListList = new List(); + public RenderGraphPass() + { + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + resourceReadLists[i] = new List(); + resourceWriteLists[i] = new List(); + transientResourceList[i] = new List(); + } + } + public void Clear() { name = ""; index = -1; customSampler = null; - textureReadList.Clear(); - textureWriteList.Clear(); - bufferReadList.Clear(); - bufferWriteList.Clear(); - transientTextureList.Clear(); + for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) + { + resourceReadLists[i].Clear(); + resourceWriteLists[i].Clear(); + transientResourceList[i].Clear(); + } + usedRendererListList.Clear(); enableAsyncCompute = false; allowPassPruning = true; @@ -57,31 +68,19 @@ public void Clear() } } - public void AddTextureWrite(TextureHandle texture) - { - textureWriteList.Add(texture); - refCount++; - } - - public void AddTextureRead(TextureHandle texture) - { - textureReadList.Add(texture); - } - - public void AddBufferWrite(ComputeBufferHandle buffer) + public void AddResourceWrite(RenderGraphResourceType type, int index) { - bufferWriteList.Add(buffer); - refCount++; + resourceWriteLists[(int)type].Add(index); } - public void AddTransientTexture(TextureHandle texture) + public void AddResourceRead(RenderGraphResourceType type, int index) { - transientTextureList.Add(texture); + resourceReadLists[(int)type].Add(index); } - public void AddBufferRead(ComputeBufferHandle buffer) + public void AddTransientResource(RenderGraphResourceType type, int index) { - bufferReadList.Add(buffer); + transientResourceList[(int)type].Add(index); } public void UseRendererList(RendererListHandle rendererList) @@ -104,16 +103,16 @@ public void SetColorBuffer(TextureHandle resource, int index) Debug.Assert(index < RenderGraph.kMaxMRTCount && index >= 0); colorBufferMaxIndex = Math.Max(colorBufferMaxIndex, index); colorBuffers[index] = resource; - AddTextureWrite(resource); + AddResourceWrite(RenderGraphResourceType.Texture, resource); } public void SetDepthBuffer(TextureHandle resource, DepthAccess flags) { depthBuffer = resource; if ((flags & DepthAccess.Read) != 0) - AddTextureRead(resource); + AddResourceRead(RenderGraphResourceType.Texture, resource); if ((flags & DepthAccess.Write) != 0) - AddTextureWrite(resource); + AddResourceWrite(RenderGraphResourceType.Texture, resource); } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 0ca4c165dfd..7e5c9e6fcb6 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -26,8 +26,7 @@ public struct TextureHandle { bool m_IsValid; internal int handle { get; private set; } - internal int transientPassIndex { get; private set; } - internal TextureHandle(int handle, int transientPassIndex = -1) { this.handle = handle; m_IsValid = true; this.transientPassIndex = transientPassIndex; } + internal TextureHandle(int handle) { this.handle = handle; m_IsValid = true; } /// /// Conversion to int. /// @@ -40,25 +39,6 @@ public struct TextureHandle /// True if the handle is valid. public bool IsValid() => m_IsValid; - /// - /// Equals Override. - /// - /// Other handle to test against. - /// True if both handle are equals. - public override bool Equals(System.Object obj) - { - //Check for null and compare run-time types. - if ((obj == null) || !this.GetType().Equals(obj.GetType())) - { - return false; - } - else - { - TextureHandle texture = (TextureHandle)obj; - return texture.handle == handle && texture.m_IsValid == m_IsValid; - } - } - /// /// GetHashCode override. /// @@ -478,6 +458,7 @@ class IRenderGraphResource public bool imported; public int cachedHash; public int shaderProperty; + public int transientPassIndex; public bool wasReleased; public virtual void Reset() @@ -485,8 +466,14 @@ public virtual void Reset() imported = false; cachedHash = -1; shaderProperty = 0; + transientPassIndex = -1; wasReleased = false; } + + public virtual string GetName() + { + return ""; + } } #region Resources @@ -525,11 +512,6 @@ public override void Reset() base.Reset(); resource = null; } - - public virtual string GetName() - { - return ""; - } } class TextureResource : RenderGraphResource @@ -727,6 +709,30 @@ internal void BeginRender(int width, int height, MSAASamples msaaSamples, int cu internal RTHandleProperties GetRTHandleProperties() { return m_RTHandleSystem.rtHandleProperties; } + internal string GetResourceName(RenderGraphResourceType type, int index) + { + var resources = m_Resources[(int)type]; + if (index < 0 || index >= resources.size) + throw new ArgumentException($"Trying to access resource of type {type} with an invalid resource index {index}"); + return m_Resources[(int)type][index].GetName(); + } + + internal bool IsResourceImported(RenderGraphResourceType type, int index) + { + var resources = m_Resources[(int)type]; + if (index < 0 || index >= resources.size) + throw new ArgumentException($"Trying to access resource of type {type} with an invalid resource index {index}"); + return m_Resources[(int)type][index].imported; + } + + internal int GetResourceTransientIndex(RenderGraphResourceType type, int index) + { + var resources = m_Resources[(int)type]; + if (index < 0 || index >= resources.size) + throw new ArgumentException($"Trying to access resource of type {type} with an invalid resource index {index}"); + return m_Resources[(int)type][index].transientPassIndex; + } + // Texture Creation/Import APIs are internal because creation should only go through RenderGraph internal TextureHandle ImportTexture(RTHandle rt, int shaderProperty = 0) { @@ -738,11 +744,6 @@ internal TextureHandle ImportTexture(RTHandle rt, int shaderProperty = 0) return new TextureHandle(newHandle); } - internal bool IsTextureImported(TextureHandle handle) - { - return handle.IsValid() ? GetTextureResource(handle).imported : false; - } - internal TextureHandle ImportBackbuffer(RenderTargetIdentifier rt) { if (m_CurrentBackbuffer != null) @@ -777,7 +778,8 @@ internal TextureHandle CreateTexture(in TextureDesc desc, int shaderProperty = 0 int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.Texture], out TextureResource texResource); texResource.desc = desc; texResource.shaderProperty = shaderProperty; - return new TextureHandle(newHandle, transientPassIndex); + texResource.transientPassIndex = transientPassIndex; + return new TextureHandle(newHandle); } internal int GetTextureResourceCount() @@ -812,12 +814,13 @@ internal ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) return new ComputeBufferHandle(newHandle); } - internal ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc) + internal ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc, int transientPassIndex = -1) { ValidateComputeBufferDesc(desc); int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.ComputeBuffer], out ComputeBufferResource bufferResource); bufferResource.desc = desc; + bufferResource.transientPassIndex = transientPassIndex; return new ComputeBufferHandle(newHandle); } @@ -827,11 +830,6 @@ internal ComputeBufferDesc GetComputeBufferResourceDesc(ComputeBufferHandle inde return (m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource).desc; } - internal bool IsComputeBufferImported(ComputeBufferHandle handle) - { - return handle.IsValid() ? GetComputeBufferResource(handle).imported : false; - } - internal int GetComputeBufferResourceCount() { return m_Resources[(int)RenderGraphResourceType.ComputeBuffer].size; @@ -852,7 +850,7 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) var fastMemDesc = resource.desc.fastMemoryDesc; if(fastMemDesc.inFastMemory) { - resource.rt.SwitchToFastMemory(rgContext.cmd, fastMemDesc.residencyFraction, fastMemDesc.flags); + resource.resource.SwitchToFastMemory(rgContext.cmd, fastMemDesc.residencyFraction, fastMemDesc.flags); } if (resource.desc.clearBuffer || m_RenderGraphDebug.clearRenderTargetsAtCreation) @@ -919,7 +917,7 @@ void CreateTextureForPass(TextureResource resource) resource.cachedHash = hashCode; } - void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bindDummyTexture) + void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bindDummyTexture) { foreach (var resource in textures) { @@ -935,12 +933,12 @@ void SetGlobalTextures(RenderGraphContext rgContext, List texture } - internal void PreRenderPassSetGlobalTextures(RenderGraphContext rgContext, List textures) + internal void PreRenderPassSetGlobalTextures(RenderGraphContext rgContext, List textures) { SetGlobalTextures(rgContext, textures, false); } - internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, List textures) + internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, List textures) { SetGlobalTextures(rgContext, textures, true); } From 10acf559d3e7807b903be5c186b3ac3b9c083008 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Mon, 15 Jun 2020 18:12:36 +0200 Subject: [PATCH 38/53] Restored internal API for tests and fixed unit tests. --- .../Runtime/RenderGraph/RenderGraph.cs | 10 ++++++++-- .../Tests/Editor/RenderGraphTests.cs | 12 ++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index b227a972ae0..80b14ff5596 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -423,12 +423,17 @@ public void Execute(ScriptableRenderContext renderContext, CommandBuffer cmd, in #endregion #region Private Interface + + // Internal for testing purpose only + internal DynamicArray GetCompiledPassInfos() { return m_CompiledPassInfos; } + private RenderGraph() { } - void ClearCompiledGraph() + // Internal for testing purpose only + internal void ClearCompiledGraph() { ClearRenderPasses(); m_Resources.Clear(m_ExecutionExceptionWasRaised); @@ -781,11 +786,12 @@ void UpdateResourceAllocationAndSynchronization() m_Resources.CreateRendererLists(m_RendererLists); } + // Internal for testing purpose only // Traverse the render graph: // - Determines when resources are created/released // - Determines async compute pass synchronization // - Prune unused render passes. - void CompileRenderGraph() + internal void CompileRenderGraph() { InitializeCompilationData(); CountReferences(); diff --git a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs index 65f1c853130..0d52838a2fd 100644 --- a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs +++ b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs @@ -284,8 +284,8 @@ public void SimpleCreateReleaseTexture() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(4, compiledPasses.size); - Assert.Contains(texture, compiledPasses[0].textureCreateList); - Assert.Contains(texture, compiledPasses[3].textureReleaseList); + Assert.Contains((int)texture, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); + Assert.Contains((int)texture, compiledPasses[3].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } [Test] @@ -326,8 +326,8 @@ public void TransientCreateReleaseInSamePass() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(1, compiledPasses.size); - Assert.Contains(texture, compiledPasses[0].textureCreateList); - Assert.Contains(texture, compiledPasses[0].textureReleaseList); + Assert.Contains((int)texture, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); + Assert.Contains((int)texture, compiledPasses[0].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } // Texture that should be released during an async pass should have their release delayed until the first pass that syncs with the compute pipe. @@ -396,8 +396,8 @@ public void AsyncPassReleaseTextureOnGraphicsPipe() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(6, compiledPasses.size); - Assert.Contains(texture0, compiledPasses[4].textureReleaseList); - Assert.Contains(texture2, compiledPasses[4].textureReleaseList); + Assert.Contains((int)texture0, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains((int)texture2, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } [Test] From 1f5e7e05e6c093714e093f3a7894653327caa53b Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Tue, 16 Jun 2020 14:54:46 +0200 Subject: [PATCH 39/53] Post merge fix --- .../Runtime/RenderGraph/RenderGraphResourceRegistry.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 16737757ca1..18d5587bc3b 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -946,8 +946,8 @@ internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, L internal void ReleaseTexture(RenderGraphContext rgContext, int handle) { var resource = GetTextureResource(handle); - if (resource.rt == null) - throw new InvalidOperationException($"Tried to release a texture ({resourceDesc.desc.name}) that was never created. Check that there is at least one pass writing to it first."); + if (resource.resource == null) + throw new InvalidOperationException($"Tried to release a texture ({resource.desc.name}) that was never created. Check that there is at least one pass writing to it first."); if (!resource.imported) { From 489d2c93a5fe4cc0ee1dd6e9de92cf16b69c416e Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Tue, 16 Jun 2020 17:47:21 +0200 Subject: [PATCH 40/53] Added APIs to create compute buffers through render graph. --- .../Runtime/RenderGraph/RenderGraph.cs | 22 +- .../Runtime/RenderGraph/RenderGraphBuilder.cs | 14 +- .../RenderGraph/RenderGraphResourcePool.cs | 172 +++++ .../RenderGraphResourcePool.cs.meta | 11 + .../RenderGraphResourceRegistry.cs | 706 +++--------------- .../RenderGraph/RenderGraphResources.cs | 366 +++++++++ .../RenderGraph/RenderGraphResources.cs.meta | 11 + .../HDRenderPipeline.LightLoop.cs | 3 +- .../RenderPipeline/HDRenderPipeline.cs | 10 +- 9 files changed, 703 insertions(+), 612 deletions(-) create mode 100644 com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs create mode 100644 com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs.meta create mode 100644 com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs create mode 100644 com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs.meta diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 80b14ff5596..9294933940b 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -318,7 +318,7 @@ public TextureHandle CreateTexture(TextureHandle texture, int shaderProperty = 0 /// /// Gets the descriptor of the specified Texture resource. /// - /// + /// Texture resource from which the descriptor is requested. /// The input texture descriptor. public TextureDesc GetTextureDesc(TextureHandle texture) { @@ -346,16 +346,31 @@ public ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) return m_Resources.ImportComputeBuffer(computeBuffer); } + /// + /// Create a new Render Graph Compute Buffer resource. + /// + /// Compute Buffer descriptor. + /// A new ComputeBufferHandle. public ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc) { return m_Resources.CreateComputeBuffer(desc); } + /// + /// Create a new Render Graph Compute Buffer resource using the descriptor from another compute buffer. + /// + /// Compute Buffer from which the descriptor should be used. + /// A new ComputeBufferHandle. public ComputeBufferHandle CreateComputeBuffer(ComputeBufferHandle computeBuffer) { return m_Resources.CreateComputeBuffer(m_Resources.GetComputeBufferResourceDesc(computeBuffer)); } + /// + /// Gets the descriptor of the specified Compute Buffer resource. + /// + /// Compute Buffer resource from which the descriptor is requested. + /// The input compute buffer descriptor. public ComputeBufferDesc GetComputeBufferDesc(ComputeBufferHandle computeBuffer) { return m_Resources.GetComputeBufferResourceDesc(computeBuffer); @@ -900,6 +915,9 @@ void PreRenderPassExecute(in CompiledPassInfo passInfo, ref RenderGraphContext r foreach (var texture in passInfo.resourceCreateList[(int)RenderGraphResourceType.Texture]) m_Resources.CreateAndClearTexture(rgContext, texture); + foreach (var buffer in passInfo.resourceCreateList[(int)RenderGraphResourceType.ComputeBuffer]) + m_Resources.CreateComputeBuffer(rgContext, buffer); + PreRenderPassSetRenderTargets(passInfo, rgContext); // Flush first the current command buffer on the render context. @@ -942,6 +960,8 @@ void PostRenderPassExecute(CommandBuffer mainCmd, ref CompiledPassInfo passInfo, foreach (var texture in passInfo.resourceReleaseList[(int)RenderGraphResourceType.Texture]) m_Resources.ReleaseTexture(rgContext, texture); + foreach (var buffer in passInfo.resourceReleaseList[(int)RenderGraphResourceType.ComputeBuffer]) + m_Resources.ReleaseComputeBuffer(rgContext, buffer); } void ClearRenderPasses() diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs index 501425f4937..62e4a27a099 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs @@ -80,6 +80,7 @@ public TextureHandle CreateTransientTexture(in TextureDesc desc) /// /// Create a new Render Graph Texture resource using the descriptor from another texture. + /// This texture will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations. /// /// Texture from which the descriptor should be used. /// A new transient TextureHandle. @@ -128,7 +129,7 @@ public ComputeBufferHandle WriteComputeBuffer(ComputeBufferHandle input) /// /// Create a new Render Graph Compute Buffer resource. - /// This buffer will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations. + /// This Compute Buffer will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations. /// /// Compute Buffer descriptor. /// A new transient ComputeBufferHandle. @@ -140,13 +141,14 @@ public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferDesc des } /// - /// Create a new Render Graph Texture resource using the descriptor from another texture. + /// Create a new Render Graph Compute Buffer resource using the descriptor from another Compute Buffer. + /// This Compute Buffer will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations. /// - /// Texture from which the descriptor should be used. - /// A new transient TextureHandle. - public ComputeBufferHandle CreateTransientComputeBuffer(ComputeBufferHandle buffer) + /// Compute Buffer from which the descriptor should be used. + /// A new transient ComputeBufferHandle. + public ComputeBufferHandle CreateTransientComputeBuffer(ComputeBufferHandle computebuffer) { - var desc = m_Resources.GetComputeBufferResourceDesc(buffer); + var desc = m_Resources.GetComputeBufferResourceDesc(computebuffer); var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index); m_RenderPass.AddTransientResource(RenderGraphResourceType.ComputeBuffer, result); return result; diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs new file mode 100644 index 00000000000..70456ce4855 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs @@ -0,0 +1,172 @@ +using System.Collections.Generic; +using UnityEngine.Rendering; + +namespace UnityEngine.Experimental.Rendering.RenderGraphModule +{ + + abstract class RenderGraphResourcePool where Type : class + { + // Dictionary tracks resources by hash and stores resources with same hash in a List (list instead of a stack because we need to be able to remove stale allocations). + Dictionary> m_ResourcePool = new Dictionary>(); + +#if DEVELOPMENT_BUILD || UNITY_EDITOR + // Diagnostic only + // This list allows us to determine if all resources were correctly released in the frame. + List<(int, Type)> m_FrameAllocatedResources = new List<(int, Type)>(); +#endif + + static int s_CurrentFrameIndex; + + // Release the GPU resource itself + abstract protected void ReleaseInternalResource(Type res); + abstract protected string GetResourceName(Type res); + abstract protected string GetResourceTypeName(); + + public void ReleaseResource(int hash, Type resource, int currentFrameIndex) + { + if (!m_ResourcePool.TryGetValue(hash, out var list)) + { + list = new List<(Type resource, int frameIndex)>(); + m_ResourcePool.Add(hash, list); + } + + list.Add((resource, currentFrameIndex)); + } + + public bool TryGetResource(int hashCode, out Type resource) + { + if (m_ResourcePool.TryGetValue(hashCode, out var list) && list.Count > 0) + { + resource = list[list.Count - 1].resource; + list.RemoveAt(list.Count - 1); // O(1) since it's the last element. + return true; + } + + resource = null; + return false; + } + + public void PurgeUnusedResources(int currentFrameIndex) + { + // Update the frame index for the lambda. Static because we don't want to capture. + s_CurrentFrameIndex = currentFrameIndex; + + foreach (var kvp in m_ResourcePool) + { + var list = kvp.Value; + list.RemoveAll(obj => + { + if (obj.frameIndex < s_CurrentFrameIndex) + { + ReleaseInternalResource(obj.resource); + return true; + } + return false; + }); + } + } + + public void Cleanup() + { + foreach (var kvp in m_ResourcePool) + { + foreach (var res in kvp.Value) + { + ReleaseInternalResource(res.resource); + } + } + } + + public void RegisterFrameAllocation(int hash, Type value) + { +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (hash != -1) + m_FrameAllocatedResources.Add((hash, value)); +#endif + } + + public void UnregisterFrameAllocation(int hash, Type value) + { +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (hash != -1) + m_FrameAllocatedResources.Remove((hash, value)); +#endif + } + + public void CheckFrameAllocation(bool onException, int frameIndex) + { +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (m_FrameAllocatedResources.Count != 0 && !onException) + { + string logMessage = $"RenderGraph: Not all resources of type {GetResourceTypeName()} were released. This can be caused by a resources being allocated but never read by any pass."; + + foreach (var value in m_FrameAllocatedResources) + { + logMessage = $"{logMessage}\n\t{GetResourceName(value.Item2)}"; + ReleaseResource(value.Item1, value.Item2, frameIndex); + } + + Debug.LogWarning(logMessage); + } + + // If an error occurred during execution, it's expected that textures are not all released so we clear the tracking list. + m_FrameAllocatedResources.Clear(); +#endif + } + + + public void LogResources(RenderGraphLogger logger) + { + List allocationList = new List(); + foreach (var kvp in m_ResourcePool) + { + foreach (var res in kvp.Value) + { + allocationList.Add(GetResourceName(res.resource)); + } + } + + allocationList.Sort(); + int index = 0; + foreach (var element in allocationList) + logger.LogLine("[{0}] {1}", index++, element); + } + } + + class TexturePool : RenderGraphResourcePool + { + protected override void ReleaseInternalResource(RTHandle res) + { + res.Release(); + } + + protected override string GetResourceName(RTHandle res) + { + return res.rt.name; + } + + override protected string GetResourceTypeName() + { + return "Texture"; + } + } + + class ComputeBufferPool : RenderGraphResourcePool + { + protected override void ReleaseInternalResource(ComputeBuffer res) + { + res.Release(); + } + + protected override string GetResourceName(ComputeBuffer res) + { + return "NameNotAvailable"; // res.name is a setter only :( + } + + override protected string GetResourceTypeName() + { + return "ComputeBuffer"; + } + + } +} diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs.meta b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs.meta new file mode 100644 index 00000000000..29e7cc7ce46 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4998ae5b70f43844eb7716decb537ba5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 18d5587bc3b..4265313c0dd 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -5,447 +5,6 @@ namespace UnityEngine.Experimental.Rendering.RenderGraphModule { - // RendererList is a different case so not represented here. - internal enum RenderGraphResourceType - { - Texture = 0, - ComputeBuffer, - Count - } - - #region Resource Descriptors - // BEHOLD C# COPY PASTA - // Struct can't be inherited and can't have default member values - // Hence the copy paste and the ugly IsValid implementation. - - /// - /// Texture resource handle. - /// - [DebuggerDisplay("Texture ({handle})")] - public struct TextureHandle - { - bool m_IsValid; - internal int handle { get; private set; } - internal TextureHandle(int handle) { this.handle = handle; m_IsValid = true; } - /// - /// Conversion to int. - /// - /// Texture handle to convert. - /// The integer representation of the handle. - public static implicit operator int(TextureHandle handle) { return handle.handle; } - /// - /// Return true if the handle is valid. - /// - /// True if the handle is valid. - public bool IsValid() => m_IsValid; - - /// - /// GetHashCode override. - /// - /// - public override int GetHashCode() - { - return (handle << 2) ^ (m_IsValid ? 333 : 444); - } - } - - /// - /// Renderer List resource handle. - /// - [DebuggerDisplay("RendererList ({handle})")] - public struct RendererListHandle - { - bool m_IsValid; - internal int handle { get; private set; } - internal RendererListHandle(int handle) { this.handle = handle; m_IsValid = true; } - /// - /// Conversion to int. - /// - /// Renderer List handle to convert. - /// The integer representation of the handle. - public static implicit operator int(RendererListHandle handle) { return handle.handle; } - /// - /// Return true if the handle is valid. - /// - /// True if the handle is valid. - public bool IsValid() => m_IsValid; - } - - /// - /// Compute Buffer resource handle. - /// - [DebuggerDisplay("ComputeBuffer ({handle})")] - public struct ComputeBufferHandle - { - bool m_IsValid; - internal int handle { get; private set; } - internal ComputeBufferHandle(int handle) { this.handle = handle; m_IsValid = true; } - /// - /// Conversion to int. - /// - /// Compute Buffer handle to convert. - /// The integer representation of the handle. - public static implicit operator int(ComputeBufferHandle handle) { return handle.handle; } - /// - /// Return true if the handle is valid. - /// - /// True if the handle is valid. - public bool IsValid() => m_IsValid; - } - - /// - /// The mode that determines the size of a Texture. - /// - public enum TextureSizeMode - { - ///Explicit size. - Explicit, - ///Size automatically scaled by a Vector. - Scale, - ///Size automatically scaled by a Functor. - Functor - } - - /// - /// Subset of the texture desc containing information for fast memory allocation (when platform supports it) - /// - public struct FastMemoryDesc - { - ///Whether the texture will be in fast memory. - public bool inFastMemory; - ///Flag to determine what parts of the render target is spilled if not fully resident in fast memory. - public FastMemoryFlags flags; - ///How much of the render target is to be switched into fast memory (between 0 and 1). - public float residencyFraction; - } - - /// - /// Descriptor used to create texture resources - /// - public struct TextureDesc - { - ///Texture sizing mode. - public TextureSizeMode sizeMode; - ///Texture width. - public int width; - ///Texture height. - public int height; - ///Number of texture slices.. - public int slices; - ///Texture scale. - public Vector2 scale; - ///Texture scale function. - public ScaleFunc func; - ///Depth buffer bit depth. - public DepthBits depthBufferBits; - ///Color format. - public GraphicsFormat colorFormat; - ///Filtering mode. - public FilterMode filterMode; - ///Addressing mode. - public TextureWrapMode wrapMode; - ///Texture dimension. - public TextureDimension dimension; - ///Enable random UAV read/write on the texture. - public bool enableRandomWrite; - ///Texture needs mip maps. - public bool useMipMap; - ///Automatically generate mip maps. - public bool autoGenerateMips; - ///Texture is a shadow map. - public bool isShadowMap; - ///Anisotropic filtering level. - public int anisoLevel; - ///Mip map bias. - public float mipMapBias; - ///Textre is multisampled. Only supported for Scale and Functor size mode. - public bool enableMSAA; - ///Number of MSAA samples. Only supported for Explicit size mode. - public MSAASamples msaaSamples; - ///Bind texture multi sampled. - public bool bindTextureMS; - ///Texture uses dynamic scaling. - public bool useDynamicScale; - ///Memory less flag. - public RenderTextureMemoryless memoryless; - ///Texture name. - public string name; - ///Descriptor to determine how the texture will be in fast memory on platform that supports it. - public FastMemoryDesc fastMemoryDesc; - - // Initial state. Those should not be used in the hash - ///Texture needs to be cleared on first use. - public bool clearBuffer; - ///Clear color. - public Color clearColor; - - void InitDefaultValues(bool dynamicResolution, bool xrReady) - { - useDynamicScale = dynamicResolution; - // XR Ready - if (xrReady) - { - slices = TextureXR.slices; - dimension = TextureXR.dimension; - } - else - { - slices = 1; - dimension = TextureDimension.Tex2D; - } - } - - /// - /// TextureDesc constructor for a texture using explicit size - /// - /// Texture width - /// Texture height - /// Use dynamic resolution - /// Set this to true if the Texture is a render texture in an XR setting. - public TextureDesc(int width, int height, bool dynamicResolution = false, bool xrReady = false) - : this() - { - // Size related init - sizeMode = TextureSizeMode.Explicit; - this.width = width; - this.height = height; - // Important default values not handled by zero construction in this() - msaaSamples = MSAASamples.None; - InitDefaultValues(dynamicResolution, xrReady); - } - - /// - /// TextureDesc constructor for a texture using a fixed scaling - /// - /// RTHandle scale used for this texture - /// Use dynamic resolution - /// Set this to true if the Texture is a render texture in an XR setting. - public TextureDesc(Vector2 scale, bool dynamicResolution = false, bool xrReady = false) - : this() - { - // Size related init - sizeMode = TextureSizeMode.Scale; - this.scale = scale; - // Important default values not handled by zero construction in this() - msaaSamples = MSAASamples.None; - dimension = TextureDimension.Tex2D; - InitDefaultValues(dynamicResolution, xrReady); - } - - /// - /// TextureDesc constructor for a texture using a functor for scaling - /// - /// Function used to determnine the texture size - /// Use dynamic resolution - /// Set this to true if the Texture is a render texture in an XR setting. - public TextureDesc(ScaleFunc func, bool dynamicResolution = false, bool xrReady = false) - : this() - { - // Size related init - sizeMode = TextureSizeMode.Functor; - this.func = func; - // Important default values not handled by zero construction in this() - msaaSamples = MSAASamples.None; - dimension = TextureDimension.Tex2D; - InitDefaultValues(dynamicResolution, xrReady); - } - - /// - /// Copy constructor - /// - /// - public TextureDesc(TextureDesc input) - { - this = input; - } - - /// - /// Hash function - /// - /// The texture descriptor hash. - public override int GetHashCode() - { - int hashCode = 17; - - unchecked - { - switch (sizeMode) - { - case TextureSizeMode.Explicit: - hashCode = hashCode * 23 + width; - hashCode = hashCode * 23 + height; - hashCode = hashCode * 23 + (int)msaaSamples; - break; - case TextureSizeMode.Functor: - if (func != null) - hashCode = hashCode * 23 + func.GetHashCode(); - hashCode = hashCode * 23 + (enableMSAA ? 1 : 0); - break; - case TextureSizeMode.Scale: - hashCode = hashCode * 23 + scale.x.GetHashCode(); - hashCode = hashCode * 23 + scale.y.GetHashCode(); - hashCode = hashCode * 23 + (enableMSAA ? 1 : 0); - break; - } - - hashCode = hashCode * 23 + mipMapBias.GetHashCode(); - hashCode = hashCode * 23 + slices; - hashCode = hashCode * 23 + (int)depthBufferBits; - hashCode = hashCode * 23 + (int)colorFormat; - hashCode = hashCode * 23 + (int)filterMode; - hashCode = hashCode * 23 + (int)wrapMode; - hashCode = hashCode * 23 + (int)dimension; - hashCode = hashCode * 23 + (int)memoryless; - hashCode = hashCode * 23 + anisoLevel; - hashCode = hashCode * 23 + (enableRandomWrite ? 1 : 0); - hashCode = hashCode * 23 + (useMipMap ? 1 : 0); - hashCode = hashCode * 23 + (autoGenerateMips ? 1 : 0); - hashCode = hashCode * 23 + (isShadowMap ? 1 : 0); - hashCode = hashCode * 23 + (bindTextureMS ? 1 : 0); - hashCode = hashCode * 23 + (useDynamicScale ? 1 : 0); - } - - return hashCode; - } - } - - /// - /// Descriptor used to create compute buffer resources - /// - public struct ComputeBufferDesc - { - ///Number of elements in the buffer.. - public int count; - ///Size of one element in the buffer. Has to match size of buffer type in the shader. - public int stride; - ///Type of the buffer, default is ComputeBufferType.Default (structured buffer). - public ComputeBufferType type; - /// Compute Buffer name. - public string name; - - /// - /// ComputeBufferDesc constructor. - /// - /// Number of elements in the buffer. - /// Size of one element in the buffer. - public ComputeBufferDesc(int count, int stride) - : this() - { - this.count = count; - this.stride = stride; - type = ComputeBufferType.Default; - } - - /// - /// ComputeBufferDesc constructor. - /// - /// Number of elements in the buffer. - /// Size of one element in the buffer. - /// Type of the buffer. - public ComputeBufferDesc(int count, int stride, ComputeBufferType type) - : this() - { - this.count = count; - this.stride = stride; - this.type = type; - } - - /// - /// Hash function - /// - /// The texture descriptor hash. - public override int GetHashCode() - { - int hashCode = 17; - - hashCode = hashCode * 23 + count; - hashCode = hashCode * 23 + stride; - hashCode = hashCode * 23 + (int)type; - - return hashCode; - } - } - #endregion - - class RenderGraphTexturePool - { - // Dictionary tracks resources by hash and stores resources with same hash in a List (list instead of a stack because we need to be able to remove stale allocations). - Dictionary> m_ResourcePool = new Dictionary>(); - static int s_CurrentFrameIndex; - - public void ReleaseResource(int hash, RTHandle rt, int currentFrameIndex) - { - if (!m_ResourcePool.TryGetValue(hash, out var list)) - { - list = new List<(RTHandle rt, int frameIndex)>(); - m_ResourcePool.Add(hash, list); - } - - list.Add((rt, currentFrameIndex)); - } - - public bool TryGetResource(int hashCode, out RTHandle rt) - { - if (m_ResourcePool.TryGetValue(hashCode, out var list) && list.Count > 0) - { - rt = list[list.Count - 1].resource; - list.RemoveAt(list.Count - 1); // O(1) since it's the last element. - return true; - } - - rt = null; - return false; - } - - public void PurgeUnusedResources(int currentFrameIndex) - { - // Update the frame index for the lambda. Static because we don't want to capture. - s_CurrentFrameIndex = currentFrameIndex; - - foreach(var kvp in m_ResourcePool) - { - var list = kvp.Value; - list.RemoveAll(obj => - { - if (obj.frameIndex < s_CurrentFrameIndex) - { - obj.resource.Release(); - return true; - } - return false; - }); - } - } - - public void Cleanup() - { - foreach (var kvp in m_ResourcePool) - { - foreach (var res in kvp.Value) - { - res.resource.Release(); - } - } - } - - public void LogResources(RenderGraphLogger logger) - { - List allocationList = new List(); - foreach (var kvp in m_ResourcePool) - { - foreach (var res in kvp.Value) - { - allocationList.Add(res.resource.rt.name); - } - } - - allocationList.Sort(); - int index = 0; - foreach (var element in allocationList) - logger.LogLine("[{0}] {1}", index++, element); - } - } - /// /// The RenderGraphResourceRegistry holds all resource allocated during Render Graph execution. /// @@ -477,6 +36,7 @@ public virtual string GetName() } #region Resources + [DebuggerDisplay("Resource ({ResType}:{GetName()})")] class RenderGraphResource : IRenderGraphResource where DescType : struct @@ -490,23 +50,6 @@ protected RenderGraphResource() } - //internal RenderGraphResource(ResType resource, int shaderProperty) - //{ - // Reset(); - - // this.resource = resource; - // imported = true; - // this.shaderProperty = shaderProperty; - //} - - //internal RenderGraphResource(in DescType desc, int shaderProperty) - //{ - // Reset(); - - // this.desc = desc; - // this.shaderProperty = shaderProperty; - //} - public override void Reset() { base.Reset(); @@ -514,6 +57,7 @@ public override void Reset() } } + [DebuggerDisplay("TextureResource ({desc.name})")] class TextureResource : RenderGraphResource { public override string GetName() @@ -522,6 +66,7 @@ public override string GetName() } } + [DebuggerDisplay("ComputeBufferResource ({desc.name})")] class ComputeBufferResource : RenderGraphResource { public override string GetName() @@ -530,43 +75,6 @@ public override string GetName() } } - //internal struct TextureResource - //{ - // public TextureDesc desc; - // public bool imported; - // public RTHandle rt; - // public int cachedHash; - // public int shaderProperty; - // public bool wasReleased; - - // internal TextureResource(RTHandle rt, int shaderProperty) - // : this() - // { - // Reset(); - - // this.rt = rt; - // imported = true; - // this.shaderProperty = shaderProperty; - // } - - // internal TextureResource(in TextureDesc desc, int shaderProperty) - // : this() - // { - // Reset(); - - // this.desc = desc; - // this.shaderProperty = shaderProperty; - // } - - // void Reset() - // { - // imported = false; - // rt = null; - // cachedHash = -1; - // wasReleased = false; - // } - //} - internal struct RendererListResource { public RendererListDesc desc; @@ -579,40 +87,12 @@ internal RendererListResource(in RendererListDesc desc) } } - //internal struct ComputeBufferResource - //{ - // public ComputeBufferDesc desc; - // public ComputeBuffer computeBuffer; - // public bool imported; - // public bool wasReleased; - - // internal ComputeBufferResource(ComputeBuffer computeBuffer) - // : this() - // { - // this.computeBuffer = computeBuffer; - // this.imported = true; - // wasReleased = false; - // } - - // internal ComputeBufferResource(in ComputeBufferDesc desc) - // : this() - // { - // this.desc = desc; - // computeBuffer = null; - // wasReleased = false; - // } - //} #endregion - //DynamicArray m_TextureResources = new DynamicArray(); - //DynamicArray m_ComputeBufferResources = new DynamicArray(); - - //DynamicArray> m_TextureResources = new DynamicArray>(); - //DynamicArray> m_ComputeBufferResources = new DynamicArray>(); - DynamicArray[] m_Resources = new DynamicArray[(int)RenderGraphResourceType.Count]; - RenderGraphTexturePool m_TexturePool = new RenderGraphTexturePool(); + TexturePool m_TexturePool = new TexturePool(); + ComputeBufferPool m_ComputeBufferPool = new ComputeBufferPool(); DynamicArray m_RendererListResources = new DynamicArray(); RTHandleSystem m_RTHandleSystem = new RTHandleSystem(); RenderGraphDebugParams m_RenderGraphDebug; @@ -621,11 +101,6 @@ internal RendererListResource(in RendererListDesc desc) RTHandle m_CurrentBackbuffer; - // Diagnostic only - // This list allows us to determine if all textures were correctly released in the frame. - List<(int, RTHandle)> m_FrameAllocatedTextures = new List<(int, RTHandle)>(); - - #region Public Interface /// /// Returns the RTHandle associated with the provided resource handle. @@ -736,6 +211,9 @@ internal int GetResourceTransientIndex(RenderGraphResourceType type, int index) // Texture Creation/Import APIs are internal because creation should only go through RenderGraph internal TextureHandle ImportTexture(RTHandle rt, int shaderProperty = 0) { + if (rt == null) + throw new InvalidOperationException("Importing a null RTHandle is not allowed."); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.Texture], out TextureResource texResource); texResource.resource = rt; texResource.imported = true; @@ -807,6 +285,9 @@ internal RendererListHandle CreateRendererList(in RendererListDesc desc) internal ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) { + if (computeBuffer == null) + throw new InvalidOperationException("Importing a null ComputeBuffer is not allowed."); + int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.ComputeBuffer], out ComputeBufferResource bufferResource); bufferResource.resource = computeBuffer; bufferResource.imported = true; @@ -835,7 +316,7 @@ internal int GetComputeBufferResourceCount() return m_Resources[(int)RenderGraphResourceType.ComputeBuffer].size; } - ComputeBufferResource GetComputeBufferResource(ComputeBufferHandle index) + ComputeBufferResource GetComputeBufferResource(int index) { return m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource; } @@ -845,7 +326,43 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) var resource = GetTextureResource(index); if (!resource.imported) { - CreateTextureForPass(resource); + var desc = resource.desc; + int hashCode = desc.GetHashCode(); + + if (resource.resource != null) + throw new InvalidOperationException(string.Format("Trying to create an already created texture ({0}). Texture was probably declared for writing more than once in the same pass.", resource.desc.name)); + + resource.resource = null; + if (!m_TexturePool.TryGetResource(hashCode, out resource.resource)) + { + string name = desc.name; + if (m_RenderGraphDebug.tagResourceNamesWithRG) + name = $"RenderGraph_{name}"; + + // Note: Name used here will be the one visible in the memory profiler so it means that whatever is the first pass that actually allocate the texture will set the name. + // TODO: Find a way to display name by pass. + switch (desc.sizeMode) + { + case TextureSizeMode.Explicit: + resource.resource = m_RTHandleSystem.Alloc(desc.width, desc.height, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, + desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.msaaSamples, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); + break; + case TextureSizeMode.Scale: + resource.resource = m_RTHandleSystem.Alloc(desc.scale, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, + desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.enableMSAA, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); + break; + case TextureSizeMode.Functor: + resource.resource = m_RTHandleSystem.Alloc(desc.func, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, + desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.enableMSAA, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); + break; + } + } + + //// Try to update name when re-using a texture. + //// TODO RENDERGRAPH: Check if that actually works. + //resource.rt.name = desc.name; + + resource.cachedHash = hashCode; var fastMemDesc = resource.desc.fastMemoryDesc; if(fastMemDesc.inFastMemory) @@ -865,56 +382,33 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) } } + m_TexturePool.RegisterFrameAllocation(hashCode, resource.resource); LogTextureCreation(resource.resource, resource.desc.clearBuffer || m_RenderGraphDebug.clearRenderTargetsAtCreation); } } - void CreateTextureForPass(TextureResource resource) + internal void CreateComputeBuffer(RenderGraphContext rgContext, int index) { - var desc = resource.desc; - int hashCode = desc.GetHashCode(); - - if(resource.resource != null) - throw new InvalidOperationException(string.Format("Trying to create an already created texture ({0}). Texture was probably declared for writing more than once in the same pass.", resource.desc.name)); - - resource.resource = null; - if (!TryGetRenderTarget(hashCode, out resource.resource)) + var resource = GetComputeBufferResource(index); + if (!resource.imported) { - string name = desc.name; - if (m_RenderGraphDebug.tagResourceNamesWithRG) - name = $"RenderGraph_{name}"; + var desc = resource.desc; + int hashCode = desc.GetHashCode(); - // Note: Name used here will be the one visible in the memory profiler so it means that whatever is the first pass that actually allocate the texture will set the name. - // TODO: Find a way to display name by pass. - switch (desc.sizeMode) + if (resource.resource != null) + throw new InvalidOperationException(string.Format("Trying to create an already created Compute Buffer ({0}). Buffer was probably declared for writing more than once in the same pass.", resource.desc.name)); + + resource.resource = null; + if (!m_ComputeBufferPool.TryGetResource(hashCode, out resource.resource)) { - case TextureSizeMode.Explicit: - resource.resource = m_RTHandleSystem.Alloc(desc.width, desc.height, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, - desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.msaaSamples, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); - break; - case TextureSizeMode.Scale: - resource.resource = m_RTHandleSystem.Alloc(desc.scale, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, - desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.enableMSAA, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); - break; - case TextureSizeMode.Functor: - resource.resource = m_RTHandleSystem.Alloc(desc.func, desc.slices, desc.depthBufferBits, desc.colorFormat, desc.filterMode, desc.wrapMode, desc.dimension, desc.enableRandomWrite, - desc.useMipMap, desc.autoGenerateMips, desc.isShadowMap, desc.anisoLevel, desc.mipMapBias, desc.enableMSAA, desc.bindTextureMS, desc.useDynamicScale, desc.memoryless, desc.name); - break; + resource.resource = new ComputeBuffer(resource.desc.count, resource.desc.stride, resource.desc.type); + resource.resource.name = m_RenderGraphDebug.tagResourceNamesWithRG ? $"RenderGraph_{resource.desc.name}" : resource.desc.name; } - } - - //// Try to update name when re-using a texture. - //// TODO RENDERGRAPH: Check if that actually works. - //resource.rt.name = desc.name; + resource.cachedHash = hashCode; -#if DEVELOPMENT_BUILD || UNITY_EDITOR - if (hashCode != -1) - { - m_FrameAllocatedTextures.Add((hashCode, resource.resource)); + m_ComputeBufferPool.RegisterFrameAllocation(hashCode, resource.resource); + LogComputeBufferCreation(resource.resource); } -#endif - - resource.cachedHash = hashCode; } void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bindDummyTexture) @@ -963,20 +457,29 @@ internal void ReleaseTexture(RenderGraphContext rgContext, int handle) } LogTextureRelease(resource.resource); - ReleaseTextureResource(resource.cachedHash, resource.resource); + m_TexturePool.ReleaseResource(resource.cachedHash, resource.resource, m_CurrentFrameIndex); + m_TexturePool.UnregisterFrameAllocation(resource.cachedHash, resource.resource); resource.cachedHash = -1; resource.resource = null; resource.wasReleased = true; } } - void ReleaseTextureResource(int hash, RTHandle rt) + internal void ReleaseComputeBuffer(RenderGraphContext rgContext, int handle) { - m_TexturePool.ReleaseResource(hash, rt, m_CurrentFrameIndex); + var resource = GetComputeBufferResource(handle); + if (resource.resource == null) + throw new InvalidOperationException($"Tried to release a compute buffer ({resource.desc.name}) that was never created. Check that there is at least one pass writing to it first."); -#if DEVELOPMENT_BUILD || UNITY_EDITOR - m_FrameAllocatedTextures.Remove((hash, rt)); -#endif + if (!resource.imported) + { + LogComputeBufferRelease(resource.resource); + m_ComputeBufferPool.ReleaseResource(resource.cachedHash, resource.resource, m_CurrentFrameIndex); + m_ComputeBufferPool.UnregisterFrameAllocation(resource.cachedHash, resource.resource); + resource.cachedHash = -1; + resource.resource = null; + resource.wasReleased = true; + } } void ValidateTextureDesc(in TextureDesc desc) @@ -1046,11 +549,6 @@ void ValidateComputeBufferDesc(in ComputeBufferDesc desc) #endif } - bool TryGetRenderTarget(int hashCode, out RTHandle rt) - { - return m_TexturePool.TryGetResource(hashCode, out rt); - } - internal void CreateRendererLists(List rendererLists) { // For now we just create a simple structure @@ -1072,30 +570,14 @@ internal void Clear(bool onException) m_Resources[i].Clear(); m_RendererListResources.Clear(); -#if DEVELOPMENT_BUILD || UNITY_EDITOR - if (m_FrameAllocatedTextures.Count != 0 && !onException) - { - string logMessage = "RenderGraph: Not all textures were released. This can be caused by a textures being allocated but never read by any pass."; - - List<(int, RTHandle)> tempList = new List<(int, RTHandle)>(m_FrameAllocatedTextures); - foreach (var value in tempList) - { - logMessage = $"{logMessage}\n\t{value.Item2.name}"; - ReleaseTextureResource(value.Item1, value.Item2); - } - - Debug.LogWarning(logMessage); - } - - // If an error occurred during execution, it's expected that textures are not all released so we clear the tracking list. - if (onException) - m_FrameAllocatedTextures.Clear(); -#endif + m_TexturePool.CheckFrameAllocation(onException, m_CurrentFrameIndex); + m_ComputeBufferPool.CheckFrameAllocation(onException, m_CurrentFrameIndex); // TODO RENDERGRAPH: Might not be ideal to purge stale resources every frame. // In case users enable/disable features along a level it might provoke performance spikes when things are reallocated... // Will be much better when we have actual resource aliasing and we can manage memory more efficiently. m_TexturePool.PurgeUnusedResources(m_CurrentFrameIndex); + m_ComputeBufferPool.PurgeUnusedResources(m_CurrentFrameIndex); } internal void ResetRTHandleReferenceSize(int width, int height) @@ -1106,13 +588,14 @@ internal void ResetRTHandleReferenceSize(int width, int height) internal void Cleanup() { m_TexturePool.Cleanup(); + m_ComputeBufferPool.Cleanup(); } void LogTextureCreation(RTHandle rt, bool cleared) { if (m_RenderGraphDebug.logFrameInformation) { - m_Logger.LogLine("Created Texture: {0} (Cleared: {1})", rt.rt.name, cleared); + m_Logger.LogLine($"Created Texture: {rt.rt.name} (Cleared: {cleared})"); } } @@ -1120,7 +603,23 @@ void LogTextureRelease(RTHandle rt) { if (m_RenderGraphDebug.logFrameInformation) { - m_Logger.LogLine("Released Texture: {0}", rt.rt.name); + m_Logger.LogLine($"Released Texture: {rt.rt.name}"); + } + } + + void LogComputeBufferCreation(ComputeBuffer buffer) + { + if (m_RenderGraphDebug.logFrameInformation) + { + m_Logger.LogLine($"Created ComputeBuffer: {buffer}"); + } + } + + void LogComputeBufferRelease(ComputeBuffer buffer) + { + if (m_RenderGraphDebug.logFrameInformation) + { + m_Logger.LogLine($"Released ComputeBuffer: {buffer}"); } } @@ -1131,6 +630,7 @@ void LogResources() m_Logger.LogLine("==== Allocated Resources ====\n"); m_TexturePool.LogResources(m_Logger); + m_ComputeBufferPool.LogResources(m_Logger); } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs new file mode 100644 index 00000000000..1cf01d47300 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs @@ -0,0 +1,366 @@ +using System.Diagnostics; +using UnityEngine.Rendering; + +namespace UnityEngine.Experimental.Rendering.RenderGraphModule +{ + // RendererList is a different case so not represented here. + internal enum RenderGraphResourceType + { + Texture = 0, + ComputeBuffer, + Count + } + + // BEHOLD C# COPY PASTA + // Struct can't be inherited and can't have default member values + // Hence the copy paste and the ugly IsValid implementation. + + /// + /// Texture resource handle. + /// + [DebuggerDisplay("Texture ({handle})")] + public struct TextureHandle + { + bool m_IsValid; + internal int handle { get; private set; } + internal TextureHandle(int handle) { this.handle = handle; m_IsValid = true; } + /// + /// Conversion to int. + /// + /// Texture handle to convert. + /// The integer representation of the handle. + public static implicit operator int(TextureHandle handle) { return handle.handle; } + /// + /// Return true if the handle is valid. + /// + /// True if the handle is valid. + public bool IsValid() => m_IsValid; + + /// + /// GetHashCode override. + /// + /// + public override int GetHashCode() + { + return (handle << 2) ^ (m_IsValid ? 333 : 444); + } + } + + /// + /// Renderer List resource handle. + /// + [DebuggerDisplay("RendererList ({handle})")] + public struct RendererListHandle + { + bool m_IsValid; + internal int handle { get; private set; } + internal RendererListHandle(int handle) { this.handle = handle; m_IsValid = true; } + /// + /// Conversion to int. + /// + /// Renderer List handle to convert. + /// The integer representation of the handle. + public static implicit operator int(RendererListHandle handle) { return handle.handle; } + /// + /// Return true if the handle is valid. + /// + /// True if the handle is valid. + public bool IsValid() => m_IsValid; + } + + /// + /// Compute Buffer resource handle. + /// + [DebuggerDisplay("ComputeBuffer ({handle})")] + public struct ComputeBufferHandle + { + bool m_IsValid; + internal int handle { get; private set; } + internal ComputeBufferHandle(int handle) { this.handle = handle; m_IsValid = true; } + /// + /// Conversion to int. + /// + /// Compute Buffer handle to convert. + /// The integer representation of the handle. + public static implicit operator int(ComputeBufferHandle handle) { return handle.handle; } + /// + /// Return true if the handle is valid. + /// + /// True if the handle is valid. + public bool IsValid() => m_IsValid; + } + + /// + /// The mode that determines the size of a Texture. + /// + public enum TextureSizeMode + { + ///Explicit size. + Explicit, + ///Size automatically scaled by a Vector. + Scale, + ///Size automatically scaled by a Functor. + Functor + } + + /// + /// Subset of the texture desc containing information for fast memory allocation (when platform supports it) + /// + public struct FastMemoryDesc + { + ///Whether the texture will be in fast memory. + public bool inFastMemory; + ///Flag to determine what parts of the render target is spilled if not fully resident in fast memory. + public FastMemoryFlags flags; + ///How much of the render target is to be switched into fast memory (between 0 and 1). + public float residencyFraction; + } + + /// + /// Descriptor used to create texture resources + /// + public struct TextureDesc + { + ///Texture sizing mode. + public TextureSizeMode sizeMode; + ///Texture width. + public int width; + ///Texture height. + public int height; + ///Number of texture slices.. + public int slices; + ///Texture scale. + public Vector2 scale; + ///Texture scale function. + public ScaleFunc func; + ///Depth buffer bit depth. + public DepthBits depthBufferBits; + ///Color format. + public GraphicsFormat colorFormat; + ///Filtering mode. + public FilterMode filterMode; + ///Addressing mode. + public TextureWrapMode wrapMode; + ///Texture dimension. + public TextureDimension dimension; + ///Enable random UAV read/write on the texture. + public bool enableRandomWrite; + ///Texture needs mip maps. + public bool useMipMap; + ///Automatically generate mip maps. + public bool autoGenerateMips; + ///Texture is a shadow map. + public bool isShadowMap; + ///Anisotropic filtering level. + public int anisoLevel; + ///Mip map bias. + public float mipMapBias; + ///Textre is multisampled. Only supported for Scale and Functor size mode. + public bool enableMSAA; + ///Number of MSAA samples. Only supported for Explicit size mode. + public MSAASamples msaaSamples; + ///Bind texture multi sampled. + public bool bindTextureMS; + ///Texture uses dynamic scaling. + public bool useDynamicScale; + ///Memory less flag. + public RenderTextureMemoryless memoryless; + ///Texture name. + public string name; + ///Descriptor to determine how the texture will be in fast memory on platform that supports it. + public FastMemoryDesc fastMemoryDesc; + + // Initial state. Those should not be used in the hash + ///Texture needs to be cleared on first use. + public bool clearBuffer; + ///Clear color. + public Color clearColor; + + void InitDefaultValues(bool dynamicResolution, bool xrReady) + { + useDynamicScale = dynamicResolution; + // XR Ready + if (xrReady) + { + slices = TextureXR.slices; + dimension = TextureXR.dimension; + } + else + { + slices = 1; + dimension = TextureDimension.Tex2D; + } + } + + /// + /// TextureDesc constructor for a texture using explicit size + /// + /// Texture width + /// Texture height + /// Use dynamic resolution + /// Set this to true if the Texture is a render texture in an XR setting. + public TextureDesc(int width, int height, bool dynamicResolution = false, bool xrReady = false) + : this() + { + // Size related init + sizeMode = TextureSizeMode.Explicit; + this.width = width; + this.height = height; + // Important default values not handled by zero construction in this() + msaaSamples = MSAASamples.None; + InitDefaultValues(dynamicResolution, xrReady); + } + + /// + /// TextureDesc constructor for a texture using a fixed scaling + /// + /// RTHandle scale used for this texture + /// Use dynamic resolution + /// Set this to true if the Texture is a render texture in an XR setting. + public TextureDesc(Vector2 scale, bool dynamicResolution = false, bool xrReady = false) + : this() + { + // Size related init + sizeMode = TextureSizeMode.Scale; + this.scale = scale; + // Important default values not handled by zero construction in this() + msaaSamples = MSAASamples.None; + dimension = TextureDimension.Tex2D; + InitDefaultValues(dynamicResolution, xrReady); + } + + /// + /// TextureDesc constructor for a texture using a functor for scaling + /// + /// Function used to determnine the texture size + /// Use dynamic resolution + /// Set this to true if the Texture is a render texture in an XR setting. + public TextureDesc(ScaleFunc func, bool dynamicResolution = false, bool xrReady = false) + : this() + { + // Size related init + sizeMode = TextureSizeMode.Functor; + this.func = func; + // Important default values not handled by zero construction in this() + msaaSamples = MSAASamples.None; + dimension = TextureDimension.Tex2D; + InitDefaultValues(dynamicResolution, xrReady); + } + + /// + /// Copy constructor + /// + /// + public TextureDesc(TextureDesc input) + { + this = input; + } + + /// + /// Hash function + /// + /// The texture descriptor hash. + public override int GetHashCode() + { + int hashCode = 17; + + unchecked + { + switch (sizeMode) + { + case TextureSizeMode.Explicit: + hashCode = hashCode * 23 + width; + hashCode = hashCode * 23 + height; + hashCode = hashCode * 23 + (int)msaaSamples; + break; + case TextureSizeMode.Functor: + if (func != null) + hashCode = hashCode * 23 + func.GetHashCode(); + hashCode = hashCode * 23 + (enableMSAA ? 1 : 0); + break; + case TextureSizeMode.Scale: + hashCode = hashCode * 23 + scale.x.GetHashCode(); + hashCode = hashCode * 23 + scale.y.GetHashCode(); + hashCode = hashCode * 23 + (enableMSAA ? 1 : 0); + break; + } + + hashCode = hashCode * 23 + mipMapBias.GetHashCode(); + hashCode = hashCode * 23 + slices; + hashCode = hashCode * 23 + (int)depthBufferBits; + hashCode = hashCode * 23 + (int)colorFormat; + hashCode = hashCode * 23 + (int)filterMode; + hashCode = hashCode * 23 + (int)wrapMode; + hashCode = hashCode * 23 + (int)dimension; + hashCode = hashCode * 23 + (int)memoryless; + hashCode = hashCode * 23 + anisoLevel; + hashCode = hashCode * 23 + (enableRandomWrite ? 1 : 0); + hashCode = hashCode * 23 + (useMipMap ? 1 : 0); + hashCode = hashCode * 23 + (autoGenerateMips ? 1 : 0); + hashCode = hashCode * 23 + (isShadowMap ? 1 : 0); + hashCode = hashCode * 23 + (bindTextureMS ? 1 : 0); + hashCode = hashCode * 23 + (useDynamicScale ? 1 : 0); + } + + return hashCode; + } + } + + /// + /// Descriptor used to create compute buffer resources + /// + public struct ComputeBufferDesc + { + ///Number of elements in the buffer.. + public int count; + ///Size of one element in the buffer. Has to match size of buffer type in the shader. + public int stride; + ///Type of the buffer, default is ComputeBufferType.Default (structured buffer). + public ComputeBufferType type; + /// Compute Buffer name. + public string name; + + /// + /// ComputeBufferDesc constructor. + /// + /// Number of elements in the buffer. + /// Size of one element in the buffer. + public ComputeBufferDesc(int count, int stride) + : this() + { + this.count = count; + this.stride = stride; + type = ComputeBufferType.Default; + } + + /// + /// ComputeBufferDesc constructor. + /// + /// Number of elements in the buffer. + /// Size of one element in the buffer. + /// Type of the buffer. + public ComputeBufferDesc(int count, int stride, ComputeBufferType type) + : this() + { + this.count = count; + this.stride = stride; + this.type = type; + } + + /// + /// Hash function + /// + /// The texture descriptor hash. + public override int GetHashCode() + { + int hashCode = 17; + + hashCode = hashCode * 23 + count; + hashCode = hashCode * 23 + stride; + hashCode = hashCode * 23 + (int)type; + + return hashCode; + } + } + +} diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs.meta b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs.meta new file mode 100644 index 00000000000..4ddcdca9fb0 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4b7ac9a635582ab4998d4179483bacc5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 9153004940c..a0130f08556 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -113,7 +113,8 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa passData.output.perVoxelOffset = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.perVoxelOffset)); passData.output.perTileLogBaseTweak = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.perTileLogBaseTweak)); passData.output.tileList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.tileList)); - passData.output.bigTileLightList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.bigTileLightList)); + if (m_TileAndClusterData.bigTileLightList != null) + passData.output.bigTileLightList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.bigTileLightList)); passData.output.perVoxelLightLists = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.perVoxelLightLists)); passData.output.lightList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.lightList)); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index a772485a541..eacf0e3e4d1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -2346,7 +2346,15 @@ AOVRequestData aovRequest if (m_EnableRenderGraph) { - ExecuteWithRenderGraph(renderRequest, aovRequest, aovBuffers, renderContext, cmd); + try + { + ExecuteWithRenderGraph(renderRequest, aovRequest, aovBuffers, renderContext, cmd); + } + catch(Exception e) + { + Debug.LogError("Error while building Render Graph."); + Debug.LogException(e); + } return; } From e6931fcedab881885892f1cef9fac3ebd1d38b30 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 11:17:41 +0200 Subject: [PATCH 41/53] Refactor Light List build to use render graph created compute buffers. --- .../RenderGraph/RenderGraphResourcePool.cs | 3 +- .../Runtime/Lighting/LightLoop/LightLoop.cs | 68 +++++++++-- .../HDRenderPipeline.LightLoop.cs | 113 +++++++++++++----- .../RenderPipeline/HDRenderPipeline.cs | 4 + 4 files changed, 143 insertions(+), 45 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs index 70456ce4855..30d89825f22 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs @@ -126,6 +126,7 @@ public void LogResources(RenderGraphLogger logger) } } + logger.LogLine($"== {GetResourceTypeName()} Resources =="); allocationList.Sort(); int index = 0; foreach (var element in allocationList) @@ -160,7 +161,7 @@ protected override void ReleaseInternalResource(ComputeBuffer res) protected override string GetResourceName(ComputeBuffer res) { - return "NameNotAvailable"; // res.name is a setter only :( + return "ComputeBufferNameNotAvailable"; // res.name is a setter only :( } override protected string GetResourceTypeName() diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs index 950f7f75f05..2b5868b9193 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs @@ -384,6 +384,8 @@ public void Cleanup() } } + // TODO RENDERGRAPH: When we remove the old pass, we need to remove/refactor this class + // With render graph it's only useful for 2 buffers and a boolean value. class TileAndClusterData { // Internal to light list building @@ -417,7 +419,7 @@ public void Initialize(bool allocateTileBuffers, bool clusterNeedsDepth) globalLightListAtomic = new ComputeBuffer(1, sizeof(uint)); } - public void AllocateResolutionDependentBuffers(HDCamera hdCamera, int width, int height, int viewCount, int maxLightOnScreen) + public void AllocateNonRenderGraphResolutionDependentBuffers(HDCamera hdCamera, int width, int height, int viewCount, int maxLightOnScreen) { if (hasTileBuffers) { @@ -464,32 +466,60 @@ public void AllocateResolutionDependentBuffers(HDCamera hdCamera, int width, int // The bounds and light volumes are view-dependent, and AABB is additionally projection dependent. AABBBoundsBuffer = new ComputeBuffer(viewCount * 2 * maxLightOnScreen, 4 * sizeof(float)); + + // Make sure to invalidate the content of the buffers + listsAreClear = false; + } + + + public void AllocateResolutionDependentBuffers(HDCamera hdCamera, int width, int height, int viewCount, int maxLightOnScreen, bool renderGraphEnabled) + { convexBoundsBuffer = new ComputeBuffer(viewCount * maxLightOnScreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(SFiniteLightBound))); lightVolumeDataBuffer = new ComputeBuffer(viewCount * maxLightOnScreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(LightVolumeData))); + if (!renderGraphEnabled) + AllocateNonRenderGraphResolutionDependentBuffers(hdCamera, width, height, viewCount, maxLightOnScreen); + // Make sure to invalidate the content of the buffers listsAreClear = false; } - public void ReleaseResolutionDependentBuffers() + public void ReleaseNonRenderGraphResolutionDependentBuffers() { CoreUtils.SafeRelease(lightList); CoreUtils.SafeRelease(tileList); CoreUtils.SafeRelease(tileFeatureFlags); + lightList = null; + tileList = null; + tileFeatureFlags = null; // enableClustered CoreUtils.SafeRelease(perVoxelLightLists); CoreUtils.SafeRelease(perVoxelOffset); CoreUtils.SafeRelease(perTileLogBaseTweak); + perVoxelLightLists = null; + perVoxelOffset = null; + perTileLogBaseTweak = null; // enableBigTilePrepass CoreUtils.SafeRelease(bigTileLightList); + bigTileLightList = null; // LightList building CoreUtils.SafeRelease(AABBBoundsBuffer); + CoreUtils.SafeRelease(dispatchIndirectBuffer); + AABBBoundsBuffer = null; + dispatchIndirectBuffer = null; + } + + public void ReleaseResolutionDependentBuffers() + { CoreUtils.SafeRelease(convexBoundsBuffer); CoreUtils.SafeRelease(lightVolumeDataBuffer); - CoreUtils.SafeRelease(dispatchIndirectBuffer); + convexBoundsBuffer = null; + lightVolumeDataBuffer = null; + + ReleaseNonRenderGraphResolutionDependentBuffers(); } public void Cleanup() @@ -1029,23 +1059,30 @@ void LightLoopNewFrame(CommandBuffer cmd, HDCamera hdCamera) } } - void LightLoopReleaseResolutionDependentBuffers() + static int NumLightIndicesPerClusteredTile() { - m_TileAndClusterData.ReleaseResolutionDependentBuffers(); + return 32 * (1 << k_Log2NumClusters); // total footprint for all layers of the tile (measured in light index entries) + } + + void LightLoopAllocResolutionDependentBuffers(HDCamera hdCamera, int width, int height) + { + m_TileAndClusterData.AllocateResolutionDependentBuffers(hdCamera, width, height, m_MaxViewCount, m_MaxLightsOnScreen, m_EnableRenderGraph); if (m_ProbeVolumeClusterData != null) - m_ProbeVolumeClusterData.ReleaseResolutionDependentBuffers(); + m_ProbeVolumeClusterData.AllocateResolutionDependentBuffers(hdCamera, width, height, m_MaxViewCount, k_MaxVisibleProbeVolumeCount, m_EnableRenderGraph); } - static int NumLightIndicesPerClusteredTile() + void LightLoopReleaseResolutionDependentBuffers() { - return 32 * (1 << k_Log2NumClusters); // total footprint for all layers of the tile (measured in light index entries) + m_TileAndClusterData.ReleaseResolutionDependentBuffers(); + if (m_ProbeVolumeClusterData != null) + m_ProbeVolumeClusterData.ReleaseResolutionDependentBuffers(); } - void LightLoopAllocResolutionDependentBuffers(HDCamera hdCamera, int width, int height) + void LightLoopCleanupNonRenderGraphResources() { - m_TileAndClusterData.AllocateResolutionDependentBuffers(hdCamera, width, height, m_MaxViewCount, m_MaxLightsOnScreen); + m_TileAndClusterData.ReleaseNonRenderGraphResolutionDependentBuffers(); if (m_ProbeVolumeClusterData != null) - m_ProbeVolumeClusterData.AllocateResolutionDependentBuffers(hdCamera, width, height, m_MaxViewCount, k_MaxVisibleProbeVolumeCount); + m_ProbeVolumeClusterData.ReleaseNonRenderGraphResolutionDependentBuffers(); } internal static Matrix4x4 WorldToCamera(Camera camera) @@ -1871,7 +1908,7 @@ internal bool GetEnvLightData(CommandBuffer cmd, HDCamera hdCamera, in Processed } atlasScaleOffset = scaleOffset; - + m_TextureCaches.env2DAtlasScaleOffset[fetchIndex] = scaleOffset; m_TextureCaches.env2DCaptureVP[fetchIndex] = vp; @@ -2736,7 +2773,7 @@ bool PrepareLightsForGPU(CommandBuffer cmd, HDCamera hdCamera, CullingResults cu } else { - + m_lightList.lightsPerView[viewIndex].lightVolumes.Add(volumeData); m_lightList.lightsPerView[viewIndex].bounds.Add(bound); } @@ -3285,6 +3322,11 @@ unsafe BuildGPULightListParameters PrepareBuildGPULightListParameters( HDCamera parameters.runLightList = parameters.totalLightCount > 0; parameters.clearLightLists = false; + // TODO RENDERGRAPH: This logic is flawed with Render Graph. + // In theory buffers memory might be reused from another usage entirely so keeping track of its "cleared" state does not represent the truth of their content. + // In practice though, when resolution stays the same, buffers will be the same reused from one frame to another + // because for now buffers are pooled based on their parameters. When we do proper aliasing though, we might end up with any random chunk of memory. + // Always build the light list in XR mode to avoid issues with multi-pass if (hdCamera.xr.enabled) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index a0130f08556..9e215f980a9 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -27,33 +27,38 @@ static void ReadLightingBuffers(LightingBuffers buffers, RenderGraphBuilder buil class BuildGPULightListPassData { - public LightLoopGlobalParameters lightLoopGlobalParameters; - public BuildGPULightListParameters buildGPULightListParameters; public TextureHandle depthBuffer; public TextureHandle stencilTexture; public TextureHandle[] gBuffer = new TextureHandle[RenderGraph.kMaxMRTCount]; public int gBufferCount; - // These buffers are not used outside of BuildGPULight list so they don't need to be known by the render graph. - public ComputeBuffer lightVolumeDataBuffer; - public ComputeBuffer convexBoundsBuffer; - public ComputeBuffer AABBBoundsBuffer; - public ComputeBuffer globalLightListAtomic; + // Buffers filled with the CPU outside of render graph. + public ComputeBufferHandle convexBoundsBuffer; + public ComputeBufferHandle AABBBoundsBuffer; + + // Transient buffers that are not used outside of BuildGPULight list so they don't need to go outside the pass. + public ComputeBufferHandle globalLightListAtomic; + public ComputeBufferHandle lightVolumeDataBuffer; public BuildGPULightListOutput output = new BuildGPULightListOutput(); } struct BuildGPULightListOutput { + // Tile + public ComputeBufferHandle lightList; + public ComputeBufferHandle tileList; public ComputeBufferHandle tileFeatureFlags; public ComputeBufferHandle dispatchIndirectBuffer; - public ComputeBufferHandle perVoxelOffset; - public ComputeBufferHandle perTileLogBaseTweak; - public ComputeBufferHandle tileList; + + // Big Tile public ComputeBufferHandle bigTileLightList; + + // Cluster + public ComputeBufferHandle perVoxelOffset; public ComputeBufferHandle perVoxelLightLists; - public ComputeBufferHandle lightList; + public ComputeBufferHandle perTileLogBaseTweak; } static BuildGPULightListResources PrepareBuildGPULightListResources(RenderGraphContext context, BuildGPULightListPassData data) @@ -69,10 +74,10 @@ static BuildGPULightListResources PrepareBuildGPULightListResources(RenderGraphC buildLightListResources.gBuffer[i] = context.resources.GetTexture(data.gBuffer[i]); } - buildLightListResources.lightVolumeDataBuffer = data.lightVolumeDataBuffer; - buildLightListResources.convexBoundsBuffer = data.convexBoundsBuffer; - buildLightListResources.AABBBoundsBuffer = data.AABBBoundsBuffer; - buildLightListResources.globalLightListAtomic = data.globalLightListAtomic; + buildLightListResources.lightVolumeDataBuffer = context.resources.GetComputeBuffer(data.lightVolumeDataBuffer); + buildLightListResources.convexBoundsBuffer = context.resources.GetComputeBuffer(data.convexBoundsBuffer); + buildLightListResources.AABBBoundsBuffer = context.resources.GetComputeBuffer(data.AABBBoundsBuffer); + buildLightListResources.globalLightListAtomic = context.resources.GetComputeBuffer(data.globalLightListAtomic); buildLightListResources.tileFeatureFlags = context.resources.GetComputeBuffer(data.output.tileFeatureFlags); buildLightListResources.dispatchIndirectBuffer = context.resources.GetComputeBuffer(data.output.dispatchIndirectBuffer); @@ -92,7 +97,6 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa { builder.EnableAsyncCompute(hdCamera.frameSettings.BuildLightListRunsAsync()); - passData.lightLoopGlobalParameters = PrepareLightLoopGlobalParameters(hdCamera, m_TileAndClusterData); passData.buildGPULightListParameters = PrepareBuildGPULightListParameters(hdCamera, m_TileAndClusterData, ref m_ShaderVariablesLightListCB, m_TotalLightCount); passData.depthBuffer = builder.ReadTexture(depthStencilBuffer); passData.stencilTexture = builder.ReadTexture(stencilBufferCopy); @@ -103,20 +107,61 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa passData.gBufferCount = gBuffer.gBufferCount; } - passData.lightVolumeDataBuffer = m_TileAndClusterData.lightVolumeDataBuffer; - passData.convexBoundsBuffer = m_TileAndClusterData.convexBoundsBuffer; - passData.AABBBoundsBuffer = m_TileAndClusterData.AABBBoundsBuffer; - passData.globalLightListAtomic = m_TileAndClusterData.globalLightListAtomic; - - passData.output.tileFeatureFlags = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.tileFeatureFlags)); - passData.output.dispatchIndirectBuffer = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.dispatchIndirectBuffer)); - passData.output.perVoxelOffset = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.perVoxelOffset)); - passData.output.perTileLogBaseTweak = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.perTileLogBaseTweak)); - passData.output.tileList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.tileList)); - if (m_TileAndClusterData.bigTileLightList != null) - passData.output.bigTileLightList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.bigTileLightList)); - passData.output.perVoxelLightLists = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.perVoxelLightLists)); - passData.output.lightList = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.lightList)); + // Here we use m_MaxViewCount/m_MaxWidthHeight to avoid always allocating buffers of different sizes for each camera. + // This way we'll be reusing them more often. + + // Those buffer are filled with the CPU outside of the render graph. + passData.convexBoundsBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.convexBoundsBuffer)); + passData.lightVolumeDataBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.lightVolumeDataBuffer)); + + passData.globalLightListAtomic = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(1, sizeof(uint)) { name = "LightListAtomic"}); + passData.AABBBoundsBuffer = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * 2 * m_MaxLightsOnScreen, 4 * sizeof(float)) { name = "AABBBoundBuffer" }); + + var nrTilesX = (m_MaxCameraWidth + LightDefinitions.s_TileSizeFptl - 1) / LightDefinitions.s_TileSizeFptl; + var nrTilesY = (m_MaxCameraHeight + LightDefinitions.s_TileSizeFptl - 1) / LightDefinitions.s_TileSizeFptl; + var nrTiles = nrTilesX * nrTilesY * m_MaxViewCount; + const int capacityUShortsPerTile = 32; + const int dwordsPerTile = (capacityUShortsPerTile + 1) >> 1; // room for 31 lights and a nrLights value. + + // note that nrTiles include the viewCount in allocation below + // Tile buffers + passData.output.lightList = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc((int)LightCategory.Count * dwordsPerTile * nrTiles, sizeof(uint)) { name = "LightList" })); + passData.output.tileList = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(LightDefinitions.s_NumFeatureVariants * nrTiles, sizeof(uint)) { name = "TileList" })); + passData.output.tileFeatureFlags = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(nrTiles, sizeof(uint)) { name = "TileFeatureFlags" })); + // DispatchIndirect: Buffer with arguments has to have three integer numbers at given argsOffset offset: number of work groups in X dimension, number of work groups in Y dimension, number of work groups in Z dimension. + // DrawProceduralIndirect: Buffer with arguments has to have four integer numbers at given argsOffset offset: vertex count per instance, instance count, start vertex location, and start instance location + // Use use max size of 4 unit for allocation + passData.output.dispatchIndirectBuffer = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * LightDefinitions.s_NumFeatureVariants * 4, sizeof(uint), ComputeBufferType.IndirectArguments) { name = "DispatchIndirectBuffer" })); + + // Big Tile buffer + if (passData.buildGPULightListParameters.runBigTilePrepass) + { + var nrBigTilesX = (m_MaxCameraWidth + 63) / 64; + var nrBigTilesY = (m_MaxCameraHeight + 63) / 64; + var nrBigTiles = nrBigTilesX * nrBigTilesY * m_MaxViewCount; + // TODO: (Nick) In the case of Probe Volumes, this buffer could be trimmed down / tuned more specifically to probe volumes if we added a s_MaxNrBigTileProbeVolumesPlusOne value. + passData.output.bigTileLightList = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(LightDefinitions.s_MaxNrBigTileLightsPlusOne * nrBigTiles, sizeof(uint)) { name = "BigTiles" })); + } + + // Cluster buffers + var nrClustersX = (m_MaxCameraWidth + LightDefinitions.s_TileSizeClustered - 1) / LightDefinitions.s_TileSizeClustered; + var nrClustersY = (m_MaxCameraHeight + LightDefinitions.s_TileSizeClustered - 1) / LightDefinitions.s_TileSizeClustered; + var nrClusterTiles = nrClustersX * nrClustersY * m_MaxViewCount; + + passData.output.perVoxelOffset = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc((int)LightCategory.Count * (1 << k_Log2NumClusters) * nrClusterTiles, sizeof(uint)) { name = "PerVoxelOffset" })); + passData.output.perVoxelLightLists = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(NumLightIndicesPerClusteredTile() * nrClusterTiles, sizeof(uint)) { name = "PerVoxelLightList" })); + if (k_UseDepthBuffer) + { + passData.output.perTileLogBaseTweak = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(nrClusterTiles, sizeof(float)) { name = "PerTileLogBaseTweak" })); + } builder.SetRenderFunc( (BuildGPULightListPassData data, RenderGraphContext context) => @@ -133,7 +178,13 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa BuildDispatchIndirectArguments(data.buildGPULightListParameters, buildLightListResources, tileFlagsWritten, context.cmd); - PushLightLoopGlobalParams(data.lightLoopGlobalParameters, context.cmd); + // Setup global buffers + if (data.buildGPULightListParameters.runBigTilePrepass) + context.cmd.SetGlobalBuffer(HDShaderIDs.g_vBigTileLightList, buildLightListResources.bigTileLightList); + context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLayeredOffsetsBuffer, buildLightListResources.perVoxelOffset); + context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLightListGlobal, buildLightListResources.perVoxelLightLists); + if (k_UseDepthBuffer) + context.cmd.SetGlobalBuffer(HDShaderIDs.g_logBaseBuffer, buildLightListResources.perTileLogBaseTweak); }); return passData.output; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index eacf0e3e4d1..fd9a322e72c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -989,6 +989,9 @@ void InitializeNonRenderGraphResources() m_AmbientOcclusionSystem.InitializeNonRenderGraphResources(); m_PostProcessSystem.InitializeNonRenderGraphResources(asset); s_lightVolumes.InitializeNonRenderGraphResources(); + + // Reset resolution dependent buffers. + m_MaxCameraWidth = m_MaxCameraHeight = m_MaxViewCount = 0; } void CleanupNonRenderGraphResources() @@ -998,6 +1001,7 @@ void CleanupNonRenderGraphResources() m_AmbientOcclusionSystem.CleanupNonRenderGraphResources(); m_PostProcessSystem.CleanupNonRenderGraphResources(); s_lightVolumes.CleanupNonRenderGraphResources(); + LightLoopCleanupNonRenderGraphResources(); } void InitializeDebugMaterials() From e4636d867aacdbcd5cf81cbb00a22beb78cf2995 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 11:40:44 +0200 Subject: [PATCH 42/53] Small rewrite to facilitate implementing Probe Volume Light lists. --- .../Runtime/Lighting/LightLoop/LightLoop.cs | 4 +- .../HDRenderPipeline.LightLoop.cs | 50 ++++++++++++------- .../HDRenderPipeline.RenderGraph.cs | 2 +- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs index 2b5868b9193..87f1757a4d3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs @@ -3344,7 +3344,7 @@ unsafe BuildGPULightListParameters PrepareBuildGPULightListParameters( HDCamera } parameters.viewCount = hdCamera.viewCount; - parameters.enableFeatureVariants = GetFeatureVariantsEnabled(hdCamera.frameSettings); + parameters.enableFeatureVariants = GetFeatureVariantsEnabled(hdCamera.frameSettings) && tileAndClusterData.hasTileBuffers; parameters.computeMaterialVariants = hdCamera.frameSettings.IsEnabled(FrameSettingsField.ComputeMaterialVariants); parameters.computeLightVariants = hdCamera.frameSettings.IsEnabled(FrameSettingsField.ComputeLightVariants); parameters.lightList = m_lightList; @@ -3375,7 +3375,7 @@ unsafe BuildGPULightListParameters PrepareBuildGPULightListParameters( HDCamera parameters.numBigTilesY = (h + 63) / 64; // Fptl - parameters.runFPTL = hdCamera.frameSettings.fptl; + parameters.runFPTL = hdCamera.frameSettings.fptl && tileAndClusterData.hasTileBuffers; parameters.buildPerTileLightListShader = buildPerTileLightListShader; parameters.buildPerTileLightListShader.shaderKeywords = null; if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.BigTilePrepass)) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 9e215f980a9..5ba94464199 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -91,13 +91,20 @@ static BuildGPULightListResources PrepareBuildGPULightListResources(RenderGraphC return buildLightListResources; } - BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle depthStencilBuffer, TextureHandle stencilBufferCopy, GBufferOutput gBuffer) + BuildGPULightListOutput BuildGPULightList( RenderGraph renderGraph, + HDCamera hdCamera, + TileAndClusterData tileAndClusterData, + int totalLightCount, + ref ShaderVariablesLightList constantBuffer, + TextureHandle depthStencilBuffer, + TextureHandle stencilBufferCopy, + GBufferOutput gBuffer) { using (var builder = renderGraph.AddRenderPass("Build Light List", out var passData, ProfilingSampler.Get(HDProfileId.BuildLightList))) { builder.EnableAsyncCompute(hdCamera.frameSettings.BuildLightListRunsAsync()); - passData.buildGPULightListParameters = PrepareBuildGPULightListParameters(hdCamera, m_TileAndClusterData, ref m_ShaderVariablesLightListCB, m_TotalLightCount); + passData.buildGPULightListParameters = PrepareBuildGPULightListParameters(hdCamera, tileAndClusterData, ref constantBuffer, totalLightCount); passData.depthBuffer = builder.ReadTexture(depthStencilBuffer); passData.stencilTexture = builder.ReadTexture(stencilBufferCopy); if (passData.buildGPULightListParameters.computeMaterialVariants && passData.buildGPULightListParameters.enableFeatureVariants) @@ -111,11 +118,11 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa // This way we'll be reusing them more often. // Those buffer are filled with the CPU outside of the render graph. - passData.convexBoundsBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.convexBoundsBuffer)); - passData.lightVolumeDataBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(m_TileAndClusterData.lightVolumeDataBuffer)); + passData.convexBoundsBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(tileAndClusterData.convexBoundsBuffer)); + passData.lightVolumeDataBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(tileAndClusterData.lightVolumeDataBuffer)); passData.globalLightListAtomic = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(1, sizeof(uint)) { name = "LightListAtomic"}); - passData.AABBBoundsBuffer = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * 2 * m_MaxLightsOnScreen, 4 * sizeof(float)) { name = "AABBBoundBuffer" }); + passData.AABBBoundsBuffer = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * 2 * totalLightCount, 4 * sizeof(float)) { name = "AABBBoundBuffer" }); var nrTilesX = (m_MaxCameraWidth + LightDefinitions.s_TileSizeFptl - 1) / LightDefinitions.s_TileSizeFptl; var nrTilesY = (m_MaxCameraHeight + LightDefinitions.s_TileSizeFptl - 1) / LightDefinitions.s_TileSizeFptl; @@ -123,19 +130,22 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa const int capacityUShortsPerTile = 32; const int dwordsPerTile = (capacityUShortsPerTile + 1) >> 1; // room for 31 lights and a nrLights value. - // note that nrTiles include the viewCount in allocation below - // Tile buffers - passData.output.lightList = builder.WriteComputeBuffer( - renderGraph.CreateComputeBuffer(new ComputeBufferDesc((int)LightCategory.Count * dwordsPerTile * nrTiles, sizeof(uint)) { name = "LightList" })); - passData.output.tileList = builder.WriteComputeBuffer( - renderGraph.CreateComputeBuffer(new ComputeBufferDesc(LightDefinitions.s_NumFeatureVariants * nrTiles, sizeof(uint)) { name = "TileList" })); - passData.output.tileFeatureFlags = builder.WriteComputeBuffer( - renderGraph.CreateComputeBuffer(new ComputeBufferDesc(nrTiles, sizeof(uint)) { name = "TileFeatureFlags" })); - // DispatchIndirect: Buffer with arguments has to have three integer numbers at given argsOffset offset: number of work groups in X dimension, number of work groups in Y dimension, number of work groups in Z dimension. - // DrawProceduralIndirect: Buffer with arguments has to have four integer numbers at given argsOffset offset: vertex count per instance, instance count, start vertex location, and start instance location - // Use use max size of 4 unit for allocation - passData.output.dispatchIndirectBuffer = builder.WriteComputeBuffer( - renderGraph.CreateComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * LightDefinitions.s_NumFeatureVariants * 4, sizeof(uint), ComputeBufferType.IndirectArguments) { name = "DispatchIndirectBuffer" })); + if (tileAndClusterData.hasTileBuffers) + { + // note that nrTiles include the viewCount in allocation below + // Tile buffers + passData.output.lightList = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc((int)LightCategory.Count * dwordsPerTile * nrTiles, sizeof(uint)) { name = "LightList" })); + passData.output.tileList = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(LightDefinitions.s_NumFeatureVariants * nrTiles, sizeof(uint)) { name = "TileList" })); + passData.output.tileFeatureFlags = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(nrTiles, sizeof(uint)) { name = "TileFeatureFlags" })); + // DispatchIndirect: Buffer with arguments has to have three integer numbers at given argsOffset offset: number of work groups in X dimension, number of work groups in Y dimension, number of work groups in Z dimension. + // DrawProceduralIndirect: Buffer with arguments has to have four integer numbers at given argsOffset offset: vertex count per instance, instance count, start vertex location, and start instance location + // Use use max size of 4 unit for allocation + passData.output.dispatchIndirectBuffer = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * LightDefinitions.s_NumFeatureVariants * 4, sizeof(uint), ComputeBufferType.IndirectArguments) { name = "DispatchIndirectBuffer" })); + } // Big Tile buffer if (passData.buildGPULightListParameters.runBigTilePrepass) @@ -157,7 +167,7 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa renderGraph.CreateComputeBuffer(new ComputeBufferDesc((int)LightCategory.Count * (1 << k_Log2NumClusters) * nrClusterTiles, sizeof(uint)) { name = "PerVoxelOffset" })); passData.output.perVoxelLightLists = builder.WriteComputeBuffer( renderGraph.CreateComputeBuffer(new ComputeBufferDesc(NumLightIndicesPerClusteredTile() * nrClusterTiles, sizeof(uint)) { name = "PerVoxelLightList" })); - if (k_UseDepthBuffer) + if (tileAndClusterData.clusterNeedsDepth) { passData.output.perTileLogBaseTweak = builder.WriteComputeBuffer( renderGraph.CreateComputeBuffer(new ComputeBufferDesc(nrClusterTiles, sizeof(float)) { name = "PerTileLogBaseTweak" })); @@ -178,6 +188,8 @@ BuildGPULightListOutput BuildGPULightList(RenderGraph renderGraph, HDCamera hdCa BuildDispatchIndirectArguments(data.buildGPULightListParameters, buildLightListResources, tileFlagsWritten, context.cmd); + // TODO RENDERGRAPH this won't work with Async compute. + // Need to do away with globals altogether. These are only needed in Deferred and Forward passes. // Setup global buffers if (data.buildGPULightListParameters.runBigTilePrepass) context.cmd.SetGlobalBuffer(HDShaderIDs.g_vBigTileLightList, buildLightListResources.bigTileLightList); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index a9a0144eafb..20d1783d329 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -66,7 +66,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, } else { - var gpuLightListOutput = BuildGPULightList(m_RenderGraph, hdCamera, prepassOutput.depthBuffer, prepassOutput.stencilBuffer, prepassOutput.gbuffer); + var gpuLightListOutput = BuildGPULightList(m_RenderGraph, hdCamera, m_TileAndClusterData, m_MaxLightsOnScreen, ref m_ShaderVariablesLightListCB, prepassOutput.depthBuffer, prepassOutput.stencilBuffer, prepassOutput.gbuffer); lightingBuffers.ambientOcclusionBuffer = m_AmbientOcclusionSystem.Render(m_RenderGraph, hdCamera, prepassOutput.depthPyramidTexture, prepassOutput.motionVectorsBuffer, m_FrameCount); // Should probably be inside the AO render function but since it's a separate class it's currently not super clean to do. From 064a640bbcb5fa1f765dae3ccf2b13e2a7301d3c Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 15:27:38 +0200 Subject: [PATCH 43/53] Refactored handle to include an intermediate ResourceHandle struct (necessary to keep track of validity of the handles internally) --- .../Runtime/RenderGraph/RenderGraph.cs | 56 ++++++------ .../Runtime/RenderGraph/RenderGraphBuilder.cs | 56 ++++++------ .../Runtime/RenderGraph/RenderGraphPass.cs | 30 +++---- .../RenderGraph/RenderGraphResourcePool.cs | 71 ++++++++++----- .../RenderGraphResourceRegistry.cs | 88 +++++++++---------- .../RenderGraph/RenderGraphResources.cs | 87 ++++++++++-------- .../Tests/Editor/RenderGraphTests.cs | 12 +-- .../HDRenderPipeline.RenderGraph.cs | 6 +- 8 files changed, 222 insertions(+), 184 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs index 9294933940b..53c4ca169f3 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs @@ -120,24 +120,24 @@ public void Reset() [DebuggerDisplay("RenderPass: {pass.name} (Index:{pass.index} Async:{enableAsyncCompute})")] internal struct CompiledPassInfo { - public RenderGraphPass pass; - public List[] resourceCreateList; - public List[] resourceReleaseList; - public int refCount; - public bool pruned; - public bool hasSideEffect; - public int syncToPassIndex; // Index of the pass that needs to be waited for. - public int syncFromPassIndex; // Smaller pass index that waits for this pass. - public bool needGraphicsFence; - public GraphicsFence fence; - - public bool enableAsyncCompute { get { return pass.enableAsyncCompute; } } - public bool allowPassPruning { get { return pass.allowPassPruning; } } + public RenderGraphPass pass; + public List[] resourceCreateList; + public List[] resourceReleaseList; + public int refCount; + public bool pruned; + public bool hasSideEffect; + public int syncToPassIndex; // Index of the pass that needs to be waited for. + public int syncFromPassIndex; // Smaller pass index that waits for this pass. + public bool needGraphicsFence; + public GraphicsFence fence; + + public bool enableAsyncCompute { get { return pass.enableAsyncCompute; } } + public bool allowPassPruning { get { return pass.allowPassPruning; } } #if DEVELOPMENT_BUILD || UNITY_EDITOR // This members are only here to ease debugging. - public List[] debugResourceReads; - public List[] debugResourceWrites; + public List[] debugResourceReads; + public List[] debugResourceWrites; #endif public void Reset(RenderGraphPass pass) @@ -312,7 +312,7 @@ public TextureHandle CreateTexture(in TextureDesc desc, int shaderProperty = 0) /// A new TextureHandle. public TextureHandle CreateTexture(TextureHandle texture, int shaderProperty = 0) { - return m_Resources.CreateTexture(m_Resources.GetTextureResourceDesc(texture), shaderProperty); + return m_Resources.CreateTexture(m_Resources.GetTextureResourceDesc(texture.handle), shaderProperty); } /// @@ -322,7 +322,7 @@ public TextureHandle CreateTexture(TextureHandle texture, int shaderProperty = 0 /// The input texture descriptor. public TextureDesc GetTextureDesc(TextureHandle texture) { - return m_Resources.GetTextureResourceDesc(texture); + return m_Resources.GetTextureResourceDesc(texture.handle); } /// @@ -361,9 +361,9 @@ public ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc) /// /// Compute Buffer from which the descriptor should be used. /// A new ComputeBufferHandle. - public ComputeBufferHandle CreateComputeBuffer(ComputeBufferHandle computeBuffer) + public ComputeBufferHandle CreateComputeBuffer(in ComputeBufferHandle computeBuffer) { - return m_Resources.CreateComputeBuffer(m_Resources.GetComputeBufferResourceDesc(computeBuffer)); + return m_Resources.CreateComputeBuffer(m_Resources.GetComputeBufferResourceDesc(computeBuffer.handle)); } /// @@ -371,9 +371,9 @@ public ComputeBufferHandle CreateComputeBuffer(ComputeBufferHandle computeBuffer /// /// Compute Buffer resource from which the descriptor is requested. /// The input compute buffer descriptor. - public ComputeBufferDesc GetComputeBufferDesc(ComputeBufferHandle computeBuffer) + public ComputeBufferDesc GetComputeBufferDesc(in ComputeBufferHandle computeBuffer) { - return m_Resources.GetComputeBufferResourceDesc(computeBuffer); + return m_Resources.GetComputeBufferResourceDesc(computeBuffer.handle); } /// @@ -485,30 +485,30 @@ void CountReferences() for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type) { var resourceRead = passInfo.pass.resourceReadLists[type]; - foreach (int resourceIndex in resourceRead) + foreach (var resource in resourceRead) { - ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resourceIndex]; + ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resource]; info.consumers.Add(passIndex); info.refCount++; #if DEVELOPMENT_BUILD || UNITY_EDITOR - passInfo.debugResourceReads[type].Add(m_Resources.GetResourceName((RenderGraphResourceType)type, resourceIndex)); + passInfo.debugResourceReads[type].Add(m_Resources.GetResourceName(resource)); #endif } var resourceWrite = passInfo.pass.resourceWriteLists[type]; - foreach (int resourceIndex in resourceWrite) + foreach (var resource in resourceWrite) { - ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resourceIndex]; + ref CompiledResourceInfo info = ref m_CompiledResourcesInfos[type][resource]; info.producers.Add(passIndex); passInfo.refCount++; // Writing to an imported texture is considered as a side effect because we don't know what users will do with it outside of render graph. - if (m_Resources.IsResourceImported((RenderGraphResourceType)type, resourceIndex)) + if (m_Resources.IsResourceImported(resource)) passInfo.hasSideEffect = true; #if DEVELOPMENT_BUILD || UNITY_EDITOR - passInfo.debugResourceWrites[type].Add(m_Resources.GetResourceName((RenderGraphResourceType)type, resourceIndex)); + passInfo.debugResourceWrites[type].Add(m_Resources.GetResourceName(resource)); #endif } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs index 62e4a27a099..4b93e5392ac 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilder.cs @@ -20,9 +20,9 @@ public struct RenderGraphBuilder : IDisposable /// The Texture resource to use as a color render target. /// Index for multiple render target usage. /// An updated resource handle to the input resource. - public TextureHandle UseColorBuffer(TextureHandle input, int index) + public TextureHandle UseColorBuffer(in TextureHandle input, int index) { - CheckTransientResource(RenderGraphResourceType.Texture, input); + CheckTransientResource(input.handle); m_RenderPass.SetColorBuffer(input, index); return input; } @@ -33,9 +33,9 @@ public TextureHandle UseColorBuffer(TextureHandle input, int index) /// The Texture resource to use as a depth buffer during the pass. /// Specify the access level for the depth buffer. This allows you to say whether you will read from or write to the depth buffer, or do both. /// An updated resource handle to the input resource. - public TextureHandle UseDepthBuffer(TextureHandle input, DepthAccess flags) + public TextureHandle UseDepthBuffer(in TextureHandle input, DepthAccess flags) { - CheckTransientResource(RenderGraphResourceType.Texture, input); + CheckTransientResource(input.handle); m_RenderPass.SetDepthBuffer(input, flags); return input; } @@ -45,10 +45,10 @@ public TextureHandle UseDepthBuffer(TextureHandle input, DepthAccess flags) /// /// The Texture resource to read from during the pass. /// An updated resource handle to the input resource. - public TextureHandle ReadTexture(TextureHandle input) + public TextureHandle ReadTexture(in TextureHandle input) { - CheckTransientResource(RenderGraphResourceType.Texture, input); - m_RenderPass.AddResourceRead(RenderGraphResourceType.Texture, input); + CheckTransientResource(input.handle); + m_RenderPass.AddResourceRead(input.handle); return input; } @@ -57,11 +57,11 @@ public TextureHandle ReadTexture(TextureHandle input) /// /// The Texture resource to write to during the pass. /// An updated resource handle to the input resource. - public TextureHandle WriteTexture(TextureHandle input) + public TextureHandle WriteTexture(in TextureHandle input) { - CheckTransientResource(RenderGraphResourceType.Texture, input); + CheckTransientResource(input.handle); // TODO RENDERGRAPH: Manage resource "version" for debugging purpose - m_RenderPass.AddResourceWrite(RenderGraphResourceType.Texture, input); + m_RenderPass.AddResourceWrite(input.handle); return input; } @@ -74,7 +74,7 @@ public TextureHandle WriteTexture(TextureHandle input) public TextureHandle CreateTransientTexture(in TextureDesc desc) { var result = m_Resources.CreateTexture(desc, 0, m_RenderPass.index); - m_RenderPass.AddTransientResource(RenderGraphResourceType.Texture, result); + m_RenderPass.AddTransientResource(result.handle); return result; } @@ -84,11 +84,11 @@ public TextureHandle CreateTransientTexture(in TextureDesc desc) /// /// Texture from which the descriptor should be used. /// A new transient TextureHandle. - public TextureHandle CreateTransientTexture(TextureHandle texture) + public TextureHandle CreateTransientTexture(in TextureHandle texture) { - var desc = m_Resources.GetTextureResourceDesc(texture); + var desc = m_Resources.GetTextureResourceDesc(texture.handle); var result = m_Resources.CreateTexture(desc, 0, m_RenderPass.index); - m_RenderPass.AddTransientResource(RenderGraphResourceType.Texture, result); + m_RenderPass.AddTransientResource(result.handle); return result; } @@ -97,7 +97,7 @@ public TextureHandle CreateTransientTexture(TextureHandle texture) /// /// The Renderer List resource to use during the pass. /// An updated resource handle to the input resource. - public RendererListHandle UseRendererList(RendererListHandle input) + public RendererListHandle UseRendererList(in RendererListHandle input) { m_RenderPass.UseRendererList(input); return input; @@ -108,10 +108,10 @@ public RendererListHandle UseRendererList(RendererListHandle input) /// /// The Compute Buffer resource to read from during the pass. /// An updated resource handle to the input resource. - public ComputeBufferHandle ReadComputeBuffer(ComputeBufferHandle input) + public ComputeBufferHandle ReadComputeBuffer(in ComputeBufferHandle input) { - CheckTransientResource(RenderGraphResourceType.ComputeBuffer, input); - m_RenderPass.AddResourceRead(RenderGraphResourceType.ComputeBuffer, input); + CheckTransientResource(input.handle); + m_RenderPass.AddResourceRead(input.handle); return input; } @@ -120,10 +120,10 @@ public ComputeBufferHandle ReadComputeBuffer(ComputeBufferHandle input) /// /// The Compute Buffer resource to write to during the pass. /// An updated resource handle to the input resource. - public ComputeBufferHandle WriteComputeBuffer(ComputeBufferHandle input) + public ComputeBufferHandle WriteComputeBuffer(in ComputeBufferHandle input) { - CheckTransientResource(RenderGraphResourceType.ComputeBuffer, input); - m_RenderPass.AddResourceWrite(RenderGraphResourceType.ComputeBuffer, input); + CheckTransientResource(input.handle); + m_RenderPass.AddResourceWrite(input.handle); return input; } @@ -136,7 +136,7 @@ public ComputeBufferHandle WriteComputeBuffer(ComputeBufferHandle input) public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferDesc desc) { var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index); - m_RenderPass.AddTransientResource(RenderGraphResourceType.ComputeBuffer, result); + m_RenderPass.AddTransientResource(result.handle); return result; } @@ -146,11 +146,11 @@ public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferDesc des /// /// Compute Buffer from which the descriptor should be used. /// A new transient ComputeBufferHandle. - public ComputeBufferHandle CreateTransientComputeBuffer(ComputeBufferHandle computebuffer) + public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferHandle computebuffer) { - var desc = m_Resources.GetComputeBufferResourceDesc(computebuffer); + var desc = m_Resources.GetComputeBufferResourceDesc(computebuffer.handle); var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index); - m_RenderPass.AddTransientResource(RenderGraphResourceType.ComputeBuffer, result); + m_RenderPass.AddTransientResource(result.handle); return result; } @@ -211,12 +211,12 @@ void Dispose(bool disposing) m_Disposed = true; } - void CheckTransientResource(RenderGraphResourceType type, int input) + void CheckTransientResource(in ResourceHandle res) { #if DEVELOPMENT_BUILD || UNITY_EDITOR - if (input != -1) + if (res.IsValid()) { - int transientIndex = m_Resources.GetResourceTransientIndex(type, input); + int transientIndex = m_Resources.GetResourceTransientIndex(res); if (transientIndex != -1 && transientIndex != m_RenderPass.index) { throw new ArgumentException($"Trying to use a transient texture (pass index {transientIndex}) in a different pass (pass index {m_RenderPass.index}."); diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs index 2b84a942ce9..3bc1715b7ca 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphPass.cs @@ -26,9 +26,9 @@ public RenderFunc GetExecuteDelegate() public int colorBufferMaxIndex { get; protected set; } = -1; public int refCount { get; protected set; } - public List[] resourceReadLists = new List[(int)RenderGraphResourceType.Count]; - public List[] resourceWriteLists = new List[(int)RenderGraphResourceType.Count]; - public List[] transientResourceList = new List[(int)RenderGraphResourceType.Count]; + public List[] resourceReadLists = new List[(int)RenderGraphResourceType.Count]; + public List[] resourceWriteLists = new List[(int)RenderGraphResourceType.Count]; + public List[] transientResourceList = new List[(int)RenderGraphResourceType.Count]; public List usedRendererListList = new List(); @@ -36,9 +36,9 @@ public RenderGraphPass() { for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i) { - resourceReadLists[i] = new List(); - resourceWriteLists[i] = new List(); - transientResourceList[i] = new List(); + resourceReadLists[i] = new List(); + resourceWriteLists[i] = new List(); + transientResourceList[i] = new List(); } } @@ -68,19 +68,19 @@ public void Clear() } } - public void AddResourceWrite(RenderGraphResourceType type, int index) + public void AddResourceWrite(in ResourceHandle res) { - resourceWriteLists[(int)type].Add(index); + resourceWriteLists[res.iType].Add(res); } - public void AddResourceRead(RenderGraphResourceType type, int index) + public void AddResourceRead(in ResourceHandle res) { - resourceReadLists[(int)type].Add(index); + resourceReadLists[res.iType].Add(res); } - public void AddTransientResource(RenderGraphResourceType type, int index) + public void AddTransientResource(in ResourceHandle res) { - transientResourceList[(int)type].Add(index); + transientResourceList[res.iType].Add(res); } public void UseRendererList(RendererListHandle rendererList) @@ -103,16 +103,16 @@ public void SetColorBuffer(TextureHandle resource, int index) Debug.Assert(index < RenderGraph.kMaxMRTCount && index >= 0); colorBufferMaxIndex = Math.Max(colorBufferMaxIndex, index); colorBuffers[index] = resource; - AddResourceWrite(RenderGraphResourceType.Texture, resource); + AddResourceWrite(resource.handle); } public void SetDepthBuffer(TextureHandle resource, DepthAccess flags) { depthBuffer = resource; if ((flags & DepthAccess.Read) != 0) - AddResourceRead(RenderGraphResourceType.Texture, resource); + AddResourceRead(resource.handle); if ((flags & DepthAccess.Write) != 0) - AddResourceWrite(RenderGraphResourceType.Texture, resource); + AddResourceWrite(resource.handle); } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs index 30d89825f22..29f1a46c9e7 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs @@ -7,7 +7,7 @@ namespace UnityEngine.Experimental.Rendering.RenderGraphModule abstract class RenderGraphResourcePool where Type : class { // Dictionary tracks resources by hash and stores resources with same hash in a List (list instead of a stack because we need to be able to remove stale allocations). - Dictionary> m_ResourcePool = new Dictionary>(); + protected Dictionary> m_ResourcePool = new Dictionary>(); #if DEVELOPMENT_BUILD || UNITY_EDITOR // Diagnostic only @@ -15,7 +15,7 @@ abstract class RenderGraphResourcePool where Type : class List<(int, Type)> m_FrameAllocatedResources = new List<(int, Type)>(); #endif - static int s_CurrentFrameIndex; + protected static int s_CurrentFrameIndex; // Release the GPU resource itself abstract protected void ReleaseInternalResource(Type res); @@ -46,25 +46,7 @@ public bool TryGetResource(int hashCode, out Type resource) return false; } - public void PurgeUnusedResources(int currentFrameIndex) - { - // Update the frame index for the lambda. Static because we don't want to capture. - s_CurrentFrameIndex = currentFrameIndex; - - foreach (var kvp in m_ResourcePool) - { - var list = kvp.Value; - list.RemoveAll(obj => - { - if (obj.frameIndex < s_CurrentFrameIndex) - { - ReleaseInternalResource(obj.resource); - return true; - } - return false; - }); - } - } + abstract public void PurgeUnusedResources(int currentFrameIndex); public void Cleanup() { @@ -150,6 +132,30 @@ override protected string GetResourceTypeName() { return "Texture"; } + + // Another C# nicety. + // We need to re-implement the whole thing every time because: + // - obj.resource.Release is Type specific so it cannot be called on a generic (and there's no shared interface for resources like RTHandle, ComputeBuffers etc) + // - We can't use a virtual release function because it will capture this in the lambda for RemoveAll generating GCAlloc in the process. + override public void PurgeUnusedResources(int currentFrameIndex) + { + // Update the frame index for the lambda. Static because we don't want to capture. + s_CurrentFrameIndex = currentFrameIndex; + + foreach (var kvp in m_ResourcePool) + { + var list = kvp.Value; + list.RemoveAll(obj => + { + if (obj.frameIndex < s_CurrentFrameIndex) + { + obj.resource.Release(); + return true; + } + return false; + }); + } + } } class ComputeBufferPool : RenderGraphResourcePool @@ -169,5 +175,28 @@ override protected string GetResourceTypeName() return "ComputeBuffer"; } + // Another C# nicety. + // We need to re-implement the whole thing every time because: + // - obj.resource.Release is Type specific so it cannot be called on a generic (and there's no shared interface for resources like RTHandle, ComputeBuffers etc) + // - We can't use a virtual release function because it will capture this in the lambda for RemoveAll generating GCAlloc in the process. + override public void PurgeUnusedResources(int currentFrameIndex) + { + // Update the frame index for the lambda. Static because we don't want to capture. + s_CurrentFrameIndex = currentFrameIndex; + + foreach (var kvp in m_ResourcePool) + { + var list = kvp.Value; + list.RemoveAll(obj => + { + if (obj.frameIndex < s_CurrentFrameIndex) + { + obj.resource.Release(); + return true; + } + return false; + }); + } + } } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 4265313c0dd..f03d10f9a01 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -112,7 +112,7 @@ public RTHandle GetTexture(in TextureHandle handle) if (!handle.IsValid()) return null; - return GetTextureResource(handle).resource; + return GetTextureResource(handle.handle).resource; } /// @@ -138,7 +138,7 @@ public ComputeBuffer GetComputeBuffer(in ComputeBufferHandle handle) if (!handle.IsValid()) return null; - return GetComputeBufferResource(handle).resource; + return GetComputeBufferResource(handle.handle).resource; } #endregion @@ -184,36 +184,34 @@ internal void BeginRender(int width, int height, MSAASamples msaaSamples, int cu internal RTHandleProperties GetRTHandleProperties() { return m_RTHandleSystem.rtHandleProperties; } - internal string GetResourceName(RenderGraphResourceType type, int index) + void CheckHandleValidity(in ResourceHandle res) { - var resources = m_Resources[(int)type]; - if (index < 0 || index >= resources.size) - throw new ArgumentException($"Trying to access resource of type {type} with an invalid resource index {index}"); - return m_Resources[(int)type][index].GetName(); + var resources = m_Resources[res.iType]; + if (res.handle >= resources.size) + throw new ArgumentException($"Trying to access resource of type {res.type} with an invalid resource index {res.handle}"); } - internal bool IsResourceImported(RenderGraphResourceType type, int index) + internal string GetResourceName(in ResourceHandle res) { - var resources = m_Resources[(int)type]; - if (index < 0 || index >= resources.size) - throw new ArgumentException($"Trying to access resource of type {type} with an invalid resource index {index}"); - return m_Resources[(int)type][index].imported; + CheckHandleValidity(res); + return m_Resources[res.iType][res.handle].GetName(); } - internal int GetResourceTransientIndex(RenderGraphResourceType type, int index) + internal bool IsResourceImported(in ResourceHandle res) { - var resources = m_Resources[(int)type]; - if (index < 0 || index >= resources.size) - throw new ArgumentException($"Trying to access resource of type {type} with an invalid resource index {index}"); - return m_Resources[(int)type][index].transientPassIndex; + CheckHandleValidity(res); + return m_Resources[res.iType][res.handle].imported; + } + + internal int GetResourceTransientIndex(in ResourceHandle res) + { + CheckHandleValidity(res); + return m_Resources[res.iType][res.handle].transientPassIndex; } // Texture Creation/Import APIs are internal because creation should only go through RenderGraph internal TextureHandle ImportTexture(RTHandle rt, int shaderProperty = 0) { - if (rt == null) - throw new InvalidOperationException("Importing a null RTHandle is not allowed."); - int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.Texture], out TextureResource texResource); texResource.resource = rt; texResource.imported = true; @@ -265,14 +263,14 @@ internal int GetTextureResourceCount() return m_Resources[(int)RenderGraphResourceType.Texture].size; } - TextureResource GetTextureResource(int index) + TextureResource GetTextureResource(in ResourceHandle handle) { - return m_Resources[(int)RenderGraphResourceType.Texture][index] as TextureResource; + return m_Resources[(int)RenderGraphResourceType.Texture][handle] as TextureResource; } - internal TextureDesc GetTextureResourceDesc(int index) + internal TextureDesc GetTextureResourceDesc(in ResourceHandle handle) { - return (m_Resources[(int)RenderGraphResourceType.Texture][index] as TextureResource).desc; + return (m_Resources[(int)RenderGraphResourceType.Texture][handle] as TextureResource).desc; } internal RendererListHandle CreateRendererList(in RendererListDesc desc) @@ -285,9 +283,6 @@ internal RendererListHandle CreateRendererList(in RendererListDesc desc) internal ComputeBufferHandle ImportComputeBuffer(ComputeBuffer computeBuffer) { - if (computeBuffer == null) - throw new InvalidOperationException("Importing a null ComputeBuffer is not allowed."); - int newHandle = AddNewResource(m_Resources[(int)RenderGraphResourceType.ComputeBuffer], out ComputeBufferResource bufferResource); bufferResource.resource = computeBuffer; bufferResource.imported = true; @@ -306,9 +301,9 @@ internal ComputeBufferHandle CreateComputeBuffer(in ComputeBufferDesc desc, int return new ComputeBufferHandle(newHandle); } - internal ComputeBufferDesc GetComputeBufferResourceDesc(ComputeBufferHandle index) + internal ComputeBufferDesc GetComputeBufferResourceDesc(in ResourceHandle handle) { - return (m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource).desc; + return (m_Resources[(int)RenderGraphResourceType.ComputeBuffer][handle] as ComputeBufferResource).desc; } internal int GetComputeBufferResourceCount() @@ -316,14 +311,15 @@ internal int GetComputeBufferResourceCount() return m_Resources[(int)RenderGraphResourceType.ComputeBuffer].size; } - ComputeBufferResource GetComputeBufferResource(int index) + ComputeBufferResource GetComputeBufferResource(in ResourceHandle handle) { - return m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource; + return m_Resources[(int)RenderGraphResourceType.ComputeBuffer][handle] as ComputeBufferResource; } internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) { - var resource = GetTextureResource(index); + var resource = m_Resources[(int)RenderGraphResourceType.Texture][index] as TextureResource; + if (!resource.imported) { var desc = resource.desc; @@ -389,7 +385,7 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, int index) internal void CreateComputeBuffer(RenderGraphContext rgContext, int index) { - var resource = GetComputeBufferResource(index); + var resource = m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource; if (!resource.imported) { var desc = resource.desc; @@ -411,7 +407,7 @@ internal void CreateComputeBuffer(RenderGraphContext rgContext, int index) } } - void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bindDummyTexture) + void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bindDummyTexture) { foreach (var resource in textures) { @@ -427,24 +423,25 @@ void SetGlobalTextures(RenderGraphContext rgContext, List textures, bool bi } - internal void PreRenderPassSetGlobalTextures(RenderGraphContext rgContext, List textures) + internal void PreRenderPassSetGlobalTextures(RenderGraphContext rgContext, List textures) { SetGlobalTextures(rgContext, textures, false); } - internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, List textures) + internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, List textures) { SetGlobalTextures(rgContext, textures, true); } - internal void ReleaseTexture(RenderGraphContext rgContext, int handle) + internal void ReleaseTexture(RenderGraphContext rgContext, int index) { - var resource = GetTextureResource(handle); - if (resource.resource == null) - throw new InvalidOperationException($"Tried to release a texture ({resource.desc.name}) that was never created. Check that there is at least one pass writing to it first."); + var resource = m_Resources[(int)RenderGraphResourceType.Texture][index] as TextureResource; if (!resource.imported) { + if (resource.resource == null) + throw new InvalidOperationException($"Tried to release a texture ({resource.desc.name}) that was never created. Check that there is at least one pass writing to it first."); + if (m_RenderGraphDebug.clearRenderTargetsAtRelease) { using (new ProfilingScope(rgContext.cmd, ProfilingSampler.Get(RenderGraphProfileId.RenderGraphClearDebug))) @@ -452,7 +449,7 @@ internal void ReleaseTexture(RenderGraphContext rgContext, int handle) var clearFlag = resource.desc.depthBufferBits != DepthBits.None ? ClearFlag.Depth : ClearFlag.Color; // Not ideal to do new TextureHandle here but GetTexture is a public API and we rather have it take an explicit TextureHandle parameters. // Everywhere else internally int is better because it allows us to share more code. - CoreUtils.SetRenderTarget(rgContext.cmd, GetTexture(new TextureHandle(handle)), clearFlag, Color.magenta); + CoreUtils.SetRenderTarget(rgContext.cmd, GetTexture(new TextureHandle(index)), clearFlag, Color.magenta); } } @@ -465,14 +462,15 @@ internal void ReleaseTexture(RenderGraphContext rgContext, int handle) } } - internal void ReleaseComputeBuffer(RenderGraphContext rgContext, int handle) + internal void ReleaseComputeBuffer(RenderGraphContext rgContext, int index) { - var resource = GetComputeBufferResource(handle); - if (resource.resource == null) - throw new InvalidOperationException($"Tried to release a compute buffer ({resource.desc.name}) that was never created. Check that there is at least one pass writing to it first."); + var resource = m_Resources[(int)RenderGraphResourceType.ComputeBuffer][index] as ComputeBufferResource; if (!resource.imported) { + if (resource.resource == null) + throw new InvalidOperationException($"Tried to release a compute buffer ({resource.desc.name}) that was never created. Check that there is at least one pass writing to it first."); + LogComputeBufferRelease(resource.resource); m_ComputeBufferPool.ReleaseResource(resource.cachedHash, resource.resource, m_CurrentFrameIndex); m_ComputeBufferPool.UnregisterFrameAllocation(resource.cachedHash, resource.resource); diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs index 1cf01d47300..a3e2a109e18 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs @@ -11,8 +11,28 @@ internal enum RenderGraphResourceType Count } + // Can't have a default constructor with handle = -1 hence the ugly IsValid implementation (where m_IsValid will be false by default). + internal struct ResourceHandle + { + bool m_IsValid; + + public int handle { get; private set; } + public RenderGraphResourceType type { get; private set; } + public int iType { get { return (int)type; } } + + internal ResourceHandle(int value, RenderGraphResourceType type) + { + handle = value; + this.type = type; + m_IsValid = true; + } + + public static implicit operator int(ResourceHandle handle) => handle.handle; + public bool IsValid() => m_IsValid; + } + // BEHOLD C# COPY PASTA - // Struct can't be inherited and can't have default member values + // Struct can't be inherited and can't have default member values or constructor // Hence the copy paste and the ugly IsValid implementation. /// @@ -21,68 +41,59 @@ internal enum RenderGraphResourceType [DebuggerDisplay("Texture ({handle})")] public struct TextureHandle { - bool m_IsValid; - internal int handle { get; private set; } - internal TextureHandle(int handle) { this.handle = handle; m_IsValid = true; } - /// - /// Conversion to int. - /// - /// Texture handle to convert. - /// The integer representation of the handle. - public static implicit operator int(TextureHandle handle) { return handle.handle; } + internal ResourceHandle handle; + + internal TextureHandle(int handle) { this.handle = new ResourceHandle(handle, RenderGraphResourceType.Texture); } + /// /// Return true if the handle is valid. /// /// True if the handle is valid. - public bool IsValid() => m_IsValid; + public bool IsValid() => handle.IsValid(); - /// - /// GetHashCode override. - /// - /// - public override int GetHashCode() - { - return (handle << 2) ^ (m_IsValid ? 333 : 444); - } + ///// + ///// GetHashCode override. + ///// + ///// + //public override int GetHashCode() + //{ + // return (handle << 2) ^ (m_IsValid ? 333 : 444); + //} } /// - /// Renderer List resource handle. + /// Compute Buffer resource handle. /// - [DebuggerDisplay("RendererList ({handle})")] - public struct RendererListHandle + [DebuggerDisplay("ComputeBuffer ({handle})")] + public struct ComputeBufferHandle { - bool m_IsValid; - internal int handle { get; private set; } - internal RendererListHandle(int handle) { this.handle = handle; m_IsValid = true; } - /// - /// Conversion to int. - /// - /// Renderer List handle to convert. - /// The integer representation of the handle. - public static implicit operator int(RendererListHandle handle) { return handle.handle; } + internal ResourceHandle handle; + + internal ComputeBufferHandle(int handle) { this.handle = new ResourceHandle(handle, RenderGraphResourceType.ComputeBuffer); } + /// /// Return true if the handle is valid. /// /// True if the handle is valid. - public bool IsValid() => m_IsValid; + public bool IsValid() => handle.IsValid(); } /// - /// Compute Buffer resource handle. + /// Renderer List resource handle. /// - [DebuggerDisplay("ComputeBuffer ({handle})")] - public struct ComputeBufferHandle + [DebuggerDisplay("RendererList ({handle})")] + public struct RendererListHandle { bool m_IsValid; internal int handle { get; private set; } - internal ComputeBufferHandle(int handle) { this.handle = handle; m_IsValid = true; } + internal RendererListHandle(int handle) { this.handle = handle; m_IsValid = true; } /// /// Conversion to int. /// - /// Compute Buffer handle to convert. + /// Renderer List handle to convert. /// The integer representation of the handle. - public static implicit operator int(ComputeBufferHandle handle) { return handle.handle; } + public static implicit operator int(RendererListHandle handle) { return handle.handle; } + /// /// Return true if the handle is valid. /// diff --git a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs index 0d52838a2fd..46f94ec710d 100644 --- a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs +++ b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs @@ -284,8 +284,8 @@ public void SimpleCreateReleaseTexture() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(4, compiledPasses.size); - Assert.Contains((int)texture, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); - Assert.Contains((int)texture, compiledPasses[3].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle, compiledPasses[3].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } [Test] @@ -326,8 +326,8 @@ public void TransientCreateReleaseInSamePass() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(1, compiledPasses.size); - Assert.Contains((int)texture, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); - Assert.Contains((int)texture, compiledPasses[0].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle, compiledPasses[0].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } // Texture that should be released during an async pass should have their release delayed until the first pass that syncs with the compute pipe. @@ -396,8 +396,8 @@ public void AsyncPassReleaseTextureOnGraphicsPipe() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(6, compiledPasses.size); - Assert.Contains((int)texture0, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); - Assert.Contains((int)texture2, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture0.handle, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture2.handle, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } [Test] diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 20d1783d329..d69d300a3fa 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -688,14 +688,14 @@ void UpsampleTransparent(RenderGraph renderGraph, HDCamera hdCamera, TextureHand } TextureHandle RenderTransparency( RenderGraph renderGraph, - HDCamera hdCamera, + HDCamera hdCamera, TextureHandle colorBuffer, TextureHandle depthStencilBuffer, TextureHandle motionVectorsBuffer, TextureHandle currentColorPyramid, TextureHandle depthPyramid, - ShadowResult shadowResult, - CullingResults cullingResults) + ShadowResult shadowResult, + CullingResults cullingResults) { RenderTransparentDepthPrepass(renderGraph, hdCamera, depthStencilBuffer, cullingResults); From 3b0cb24f8dd364ef5f85d13db3e58014d32ab116 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 16:52:08 +0200 Subject: [PATCH 44/53] Fixed light list binding for forward passes. --- .../HDRenderPipeline.LightLoop.cs | 4 +- .../HDRenderPipeline.RenderGraph.cs | 67 +++++++++++-------- 2 files changed, 42 insertions(+), 29 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 5ba94464199..2f1db83f2af 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -195,7 +195,7 @@ BuildGPULightListOutput BuildGPULightList( RenderGraph rend context.cmd.SetGlobalBuffer(HDShaderIDs.g_vBigTileLightList, buildLightListResources.bigTileLightList); context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLayeredOffsetsBuffer, buildLightListResources.perVoxelOffset); context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLightListGlobal, buildLightListResources.perVoxelLightLists); - if (k_UseDepthBuffer) + if (data.buildGPULightListParameters.clusterNeedsDepth) context.cmd.SetGlobalBuffer(HDShaderIDs.g_logBaseBuffer, buildLightListResources.perTileLogBaseTweak); }); @@ -470,7 +470,7 @@ class RenderContactShadowPassData public ComputeBufferHandle lightList; } - TextureHandle RenderContactShadows(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle depthTexture, BuildGPULightListOutput lightLists, int firstMipOffsetY) + TextureHandle RenderContactShadows(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle depthTexture, in BuildGPULightListOutput lightLists, int firstMipOffsetY) { if (!WillRenderContactShadow()) return renderGraph.ImportTexture(TextureXR.GetClearTexture(), HDShaderIDs._ContactShadowTexture); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index d69d300a3fa..07a4a027474 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -135,7 +135,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, var deferredLightingOutput = RenderDeferredLighting(m_RenderGraph, hdCamera, colorBuffer, prepassOutput.depthBuffer, prepassOutput.depthPyramidTexture, lightingBuffers, prepassOutput.gbuffer, shadowResult, gpuLightListOutput); - RenderForwardOpaque(m_RenderGraph, hdCamera, colorBuffer, lightingBuffers, prepassOutput.depthBuffer, shadowResult, prepassOutput.dbuffer, cullingResults); + RenderForwardOpaque(m_RenderGraph, hdCamera, colorBuffer, lightingBuffers, gpuLightListOutput, prepassOutput.depthBuffer, shadowResult, prepassOutput.dbuffer, cullingResults); // TODO RENDERGRAPH : Move this to the end after we do move semantic and graph pruning to avoid doing the rest of the frame for nothing aovRequest.PushCameraTexture(m_RenderGraph, AOVBuffers.Normals, hdCamera, prepassOutput.resolvedNormalBuffer, aovBuffers); @@ -160,7 +160,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, // No need for old stencil values here since from transparent on different features are tagged //ClearStencilBuffer(hdCamera, cmd); - colorBuffer = RenderTransparency(m_RenderGraph, hdCamera, colorBuffer, prepassOutput.depthBuffer, prepassOutput.motionVectorsBuffer, currentColorPyramid, prepassOutput.depthPyramidTexture, shadowResult, cullingResults); + colorBuffer = RenderTransparency(m_RenderGraph, hdCamera, colorBuffer, prepassOutput.depthBuffer, prepassOutput.motionVectorsBuffer, currentColorPyramid, prepassOutput.depthPyramidTexture, gpuLightListOutput, shadowResult, cullingResults); if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.TransparentsWriteMotionVector)) { @@ -365,19 +365,29 @@ class ForwardPassData public TextureHandle[] renderTarget = new TextureHandle[3]; public int renderTargetCount; public TextureHandle depthBuffer; - public ComputeBuffer lightListBuffer; + public ComputeBufferHandle lightListBuffer; public FrameSettings frameSettings; public bool decalsEnabled; public bool renderMotionVecForTransparent; public DBufferOutput? dbuffer; } - void PrepareForwardPassData(RenderGraph renderGraph, RenderGraphBuilder builder, ForwardPassData data, bool opaque, FrameSettings frameSettings, RendererListDesc rendererListDesc, TextureHandle depthBuffer, ShadowResult shadowResult, DBufferOutput? dbuffer = null) + void PrepareForwardPassData(RenderGraph renderGraph, + RenderGraphBuilder builder, + ForwardPassData data, + bool opaque, + FrameSettings frameSettings, + RendererListDesc rendererListDesc, + in BuildGPULightListOutput lightLists, + TextureHandle depthBuffer, + ShadowResult shadowResult, + DBufferOutput? dbuffer = null) { bool useFptl = frameSettings.IsEnabled(FrameSettingsField.FPTLForForwardOpaque) && opaque; data.frameSettings = frameSettings; - data.lightListBuffer = useFptl ? m_TileAndClusterData.lightList: m_TileAndClusterData.perVoxelLightLists; + data.lightListBuffer = builder.ReadComputeBuffer(useFptl ? lightLists.lightList : lightLists.perVoxelLightLists); + //data.lightListBuffer = useFptl ? m_TileAndClusterData.lightList: m_TileAndClusterData.perVoxelLightLists; data.depthBuffer = builder.UseDepthBuffer(depthBuffer, DepthAccess.ReadWrite); data.rendererList = builder.UseRendererList(renderGraph.CreateRendererList(rendererListDesc)); // enable d-buffer flag value is being interpreted more like enable decals in general now that we have clustered @@ -398,9 +408,10 @@ void PrepareForwardPassData(RenderGraph renderGraph, RenderGraphBuilder builder, // (Thus why "Forward" and "ForwardOnly" are exclusive, else they will render two times" void RenderForwardOpaque( RenderGraph renderGraph, HDCamera hdCamera, - TextureHandle colorBuffer, + TextureHandle colorBuffer, in LightingBuffers lightingBuffers, - TextureHandle depthBuffer, + in BuildGPULightListOutput lightLists, + TextureHandle depthBuffer, ShadowResult shadowResult, DBufferOutput dbuffer, CullingResults cullResults) @@ -411,7 +422,7 @@ void RenderForwardOpaque( RenderGraph renderGraph, out var passData, debugDisplay ? ProfilingSampler.Get(HDProfileId.ForwardOpaqueDebug) : ProfilingSampler.Get(HDProfileId.ForwardOpaque))) { - PrepareForwardPassData(renderGraph, builder, passData, true, hdCamera.frameSettings, PrepareForwardOpaqueRendererList(cullResults, hdCamera), depthBuffer, shadowResult, dbuffer); + PrepareForwardPassData(renderGraph, builder, passData, true, hdCamera.frameSettings, PrepareForwardOpaqueRendererList(cullResults, hdCamera), lightLists, depthBuffer, shadowResult, dbuffer); // In case of forward SSS we will bind all the required target. It is up to the shader to write into it or not. if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.SubsurfaceScattering)) @@ -444,7 +455,7 @@ void RenderForwardOpaque( RenderGraph renderGraph, context.resources.GetRendererList(data.rendererList), mrt, context.resources.GetTexture(data.depthBuffer), - data.lightListBuffer, + context.resources.GetComputeBuffer(data.lightListBuffer), true, context.renderContext, context.cmd); }); } @@ -452,11 +463,12 @@ void RenderForwardOpaque( RenderGraph renderGraph, void RenderForwardTransparent( RenderGraph renderGraph, HDCamera hdCamera, - TextureHandle colorBuffer, - TextureHandle motionVectorBuffer, - TextureHandle depthBuffer, - TextureHandle? colorPyramid, - ShadowResult shadowResult, + TextureHandle colorBuffer, + TextureHandle motionVectorBuffer, + TextureHandle depthBuffer, + TextureHandle? colorPyramid, + in BuildGPULightListOutput lightLists, + in ShadowResult shadowResult, CullingResults cullResults, bool preRefractionPass) { @@ -480,7 +492,7 @@ void RenderForwardTransparent( RenderGraph renderGraph, using (var builder = renderGraph.AddRenderPass(passName, out var passData, ProfilingSampler.Get(profilingId))) { - PrepareForwardPassData(renderGraph, builder, passData, false, hdCamera.frameSettings, PrepareForwardTransparentRendererList(cullResults, hdCamera, preRefractionPass), depthBuffer, shadowResult); + PrepareForwardPassData(renderGraph, builder, passData, false, hdCamera.frameSettings, PrepareForwardTransparentRendererList(cullResults, hdCamera, preRefractionPass), lightLists, depthBuffer, shadowResult); bool renderMotionVecForTransparent = NeedMotionVectorForTransparent(hdCamera.frameSettings); @@ -526,7 +538,7 @@ void RenderForwardTransparent( RenderGraph renderGraph, context.resources.GetRendererList(data.rendererList), mrt, context.resources.GetTexture(data.depthBuffer), - data.lightListBuffer, + context.resources.GetComputeBuffer(data.lightListBuffer), false, context.renderContext, context.cmd); }); } @@ -687,15 +699,16 @@ void UpsampleTransparent(RenderGraph renderGraph, HDCamera hdCamera, TextureHand } } - TextureHandle RenderTransparency( RenderGraph renderGraph, - HDCamera hdCamera, - TextureHandle colorBuffer, - TextureHandle depthStencilBuffer, - TextureHandle motionVectorsBuffer, - TextureHandle currentColorPyramid, - TextureHandle depthPyramid, - ShadowResult shadowResult, - CullingResults cullingResults) + TextureHandle RenderTransparency( RenderGraph renderGraph, + HDCamera hdCamera, + TextureHandle colorBuffer, + TextureHandle depthStencilBuffer, + TextureHandle motionVectorsBuffer, + TextureHandle currentColorPyramid, + TextureHandle depthPyramid, + in BuildGPULightListOutput lightLists, + ShadowResult shadowResult, + CullingResults cullingResults) { RenderTransparentDepthPrepass(renderGraph, hdCamera, depthStencilBuffer, cullingResults); @@ -713,7 +726,7 @@ TextureHandle RenderTransparency( RenderGraph renderGraph, //RenderCustomPass(renderContext, cmd, hdCamera, customPassCullingResults, CustomPassInjectionPoint.BeforePreRefraction); // Render pre-refraction objects - RenderForwardTransparent(renderGraph, hdCamera, colorBuffer, motionVectorsBuffer, depthStencilBuffer, null, shadowResult, cullingResults, true); + RenderForwardTransparent(renderGraph, hdCamera, colorBuffer, motionVectorsBuffer, depthStencilBuffer, null, lightLists, shadowResult, cullingResults, true); if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.Refraction)) { @@ -726,7 +739,7 @@ TextureHandle RenderTransparency( RenderGraph renderGraph, //RenderCustomPass(renderContext, cmd, hdCamera, customPassCullingResults, CustomPassInjectionPoint.BeforeTransparent); // Render all type of transparent forward (unlit, lit, complex (hair...)) to keep the sorting between transparent objects. - RenderForwardTransparent(renderGraph, hdCamera, colorBuffer, motionVectorsBuffer, depthStencilBuffer, currentColorPyramid, shadowResult, cullingResults, false); + RenderForwardTransparent(renderGraph, hdCamera, colorBuffer, motionVectorsBuffer, depthStencilBuffer, currentColorPyramid, lightLists, shadowResult, cullingResults, false); // We push the motion vector debug texture here as transparent object can overwrite the motion vector texture content. if (m_Asset.currentPlatformRenderPipelineSettings.supportMotionVectors) From f8672b06d4a74377470c7341c57fc86d2b2d73d6 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 17:19:04 +0200 Subject: [PATCH 45/53] Removed usless SetGlobals --- .../RenderPipeline/HDRenderPipeline.LightLoop.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 2f1db83f2af..31fbd0d1f67 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -187,16 +187,6 @@ BuildGPULightListOutput BuildGPULightList( RenderGraph rend VoxelLightListGeneration(data.buildGPULightListParameters, buildLightListResources, context.cmd); BuildDispatchIndirectArguments(data.buildGPULightListParameters, buildLightListResources, tileFlagsWritten, context.cmd); - - // TODO RENDERGRAPH this won't work with Async compute. - // Need to do away with globals altogether. These are only needed in Deferred and Forward passes. - // Setup global buffers - if (data.buildGPULightListParameters.runBigTilePrepass) - context.cmd.SetGlobalBuffer(HDShaderIDs.g_vBigTileLightList, buildLightListResources.bigTileLightList); - context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLayeredOffsetsBuffer, buildLightListResources.perVoxelOffset); - context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLightListGlobal, buildLightListResources.perVoxelLightLists); - if (data.buildGPULightListParameters.clusterNeedsDepth) - context.cmd.SetGlobalBuffer(HDShaderIDs.g_logBaseBuffer, buildLightListResources.perTileLogBaseTweak); }); return passData.output; From 0d7586930a9539e708ba6150ba0f754e33b93595 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 17:46:48 +0200 Subject: [PATCH 46/53] Correctly bind cluster buffers for transparent forward passes. --- .../RenderPipeline/HDRenderPipeline.RenderGraph.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 07a4a027474..e3e19710540 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -366,6 +366,8 @@ class ForwardPassData public int renderTargetCount; public TextureHandle depthBuffer; public ComputeBufferHandle lightListBuffer; + public ComputeBufferHandle perVoxelOffset; + public ComputeBufferHandle perTileLogBaseTweak; public FrameSettings frameSettings; public bool decalsEnabled; public bool renderMotionVecForTransparent; @@ -387,7 +389,12 @@ void PrepareForwardPassData(RenderGraph renderGraph, data.frameSettings = frameSettings; data.lightListBuffer = builder.ReadComputeBuffer(useFptl ? lightLists.lightList : lightLists.perVoxelLightLists); - //data.lightListBuffer = useFptl ? m_TileAndClusterData.lightList: m_TileAndClusterData.perVoxelLightLists; + if (!useFptl) + { + data.perVoxelOffset = builder.ReadComputeBuffer(lightLists.perVoxelOffset); + if (lightLists.perTileLogBaseTweak.IsValid()) + data.perTileLogBaseTweak = builder.ReadComputeBuffer(lightLists.perTileLogBaseTweak); + } data.depthBuffer = builder.UseDepthBuffer(depthBuffer, DepthAccess.ReadWrite); data.rendererList = builder.UseRendererList(renderGraph.CreateRendererList(rendererListDesc)); // enable d-buffer flag value is being interpreted more like enable decals in general now that we have clustered @@ -530,10 +537,14 @@ void RenderForwardTransparent( RenderGraph renderGraph, for (int i = 0; i < data.renderTargetCount; ++i) mrt[i] = context.resources.GetTexture(data.renderTarget[i]); + // Bind all global data/parameters for transparent forward pass context.cmd.SetGlobalInt(HDShaderIDs._ColorMaskTransparentVel, data.renderMotionVecForTransparent ? (int)ColorWriteMask.All : 0); if (data.decalsEnabled) DecalSystem.instance.SetAtlas(context.cmd); // for clustered decals + context.cmd.SetGlobalBuffer(HDShaderIDs.g_vLayeredOffsetsBuffer, context.resources.GetComputeBuffer(data.perVoxelOffset)); + context.cmd.SetGlobalBuffer(HDShaderIDs.g_logBaseBuffer, context.resources.GetComputeBuffer(data.perTileLogBaseTweak)); + RenderForwardRendererList( data.frameSettings, context.resources.GetRendererList(data.rendererList), mrt, From 2edc865f3fffa6634092b5a573629e2a510379c5 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 17 Jun 2020 19:46:05 +0200 Subject: [PATCH 47/53] Fixed light list build (wrong light count) --- .../RenderGraph/RenderGraphResourceRegistry.cs | 12 ++++++++---- .../RenderPipeline/HDRenderPipeline.LightLoop.cs | 3 ++- .../RenderPipeline/HDRenderPipeline.RenderGraph.cs | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index f03d10f9a01..a14fccae5d1 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -540,10 +540,14 @@ void ValidateComputeBufferDesc(in ComputeBufferDesc desc) { #if DEVELOPMENT_BUILD || UNITY_EDITOR // TODO RENDERGRAPH: Check actual condition on stride. - //if (desc.stride % 4 != 0) - //{ - // throw new ArgumentException("Compute Buffer stride must be at least 4."); - //} + if (desc.stride % 4 != 0) + { + throw new ArgumentException("Invalid Compute Buffer creation descriptor: Compute Buffer stride must be at least 4."); + } + if (desc.count == 0) + { + throw new ArgumentException("Invalid Compute Buffer creation descriptor: Compute Buffer count must be non zero."); + } #endif } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 31fbd0d1f67..bcd11c2fc11 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -95,6 +95,7 @@ BuildGPULightListOutput BuildGPULightList( RenderGraph rend HDCamera hdCamera, TileAndClusterData tileAndClusterData, int totalLightCount, + int maxLightOnScreen, ref ShaderVariablesLightList constantBuffer, TextureHandle depthStencilBuffer, TextureHandle stencilBufferCopy, @@ -122,7 +123,7 @@ BuildGPULightListOutput BuildGPULightList( RenderGraph rend passData.lightVolumeDataBuffer = builder.ReadComputeBuffer(renderGraph.ImportComputeBuffer(tileAndClusterData.lightVolumeDataBuffer)); passData.globalLightListAtomic = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(1, sizeof(uint)) { name = "LightListAtomic"}); - passData.AABBBoundsBuffer = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * 2 * totalLightCount, 4 * sizeof(float)) { name = "AABBBoundBuffer" }); + passData.AABBBoundsBuffer = builder.CreateTransientComputeBuffer(new ComputeBufferDesc(m_MaxViewCount * 2 * maxLightOnScreen, 4 * sizeof(float)) { name = "AABBBoundBuffer" }); var nrTilesX = (m_MaxCameraWidth + LightDefinitions.s_TileSizeFptl - 1) / LightDefinitions.s_TileSizeFptl; var nrTilesY = (m_MaxCameraHeight + LightDefinitions.s_TileSizeFptl - 1) / LightDefinitions.s_TileSizeFptl; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index e3e19710540..b48dc210b7b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -66,7 +66,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, } else { - var gpuLightListOutput = BuildGPULightList(m_RenderGraph, hdCamera, m_TileAndClusterData, m_MaxLightsOnScreen, ref m_ShaderVariablesLightListCB, prepassOutput.depthBuffer, prepassOutput.stencilBuffer, prepassOutput.gbuffer); + var gpuLightListOutput = BuildGPULightList(m_RenderGraph, hdCamera, m_TileAndClusterData, m_TotalLightCount, m_MaxLightsOnScreen, ref m_ShaderVariablesLightListCB, prepassOutput.depthBuffer, prepassOutput.stencilBuffer, prepassOutput.gbuffer); lightingBuffers.ambientOcclusionBuffer = m_AmbientOcclusionSystem.Render(m_RenderGraph, hdCamera, prepassOutput.depthPyramidTexture, prepassOutput.motionVectorsBuffer, m_FrameCount); // Should probably be inside the AO render function but since it's a separate class it's currently not super clean to do. From 424855d6340e96b6bbd4b67b0d9f87cd81786f0f Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 18 Jun 2020 10:14:24 +0200 Subject: [PATCH 48/53] Fixed tile/cluster debug. --- .../Runtime/Lighting/LightLoop/LightLoop.cs | 35 +++++++------ .../RenderPipeline/HDRenderPipeline.Debug.cs | 49 ++++++++++++------- .../HDRenderPipeline.RenderGraph.cs | 4 +- .../RenderPipeline/HDRenderPipeline.cs | 2 +- 4 files changed, 57 insertions(+), 33 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs index 87f1757a4d3..511fc4bf98f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs @@ -4087,15 +4087,14 @@ static void RenderPixelDeferredLighting(in DeferredLightingParameters parameters struct LightLoopDebugOverlayParameters { - public Material debugViewTilesMaterial; - public TileAndClusterData tileAndClusterData; - public HDShadowManager shadowManager; - public int debugSelectedLightShadowIndex; - public int debugSelectedLightShadowCount; - public Material debugShadowMapMaterial; - public Material debugBlitMaterial; - public LightCookieManager cookieManager; - public PlanarReflectionProbeCache planarProbeCache; + public Material debugViewTilesMaterial; + public HDShadowManager shadowManager; + public int debugSelectedLightShadowIndex; + public int debugSelectedLightShadowCount; + public Material debugShadowMapMaterial; + public Material debugBlitMaterial; + public LightCookieManager cookieManager; + public PlanarReflectionProbeCache planarProbeCache; } LightLoopDebugOverlayParameters PrepareLightLoopDebugOverlayParameters() @@ -4103,7 +4102,6 @@ LightLoopDebugOverlayParameters PrepareLightLoopDebugOverlayParameters() var parameters = new LightLoopDebugOverlayParameters(); parameters.debugViewTilesMaterial = m_DebugViewTilesMaterial; - parameters.tileAndClusterData = m_TileAndClusterData; parameters.shadowManager = m_ShadowManager; parameters.debugSelectedLightShadowIndex = m_DebugSelectedLightShadowIndex; parameters.debugSelectedLightShadowCount = m_DebugSelectedLightShadowCount; @@ -4115,7 +4113,16 @@ LightLoopDebugOverlayParameters PrepareLightLoopDebugOverlayParameters() return parameters; } - static void RenderLightLoopDebugOverlay(in DebugParameters debugParameters, CommandBuffer cmd, ref float x, ref float y, float overlaySize, RTHandle depthTexture) + static void RenderLightLoopDebugOverlay(in DebugParameters debugParameters, + CommandBuffer cmd, + ref float x, + ref float y, + float overlaySize, + ComputeBuffer tileBuffer, + ComputeBuffer lightListBuffer, + ComputeBuffer perVoxelLightListBuffer, + ComputeBuffer dispatchIndirectBuffer, + RTHandle depthTexture) { var hdCamera = debugParameters.hdCamera; var parameters = debugParameters.lightingOverlayParameters; @@ -4141,8 +4148,8 @@ static void RenderLightLoopDebugOverlay(in DebugParameters debugParameters, Comm parameters.debugViewTilesMaterial.SetInt(HDShaderIDs._ViewTilesFlags, (int)lightingDebug.tileClusterDebugByCategory); parameters.debugViewTilesMaterial.SetVector(HDShaderIDs._MousePixelCoord, HDUtils.GetMouseCoordinates(hdCamera)); parameters.debugViewTilesMaterial.SetVector(HDShaderIDs._MouseClickPixelCoord, HDUtils.GetMouseClickCoordinates(hdCamera)); - parameters.debugViewTilesMaterial.SetBuffer(HDShaderIDs.g_TileList, parameters.tileAndClusterData.tileList); - parameters.debugViewTilesMaterial.SetBuffer(HDShaderIDs.g_DispatchIndirectBuffer, parameters.tileAndClusterData.dispatchIndirectBuffer); + parameters.debugViewTilesMaterial.SetBuffer(HDShaderIDs.g_TileList, tileBuffer); + parameters.debugViewTilesMaterial.SetBuffer(HDShaderIDs.g_DispatchIndirectBuffer, dispatchIndirectBuffer); parameters.debugViewTilesMaterial.EnableKeyword("USE_FPTL_LIGHTLIST"); parameters.debugViewTilesMaterial.DisableKeyword("USE_CLUSTERED_LIGHTLIST"); parameters.debugViewTilesMaterial.DisableKeyword("SHOW_LIGHT_CATEGORIES"); @@ -4162,7 +4169,7 @@ static void RenderLightLoopDebugOverlay(in DebugParameters debugParameters, Comm parameters.debugViewTilesMaterial.SetInt(HDShaderIDs._ViewTilesFlags, (int)lightingDebug.tileClusterDebugByCategory); parameters.debugViewTilesMaterial.SetVector(HDShaderIDs._MousePixelCoord, HDUtils.GetMouseCoordinates(hdCamera)); parameters.debugViewTilesMaterial.SetVector(HDShaderIDs._MouseClickPixelCoord, HDUtils.GetMouseClickCoordinates(hdCamera)); - parameters.debugViewTilesMaterial.SetBuffer(HDShaderIDs.g_vLightListGlobal, bUseClustered ? parameters.tileAndClusterData.perVoxelLightLists : parameters.tileAndClusterData.lightList); + parameters.debugViewTilesMaterial.SetBuffer(HDShaderIDs.g_vLightListGlobal, bUseClustered ? perVoxelLightListBuffer : lightListBuffer); parameters.debugViewTilesMaterial.SetTexture(HDShaderIDs._CameraDepthTexture, depthTexture); parameters.debugViewTilesMaterial.EnableKeyword(bUseClustered ? "USE_CLUSTERED_LIGHTLIST" : "USE_FPTL_LIGHTLIST"); parameters.debugViewTilesMaterial.DisableKeyword(!bUseClustered ? "USE_CLUSTERED_LIGHTLIST" : "USE_FPTL_LIGHTLIST"); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs index 57f0b89069c..6ddde304438 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs @@ -75,15 +75,20 @@ class RenderDebugOverlayPassData public TextureHandle colorBuffer; public TextureHandle depthBuffer; public TextureHandle depthPyramidTexture; + public ComputeBufferHandle tileList; + public ComputeBufferHandle lightList; + public ComputeBufferHandle perVoxelLightList; + public ComputeBufferHandle dispatchIndirect; public ShadowResult shadowTextures; } - void RenderDebugOverlays( RenderGraph renderGraph, - in DebugParameters debugParameters, - TextureHandle colorBuffer, - TextureHandle depthBuffer, - TextureHandle depthPyramidTexture, - in ShadowResult shadowResult) + void RenderDebugOverlays( RenderGraph renderGraph, + in DebugParameters debugParameters, + TextureHandle colorBuffer, + TextureHandle depthBuffer, + TextureHandle depthPyramidTexture, + in BuildGPULightListOutput lightLists, + in ShadowResult shadowResult) { using (var builder = renderGraph.AddRenderPass("DebugOverlay", out var passData)) { @@ -92,6 +97,10 @@ void RenderDebugOverlays( RenderGraph renderGraph, passData.depthBuffer = builder.UseDepthBuffer(depthBuffer, DepthAccess.ReadWrite); passData.depthPyramidTexture = builder.ReadTexture(depthPyramidTexture); passData.shadowTextures = HDShadowManager.ReadShadowResult(shadowResult, builder); + passData.tileList = builder.ReadComputeBuffer(lightLists.tileList); + passData.lightList = builder.ReadComputeBuffer(lightLists.lightList); + passData.perVoxelLightList = builder.ReadComputeBuffer(lightLists.perVoxelLightLists); + passData.dispatchIndirect = builder.ReadComputeBuffer(lightLists.dispatchIndirectBuffer); builder.SetRenderFunc( (RenderDebugOverlayPassData data, RenderGraphContext ctx) => @@ -111,9 +120,14 @@ void RenderDebugOverlays( RenderGraph renderGraph, shadowAtlases.cachedPunctualShadowAtlas = data.shadowTextures.cachedPunctualShadowResult.IsValid() ? ctx.resources.GetTexture(data.shadowTextures.cachedPunctualShadowResult) : null; shadowAtlases.cachedAreaShadowAtlas = data.shadowTextures.cachedAreaShadowResult.IsValid() ? ctx.resources.GetTexture(data.shadowTextures.cachedAreaShadowResult) : null; + ComputeBuffer tileBuffer = ctx.resources.GetComputeBuffer(data.tileList); + ComputeBuffer lightListBuffer = ctx.resources.GetComputeBuffer(data.lightList); + ComputeBuffer perVoxelLightListBuffer = ctx.resources.GetComputeBuffer(data.perVoxelLightList); + ComputeBuffer dispatchIndirectBuffer = ctx.resources.GetComputeBuffer(data.dispatchIndirect); + RenderSkyReflectionOverlay(debugParams, ctx.cmd, ctx.renderGraphPool.GetTempMaterialPropertyBlock(), ref x, ref y, overlaySize); RenderRayCountOverlay(debugParams, ctx.cmd, ref x, ref y, overlaySize); - RenderLightLoopDebugOverlay(debugParams, ctx.cmd, ref x, ref y, overlaySize, ctx.resources.GetTexture(data.depthPyramidTexture)); + RenderLightLoopDebugOverlay(debugParams, ctx.cmd, ref x, ref y, overlaySize, tileBuffer, lightListBuffer, perVoxelLightListBuffer, dispatchIndirectBuffer, ctx.resources.GetTexture(data.depthPyramidTexture)); RenderShadowsDebugOverlay(debugParams, shadowAtlases, ctx.cmd, ref x, ref y, overlaySize, ctx.renderGraphPool.GetTempMaterialPropertyBlock()); DecalSystem.instance.RenderDebugOverlay(debugParams.hdCamera, ctx.cmd, debugParams.debugDisplaySettings, ref x, ref y, overlaySize, debugParams.hdCamera.actualWidth); }); @@ -169,15 +183,16 @@ static void RenderLightVolumes(RenderGraph renderGraph, in DebugParameters debug } } - TextureHandle RenderDebug( RenderGraph renderGraph, - HDCamera hdCamera, - TextureHandle colorBuffer, - TextureHandle depthBuffer, - TextureHandle depthPyramidTexture, - TextureHandle fullScreenDebugTexture, - TextureHandle colorPickerDebugTexture, - in ShadowResult shadowResult, - CullingResults cullResults) + TextureHandle RenderDebug( RenderGraph renderGraph, + HDCamera hdCamera, + TextureHandle colorBuffer, + TextureHandle depthBuffer, + TextureHandle depthPyramidTexture, + TextureHandle fullScreenDebugTexture, + TextureHandle colorPickerDebugTexture, + in BuildGPULightListOutput lightLists, + in ShadowResult shadowResult, + CullingResults cullResults) { // We don't want any overlay for these kind of rendering if (hdCamera.camera.cameraType == CameraType.Reflection || hdCamera.camera.cameraType == CameraType.Preview) @@ -212,7 +227,7 @@ TextureHandle RenderDebug( RenderGraph renderGraph, RenderLightVolumes(renderGraph, debugParameters, output, depthBuffer, cullResults); } - RenderDebugOverlays(renderGraph, debugParameters, output, depthBuffer, depthPyramidTexture, shadowResult); + RenderDebugOverlays(renderGraph, debugParameters, output, depthBuffer, depthPyramidTexture, lightLists, shadowResult); return output; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index b48dc210b7b..f1d804ee7ce 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -39,6 +39,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, // Need this during debug render at the end outside of the main loop scope. // Once render graph move is implemented, we can probably remove the branch and this. ShadowResult shadowResult = new ShadowResult(); + BuildGPULightListOutput gpuLightListOutput = new BuildGPULightListOutput(); if (m_CurrentDebugDisplaySettings.IsDebugMaterialDisplayEnabled() || m_CurrentDebugDisplaySettings.IsMaterialValidationEnabled() || CoreUtils.IsSceneLightingDisabled(hdCamera.camera)) { @@ -66,7 +67,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, } else { - var gpuLightListOutput = BuildGPULightList(m_RenderGraph, hdCamera, m_TileAndClusterData, m_TotalLightCount, m_MaxLightsOnScreen, ref m_ShaderVariablesLightListCB, prepassOutput.depthBuffer, prepassOutput.stencilBuffer, prepassOutput.gbuffer); + gpuLightListOutput = BuildGPULightList(m_RenderGraph, hdCamera, m_TileAndClusterData, m_TotalLightCount, m_MaxLightsOnScreen, ref m_ShaderVariablesLightListCB, prepassOutput.depthBuffer, prepassOutput.stencilBuffer, prepassOutput.gbuffer); lightingBuffers.ambientOcclusionBuffer = m_AmbientOcclusionSystem.Render(m_RenderGraph, hdCamera, prepassOutput.depthPyramidTexture, prepassOutput.motionVectorsBuffer, m_FrameCount); // Should probably be inside the AO render function but since it's a separate class it's currently not super clean to do. @@ -232,6 +233,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, prepassOutput.depthPyramidTexture, m_DebugFullScreenTexture, colorPickerTexture, + gpuLightListOutput, shadowResult, cullingResults); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index fd9a322e72c..100ab2972ee 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -5039,7 +5039,7 @@ void RenderDebug(HDCamera hdCamera, CommandBuffer cmd, CullingResults cullResult RenderSkyReflectionOverlay(debugParams, cmd, m_SharedPropertyBlock, ref x, ref y, overlaySize); RenderRayCountOverlay(debugParams, cmd, ref x, ref y, overlaySize); - RenderLightLoopDebugOverlay(debugParams, cmd, ref x, ref y, overlaySize, m_SharedRTManager.GetDepthTexture()); + RenderLightLoopDebugOverlay(debugParams, cmd, ref x, ref y, overlaySize, m_TileAndClusterData.tileList, m_TileAndClusterData.lightList, m_TileAndClusterData.perVoxelLightLists, m_TileAndClusterData.dispatchIndirectBuffer, m_SharedRTManager.GetDepthTexture()); RenderProbeVolumeDebugOverlay(debugParams, cmd, ref x, ref y, overlaySize, m_DebugDisplayProbeVolumeMaterial); // TODO(Nicholas): renders as a black square in the upper right. HDShadowManager.ShadowDebugAtlasTextures atlases = debugParams.lightingOverlayParameters.shadowManager.GetDebugAtlasTextures(); From b628507a6b73a35a710ac57dfadd3d82dc3386ce Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 18 Jun 2020 10:47:07 +0200 Subject: [PATCH 49/53] Ported coarse stencil buffer to render graph. --- .../SubsurfaceScatteringManager.cs | 5 +--- .../HDRenderPipeline.LightLoop.cs | 26 ++++++++--------- .../HDRenderPipeline.Prepass.cs | 29 ++++++++++--------- .../HDRenderPipeline.RenderGraph.cs | 6 +--- .../HDRenderPipeline.SubsurfaceScattering.cs | 4 ++- .../RenderPipeline/HDRenderPipeline.cs | 15 +++++----- 6 files changed, 42 insertions(+), 43 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs index 05a93901fbd..cc982d13b53 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs @@ -223,8 +223,6 @@ struct SubsurfaceScatteringParameters public int numTilesX; public int numTilesY; public int numTilesZ; - public ComputeBuffer coarseStencilBuffer; - } struct SubsurfaceScatteringResources @@ -258,7 +256,6 @@ SubsurfaceScatteringParameters PrepareSubsurfaceScatteringParameters(HDCamera hd parameters.numTilesX = ((int)hdCamera.screenSize.x + 15) / 16; parameters.numTilesY = ((int)hdCamera.screenSize.y + 15) / 16; parameters.numTilesZ = hdCamera.viewCount; - parameters.coarseStencilBuffer = m_SharedRTManager.GetCoarseStencilBuffer(); parameters.sampleBudget = hdCamera.frameSettings.sssResolvedSampleBudget; return parameters; @@ -418,7 +415,7 @@ void RenderSubsurfaceScattering(HDCamera hdCamera, CommandBuffer cmd, RTHandle c resources.depthStencilBuffer = depthStencilBufferRT; resources.depthTexture = depthTextureRT; resources.cameraFilteringBuffer = m_SSSCameraFilteringBuffer; - resources.coarseStencilBuffer = parameters.coarseStencilBuffer; + resources.coarseStencilBuffer = m_SharedRTManager.GetCoarseStencilBuffer(); resources.sssBuffer = m_SSSColor; // For Jimenez we always need an extra buffer, for Disney it depends on platform diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index bcd11c2fc11..9c09f71213b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -368,17 +368,14 @@ class RenderSSRPassData public TextureHandle hitPointsTexture; public TextureHandle lightingTexture; public TextureHandle clearCoatMask; + public ComputeBufferHandle coarseStencilBuffer; //public TextureHandle debugTexture; } - TextureHandle RenderSSR( RenderGraph renderGraph, - HDCamera hdCamera, - TextureHandle normalBuffer, - TextureHandle motionVectorsBuffer, - TextureHandle depthBuffer, - TextureHandle depthPyramid, - TextureHandle stencilBuffer, - TextureHandle clearCoatMask) + TextureHandle RenderSSR( RenderGraph renderGraph, + HDCamera hdCamera, + in PrepassOutput prepassOutput, + TextureHandle clearCoatMask) { var ssrBlackTexture = renderGraph.ImportTexture(TextureXR.GetBlackTexture(), HDShaderIDs._SsrLightingTexture); @@ -405,14 +402,16 @@ TextureHandle RenderSSR( RenderGraph renderGraph, var colorPyramid = renderGraph.ImportTexture(hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.ColorBufferMipChain)); passData.parameters = PrepareSSRParameters(hdCamera, m_DepthBufferMipChainInfo, true); - passData.depthBuffer = builder.ReadTexture(depthBuffer); - passData.depthPyramid = builder.ReadTexture(depthPyramid); + passData.depthBuffer = builder.ReadTexture(prepassOutput.depthBuffer); + passData.depthPyramid = builder.ReadTexture(prepassOutput.depthPyramidTexture); passData.colorPyramid = builder.ReadTexture(colorPyramid); - passData.stencilBuffer = builder.ReadTexture(stencilBuffer); + passData.stencilBuffer = builder.ReadTexture(prepassOutput.stencilBuffer); passData.clearCoatMask = builder.ReadTexture(clearCoatMask); + passData.coarseStencilBuffer = builder.ReadComputeBuffer(prepassOutput.coarseStencilBuffer); - builder.ReadTexture(normalBuffer); - builder.ReadTexture(motionVectorsBuffer); + // TODO RENDERGRAPH: pass and bind properly those texture (once auto setglobal is gone) + builder.ReadTexture(prepassOutput.resolvedNormalBuffer); + builder.ReadTexture(prepassOutput.resolvedMotionVectorsBuffer); // In practice, these textures are sparse (mostly black). Therefore, clearing them is fast (due to CMASK), // and much faster than fully overwriting them from within SSR shaders. @@ -435,6 +434,7 @@ TextureHandle RenderSSR( RenderGraph renderGraph, res.GetTexture(data.clearCoatMask), res.GetTexture(data.colorPyramid), res.GetTexture(data.lightingTexture), + res.GetComputeBuffer(data.coarseStencilBuffer), context.cmd, context.renderContext); }); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index 561892ae748..b1f05203625 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -53,28 +53,29 @@ struct PrepassOutput { // Buffers that may be output by the prepass. // They will be MSAA depending on the frame settings - public TextureHandle depthBuffer; - public TextureHandle depthAsColor; - public TextureHandle normalBuffer; - public TextureHandle motionVectorsBuffer; + public TextureHandle depthBuffer; + public TextureHandle depthAsColor; + public TextureHandle normalBuffer; + public TextureHandle motionVectorsBuffer; // GBuffer output. Will also contain a reference to the normal buffer (as it is shared between deferred and forward objects) - public GBufferOutput gbuffer; + public GBufferOutput gbuffer; - public DBufferOutput dbuffer; + public DBufferOutput dbuffer; // Additional buffers only for MSAA - public TextureHandle depthValuesMSAA; + public TextureHandle depthValuesMSAA; // Resolved buffers for MSAA. When MSAA is off, they will be the same reference as the buffers above. - public TextureHandle resolvedDepthBuffer; - public TextureHandle resolvedNormalBuffer; - public TextureHandle resolvedMotionVectorsBuffer; + public TextureHandle resolvedDepthBuffer; + public TextureHandle resolvedNormalBuffer; + public TextureHandle resolvedMotionVectorsBuffer; // Copy of the resolved depth buffer with mip chain - public TextureHandle depthPyramidTexture; + public TextureHandle depthPyramidTexture; - public TextureHandle stencilBuffer; + public TextureHandle stencilBuffer; + public ComputeBufferHandle coarseStencilBuffer; } TextureHandle CreateDepthBuffer(RenderGraph renderGraph, bool msaa) @@ -529,7 +530,8 @@ void BuildCoarseStencilAndResolveIfNeeded(RenderGraph renderGraph, HDCamera hdCa { passData.parameters = PrepareBuildCoarseStencilParameters(hdCamera); passData.inputDepth = output.depthBuffer; - passData.coarseStencilBuffer = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_SharedRTManager.GetCoarseStencilBuffer())); + passData.coarseStencilBuffer = builder.WriteComputeBuffer( + renderGraph.CreateComputeBuffer(new ComputeBufferDesc(HDUtils.DivRoundUp(m_MaxCameraWidth, 8) * HDUtils.DivRoundUp(m_MaxCameraHeight, 8) * m_MaxViewCount, sizeof(uint)) { name = "CoarseStencilBuffer" })); if (passData.parameters.resolveIsNecessary) passData.resolvedStencil = builder.WriteTexture(renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true) { colorFormat = GraphicsFormat.R8G8_UInt, enableRandomWrite = true, name = "StencilBufferResolved" })); builder.SetRenderFunc( @@ -552,6 +554,7 @@ void BuildCoarseStencilAndResolveIfNeeded(RenderGraph renderGraph, HDCamera hdCa { output.stencilBuffer = output.depthBuffer; } + output.coarseStencilBuffer = passData.coarseStencilBuffer; } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index f1d804ee7ce..7ddb6a4bcc5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -77,11 +77,7 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, var clearCoatMask = hdCamera.frameSettings.litShaderMode == LitShaderMode.Deferred ? prepassOutput.gbuffer.mrt[2] : m_RenderGraph.defaultResources.blackTextureXR; lightingBuffers.ssrLightingBuffer = RenderSSR(m_RenderGraph, hdCamera, - prepassOutput.resolvedNormalBuffer, - prepassOutput.resolvedMotionVectorsBuffer, - prepassOutput.depthBuffer, - prepassOutput.depthPyramidTexture, - prepassOutput.stencilBuffer, + prepassOutput, clearCoatMask); lightingBuffers.contactShadowsBuffer = RenderContactShadows(m_RenderGraph, hdCamera, msaa ? prepassOutput.depthValuesMSAA : prepassOutput.depthPyramidTexture, gpuLightListOutput, GetDepthBufferMipChainInfo().mipLevelOffsets[1].y); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs index 321cf6a5f5f..9815274982a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.SubsurfaceScattering.cs @@ -30,6 +30,7 @@ class SubsurfaceScaterringPassData public TextureHandle depthTexture; public TextureHandle cameraFilteringBuffer; public TextureHandle sssBuffer; + public ComputeBufferHandle coarseStencilBuffer; } void RenderSubsurfaceScattering(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle colorBuffer, @@ -51,6 +52,7 @@ void RenderSubsurfaceScattering(RenderGraph renderGraph, HDCamera hdCamera, Text passData.depthStencilBuffer = builder.ReadTexture(depthStencilBuffer); passData.depthTexture = builder.ReadTexture(depthTexture); passData.sssBuffer = builder.ReadTexture(lightingBuffers.sssBuffer); + passData.coarseStencilBuffer = builder.ReadComputeBuffer(prepassOutput.coarseStencilBuffer); if (passData.parameters.needTemporaryBuffer) { passData.cameraFilteringBuffer = builder.CreateTransientTexture( @@ -68,7 +70,7 @@ void RenderSubsurfaceScattering(RenderGraph renderGraph, HDCamera hdCamera, Text resources.depthTexture = context.resources.GetTexture(data.depthTexture); resources.cameraFilteringBuffer = context.resources.GetTexture(data.cameraFilteringBuffer); resources.sssBuffer = context.resources.GetTexture(data.sssBuffer); - resources.coarseStencilBuffer = data.parameters.coarseStencilBuffer; + resources.coarseStencilBuffer = context.resources.GetComputeBuffer(data.coarseStencilBuffer); RenderSubsurfaceScattering(data.parameters, resources, context.cmd); }); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 100ab2972ee..8dc2aa90c4d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -990,7 +990,7 @@ void InitializeNonRenderGraphResources() m_PostProcessSystem.InitializeNonRenderGraphResources(asset); s_lightVolumes.InitializeNonRenderGraphResources(); - // Reset resolution dependent buffers. + // Reset resolution dependent buffers. Tile, Coarse stencil etc... m_MaxCameraWidth = m_MaxCameraHeight = m_MaxViewCount = 0; } @@ -1002,6 +1002,7 @@ void CleanupNonRenderGraphResources() m_PostProcessSystem.CleanupNonRenderGraphResources(); s_lightVolumes.CleanupNonRenderGraphResources(); LightLoopCleanupNonRenderGraphResources(); + m_SharedRTManager.DisposeCoarseStencilBuffer(); } void InitializeDebugMaterials() @@ -1216,7 +1217,8 @@ void Resize(HDCamera hdCamera) LightLoopAllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); m_DbufferManager.AllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); - m_SharedRTManager.AllocateCoarseStencilBuffer(m_MaxCameraWidth, m_MaxCameraHeight, hdCamera.viewCount); + if (!m_EnableRenderGraph) + m_SharedRTManager.AllocateCoarseStencilBuffer(m_MaxCameraWidth, m_MaxCameraHeight, hdCamera.viewCount); } } @@ -4338,7 +4340,6 @@ struct RenderSSRParameters public int width, height, viewCount; public ComputeBuffer offsetBufferData; - public ComputeBuffer coarseStencilBuffer; public ShaderVariablesScreenSpaceReflection cb; } @@ -4378,7 +4379,6 @@ RenderSSRParameters PrepareSSRParameters(HDCamera hdCamera, in HDUtils.PackedMip cb._SsrDepthPyramidMaxMip = depthPyramid.mipLevelCount - 1; parameters.offsetBufferData = depthPyramid.GetOffsetBufferData(m_DepthPyramidMipLevelOffsetsBuffer); - parameters.coarseStencilBuffer = m_SharedRTManager.GetCoarseStencilBuffer(); return parameters; } @@ -4391,6 +4391,7 @@ static void RenderSSR( in RenderSSRParameters parameters, RTHandle clearCoatMask, RTHandle previousColorPyramid, RTHandle ssrLightingTexture, + ComputeBuffer coarseStencilBuffer, CommandBuffer cmd, ScriptableRenderContext renderContext) { @@ -4418,7 +4419,7 @@ static void RenderSSR( in RenderSSRParameters parameters, cmd.SetComputeTextureParam(cs, parameters.tracingKernel, HDShaderIDs._StencilTexture, stencilBuffer, 0, RenderTextureSubElement.Stencil); } - cmd.SetComputeBufferParam(cs, parameters.tracingKernel, HDShaderIDs._CoarseStencilBuffer, parameters.coarseStencilBuffer); + cmd.SetComputeBufferParam(cs, parameters.tracingKernel, HDShaderIDs._CoarseStencilBuffer, coarseStencilBuffer); cmd.SetComputeBufferParam(cs, parameters.tracingKernel, HDShaderIDs._DepthPyramidMipLevelOffsets, parameters.offsetBufferData); ConstantBuffer.Push(cmd, parameters.cb, cs, HDShaderIDs._ShaderVariablesScreenSpaceReflection); @@ -4467,7 +4468,7 @@ void RenderSSR(HDCamera hdCamera, CommandBuffer cmd, ScriptableRenderContext ren var parameters = PrepareSSRParameters(hdCamera, m_SharedRTManager.GetDepthBufferMipChainInfo(), false); RenderSSR(parameters, m_SharedRTManager.GetDepthStencilBuffer(), m_SharedRTManager.GetDepthTexture(), m_SsrHitPointTexture, m_SharedRTManager.GetStencilBuffer(hdCamera.frameSettings.IsEnabled(FrameSettingsField.MSAA)), clearCoatMask, previousColorPyramid, - m_SsrLightingTexture, cmd, renderContext); + m_SsrLightingTexture, m_SharedRTManager.GetCoarseStencilBuffer(), cmd, renderContext); if (!hdCamera.colorPyramidHistoryIsValid) { @@ -4507,7 +4508,7 @@ void RenderSSRTransparent(HDCamera hdCamera, CommandBuffer cmd, ScriptableRender // Evaluate the screen space reflection for the transparent pixels var previousColorPyramid = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.ColorBufferMipChain); var parameters = PrepareSSRParameters(hdCamera, m_SharedRTManager.GetDepthBufferMipChainInfo(), true); - RenderSSR(parameters, m_SharedRTManager.GetDepthStencilBuffer(), m_SharedRTManager.GetDepthTexture(), m_SsrHitPointTexture, m_SharedRTManager.GetStencilBuffer(), TextureXR.GetBlackTexture(), previousColorPyramid, m_SsrLightingTexture, cmd, renderContext); + RenderSSR(parameters, m_SharedRTManager.GetDepthStencilBuffer(), m_SharedRTManager.GetDepthTexture(), m_SsrHitPointTexture, m_SharedRTManager.GetStencilBuffer(), TextureXR.GetBlackTexture(), previousColorPyramid, m_SsrLightingTexture, m_SharedRTManager.GetCoarseStencilBuffer(), cmd, renderContext); // If color pyramid was not valid, we bind a black texture if (!hdCamera.colorPyramidHistoryIsValid) From 7d1681f7a38e713ebfdb5ee5143ba3718cba23b6 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 18 Jun 2020 11:12:06 +0200 Subject: [PATCH 50/53] Moved decal property mask buffer to render graph created buffer. --- .../Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs | 5 ++++- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index b1f05203625..fb07e22cb2f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -597,8 +597,11 @@ void SetupDBufferTargets(RenderGraph renderGraph, RenderDBufferPassData passData new TextureDesc(Vector2.one, true, true) { colorFormat = rtFormat[dbufferIndex], name = s_DBufferNames[dbufferIndex] }), dbufferIndex); } + int propertyMaskBufferSize = ((m_MaxCameraWidth + 7) / 8) * ((m_MaxCameraHeight + 7) / 8); + propertyMaskBufferSize = ((propertyMaskBufferSize + 63) / 64) * 64; // round off to nearest multiple of 64 for ease of use in CS + passData.depthStencilBuffer = builder.UseDepthBuffer(output.resolvedDepthBuffer, DepthAccess.Write); - passData.propertyMaskBuffer = builder.WriteComputeBuffer(renderGraph.ImportComputeBuffer(m_DbufferManager.propertyMaskBuffer)); + passData.propertyMaskBuffer = builder.WriteComputeBuffer(renderGraph.CreateComputeBuffer(new ComputeBufferDesc(propertyMaskBufferSize, 4) { name = "DecalPropertyMask" })); output.dbuffer.dBufferCount = passData.dBufferCount; for (int i = 0; i < passData.dBufferCount; ++i) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 8dc2aa90c4d..acf9c63786a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -1003,6 +1003,7 @@ void CleanupNonRenderGraphResources() s_lightVolumes.CleanupNonRenderGraphResources(); LightLoopCleanupNonRenderGraphResources(); m_SharedRTManager.DisposeCoarseStencilBuffer(); + m_DbufferManager.ReleaseResolutionDependentBuffers(); } void InitializeDebugMaterials() @@ -1216,9 +1217,11 @@ void Resize(HDCamera hdCamera) } LightLoopAllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); - m_DbufferManager.AllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); if (!m_EnableRenderGraph) + { + m_DbufferManager.AllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); m_SharedRTManager.AllocateCoarseStencilBuffer(m_MaxCameraWidth, m_MaxCameraHeight, hdCamera.viewCount); + } } } From 5a3d99f1b6d7bb89b4d3050f610f09db2c1dc88b Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 18 Jun 2020 11:18:24 +0200 Subject: [PATCH 51/53] Fixed reset size of width/height --- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index acf9c63786a..5d86ad6761e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -991,7 +991,7 @@ void InitializeNonRenderGraphResources() s_lightVolumes.InitializeNonRenderGraphResources(); // Reset resolution dependent buffers. Tile, Coarse stencil etc... - m_MaxCameraWidth = m_MaxCameraHeight = m_MaxViewCount = 0; + m_MaxCameraWidth = m_MaxCameraHeight = m_MaxViewCount = 1; } void CleanupNonRenderGraphResources() From 49a908c01b7f452021c15c9ec5c1a57a1f864bff Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Thu, 18 Jun 2020 12:10:29 +0200 Subject: [PATCH 52/53] Fixed size of dbuffer property mask buffer. --- .../Runtime/Material/Decal/DBufferManager.cs | 16 ++++++---------- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DBufferManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DBufferManager.cs index e9bcf7e2ea9..5aec9fdae0c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DBufferManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DBufferManager.cs @@ -5,7 +5,6 @@ namespace UnityEngine.Rendering.HighDefinition class DBufferManager : MRTBufferManager { ComputeBuffer m_PropertyMaskBuffer; - int m_PropertyMaskBufferSize; ComputeShader m_ClearPropertyMaskBufferShader; int m_ClearPropertyMaskBufferKernel; @@ -42,12 +41,11 @@ public ComputeShader clearPropertyMaskBufferShader } } - public int propertyMaskBufferSize + public int GetPropertyMaskBufferSize(int width, int height) { - get - { - return m_PropertyMaskBufferSize; - } + int propertyMaskBufferSize = ((width + 7) / 8) * ((height + 7) / 8); + propertyMaskBufferSize = ((propertyMaskBufferSize + 63) / 64) * 64; + return propertyMaskBufferSize; } public override void CreateBuffers() @@ -78,11 +76,9 @@ public void ReleaseResolutionDependentBuffers() } } - public void AllocResolutionDependentBuffers(HDCamera hdCamera, int width, int height) + public void AllocResolutionDependentBuffers(int width, int height) { - m_PropertyMaskBufferSize = ((width + 7) / 8) * ((height + 7) / 8); - m_PropertyMaskBufferSize = ((m_PropertyMaskBufferSize + 63) / 64) * 64; // round off to nearest multiple of 64 for ease of use in CS - m_PropertyMaskBuffer = new ComputeBuffer(m_PropertyMaskBufferSize, 4); + m_PropertyMaskBuffer = new ComputeBuffer(GetPropertyMaskBufferSize(width, height), 4); } override public void DestroyBuffers() diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 5d86ad6761e..cb64fca7c4c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -1219,7 +1219,7 @@ void Resize(HDCamera hdCamera) LightLoopAllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); if (!m_EnableRenderGraph) { - m_DbufferManager.AllocResolutionDependentBuffers(hdCamera, m_MaxCameraWidth, m_MaxCameraHeight); + m_DbufferManager.AllocResolutionDependentBuffers(m_MaxCameraWidth, m_MaxCameraHeight); m_SharedRTManager.AllocateCoarseStencilBuffer(m_MaxCameraWidth, m_MaxCameraHeight, hdCamera.viewCount); } } @@ -3739,7 +3739,7 @@ RenderDBufferParameters PrepareRenderDBufferParameters() parameters.use4RTs = m_Asset.currentPlatformRenderPipelineSettings.decalSettings.perChannelMask; parameters.clearPropertyMaskBufferCS = m_DbufferManager.clearPropertyMaskBufferShader; parameters.clearPropertyMaskBufferKernel = m_DbufferManager.clearPropertyMaskBufferKernel; - parameters.propertyMaskBufferSize = m_DbufferManager.propertyMaskBufferSize; + parameters.propertyMaskBufferSize = m_DbufferManager.GetPropertyMaskBufferSize(m_MaxCameraWidth, m_MaxCameraHeight); return parameters; } From 0fd07afdf33be596f7a3912e912e2b268bc600a1 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Fri, 19 Jun 2020 10:26:50 +0200 Subject: [PATCH 53/53] Fixed unit tests --- .../RenderGraph/RenderGraphResourceRegistry.cs | 10 +++++----- .../Runtime/RenderGraph/RenderGraphResources.cs | 15 +++------------ .../Tests/Editor/RenderGraphTests.cs | 12 ++++++------ 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index a14fccae5d1..a1e620eb6b3 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -187,26 +187,26 @@ internal void BeginRender(int width, int height, MSAASamples msaaSamples, int cu void CheckHandleValidity(in ResourceHandle res) { var resources = m_Resources[res.iType]; - if (res.handle >= resources.size) - throw new ArgumentException($"Trying to access resource of type {res.type} with an invalid resource index {res.handle}"); + if (res.index >= resources.size) + throw new ArgumentException($"Trying to access resource of type {res.type} with an invalid resource index {res.index}"); } internal string GetResourceName(in ResourceHandle res) { CheckHandleValidity(res); - return m_Resources[res.iType][res.handle].GetName(); + return m_Resources[res.iType][res.index].GetName(); } internal bool IsResourceImported(in ResourceHandle res) { CheckHandleValidity(res); - return m_Resources[res.iType][res.handle].imported; + return m_Resources[res.iType][res.index].imported; } internal int GetResourceTransientIndex(in ResourceHandle res) { CheckHandleValidity(res); - return m_Resources[res.iType][res.handle].transientPassIndex; + return m_Resources[res.iType][res.index].transientPassIndex; } // Texture Creation/Import APIs are internal because creation should only go through RenderGraph diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs index a3e2a109e18..3e3375a0f4c 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs @@ -16,18 +16,18 @@ internal struct ResourceHandle { bool m_IsValid; - public int handle { get; private set; } + public int index { get; private set; } public RenderGraphResourceType type { get; private set; } public int iType { get { return (int)type; } } internal ResourceHandle(int value, RenderGraphResourceType type) { - handle = value; + index = value; this.type = type; m_IsValid = true; } - public static implicit operator int(ResourceHandle handle) => handle.handle; + public static implicit operator int(ResourceHandle handle) => handle.index; public bool IsValid() => m_IsValid; } @@ -50,15 +50,6 @@ public struct TextureHandle /// /// True if the handle is valid. public bool IsValid() => handle.IsValid(); - - ///// - ///// GetHashCode override. - ///// - ///// - //public override int GetHashCode() - //{ - // return (handle << 2) ^ (m_IsValid ? 333 : 444); - //} } /// diff --git a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs index 46f94ec710d..ab01a3f3542 100644 --- a/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs +++ b/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs @@ -284,8 +284,8 @@ public void SimpleCreateReleaseTexture() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(4, compiledPasses.size); - Assert.Contains(texture.handle, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); - Assert.Contains(texture.handle, compiledPasses[3].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle.index, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle.index, compiledPasses[3].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } [Test] @@ -326,8 +326,8 @@ public void TransientCreateReleaseInSamePass() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(1, compiledPasses.size); - Assert.Contains(texture.handle, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); - Assert.Contains(texture.handle, compiledPasses[0].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle.index, compiledPasses[0].resourceCreateList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture.handle.index, compiledPasses[0].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } // Texture that should be released during an async pass should have their release delayed until the first pass that syncs with the compute pipe. @@ -396,8 +396,8 @@ public void AsyncPassReleaseTextureOnGraphicsPipe() var compiledPasses = m_RenderGraph.GetCompiledPassInfos(); Assert.AreEqual(6, compiledPasses.size); - Assert.Contains(texture0.handle, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); - Assert.Contains(texture2.handle, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture0.handle.index, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); + Assert.Contains(texture2.handle.index, compiledPasses[4].resourceReleaseList[(int)RenderGraphResourceType.Texture]); } [Test]