From d11aba2e99f9fdf3f6356e75cc549867b982c5d9 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 21 Dec 2020 15:26:02 +0100 Subject: [PATCH 01/58] Initial commit --- .../BuildProcessors/HDRPPreprocessShaders.cs | 16 +- .../Editor/RenderPipeline/HDAssetFactory.cs | 27 + .../RenderPipeline/HDDefaultSettingsEditor.cs | 35 + .../Editor/RenderPipeline/HDEditorUtils.cs | 4 +- .../RenderPipeline/HDRenderPipelineUI.Skin.cs | 2 - .../RenderPipeline/HDRenderPipelineUI.cs | 132 +--- .../Settings/DefaultSettingsPanel.cs | 653 +++++++++------- .../Settings/EditorDefaultSettings.cs | 26 +- .../Settings/FrameSettingsUI.Drawers.cs | 317 ++++---- .../Settings/SerializedFrameSettings.cs | 20 +- .../Settings/SerializedHDDefaulltSettings.cs | 181 +++++ .../SerializedHDRenderPipelineAsset.cs | 40 - .../HDRPBasicDxrScenePipeline.cs | 2 +- .../SceneTemplates/HDRPBasicScenePipeline.cs | 2 +- .../Editor/Wizard/HDWizard.Configuration.cs | 63 +- .../Runtime/Compositor/CompositionManager.cs | 8 +- .../Runtime/Lighting/LightLoop/LightLoop.cs | 2 +- .../Shadow/ScreenSpaceShadowManager.cs | 8 +- .../Runtime/Material/Decal/DecalProjector.cs | 3 +- .../DiffusionProfileSettings.Migration.cs | 6 +- .../SubsurfaceScatteringManagerRT.cs | 12 +- .../PostProcessSystem.RenderGraph.cs | 8 +- .../HDDefaultSettings.Migration.cs | 17 + .../RenderPipeline/HDDefaultSettings.cs | 708 ++++++++++++++++++ .../HDRenderPipeline.LookDev.cs | 10 +- .../RenderPipeline/HDRenderPipeline.cs | 191 ++--- .../HDRenderPipelineAsset.Migration.cs | 136 +++- .../RenderPipeline/HDRenderPipelineAsset.cs | 209 ++---- .../RenderPipeline/PathTracing/PathTracing.cs | 4 +- .../HDRaytracingAmbientOcclusion.cs | 2 +- .../Raytracing/HDRaytracingIndirectDiffuse.cs | 18 +- .../Raytracing/HDRaytracingLightCluster.cs | 2 +- .../Raytracing/HDRaytracingManager.cs | 14 +- .../HDRaytracingRecursiveRenderer.cs | 2 +- .../Raytracing/HDRaytracingReflection.cs | 16 +- .../RenderPipeline/Settings/FrameSettings.cs | 4 +- .../Settings/FrameSettingsHistory.cs | 26 +- .../Settings/RenderPipelineSettings.cs | 146 +++- .../Runtime/Sky/StaticLightingSky.cs | 5 +- 39 files changed, 1975 insertions(+), 1102 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs create mode 100644 com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs create mode 100644 com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index cc34e397ced..d78f98e8cdd 100644 --- a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -298,7 +298,7 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis return; var exportLog = ShaderBuildPreprocessor.hdrpAssets.Count > 0 - && ShaderBuildPreprocessor.hdrpAssets.Any(hdrpAsset => hdrpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + && (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); Stopwatch shaderStripingWatch = new Stopwatch(); shaderStripingWatch.Start(); @@ -343,13 +343,13 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis inputData.RemoveAt(i); } - foreach (var hdAsset in hdPipelineAssets) + if (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { - if (hdAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + foreach (var hdAsset in hdPipelineAssets) { m_TotalVariantsInputCount += preStrippingCount; m_TotalVariantsOutputCount += (uint)inputData.Count; - LogShaderVariants(shader, kernelName, hdAsset.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + LogShaderVariants(shader, kernelName, HDDefaultSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); } } } @@ -453,7 +453,7 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList 0 - && ShaderBuildPreprocessor.hdrpAssets.Any(hdrpAsset => hdrpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + && (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); Stopwatch shaderStripingWatch = new Stopwatch(); shaderStripingWatch.Start(); @@ -514,13 +514,13 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList= inputShaderVariantCount; --i) inputData.RemoveAt(i); - foreach (var hdAsset in hdPipelineAssets) + if (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { - if (hdAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + foreach (var hdAsset in hdPipelineAssets) { m_TotalVariantsInputCount += preStrippingCount; m_TotalVariantsOutputCount += (uint)inputData.Count; - LogShaderVariants(shader, snippet, hdAsset.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + LogShaderVariants(shader, snippet, HDDefaultSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index 1892d86e8cb..c16214e1284 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -51,6 +51,7 @@ public override void Action(int instanceId, string pathName, string resourceFile var newAsset = CreateInstance(); newAsset.name = Path.GetFileName(pathName); + // to prevent cases when the asset existed prior but then when upgrading the package, there is null field inside the resource asset ResourceReloader.ReloadAllNullIn(newAsset, HDUtils.GetHDRenderPipelinePath()); AssetDatabase.CreateAsset(newAsset, pathName); @@ -109,5 +110,31 @@ static void CreateRenderPipelineEditorResources() var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDRenderPipelineEditorResources.asset", icon, null); } + + internal class HDDefaultSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction + { + public override void Action(int instanceId, string pathName, string resourceFile) + { + var newAsset = HDDefaultSettings.Create(pathName, settings); + HDDefaultSettings.UpdateGraphicsSettings(newAsset); + ProjectWindowUtil.ShowCreatedAsset(newAsset); + } + + static HDDefaultSettings settings; + public static void Clone(HDDefaultSettings src) + { + settings = src; + var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); + var assetCreator = ScriptableObject.CreateInstance(); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/New HDDefaultSettings.asset", icon, null); + } + } + + [MenuItem("Assets/Create/Rendering/High Definition Default Settings Asset", priority = CoreUtils.assetCreateMenuPriority2)] + internal static void CreateHDDefaultSettings() + { + var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDDefaultSettings.asset", icon, null); + } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs new file mode 100644 index 00000000000..c0c7cb88af5 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs @@ -0,0 +1,35 @@ +using UnityEngine.Rendering.HighDefinition; +using UnityEngine; + +namespace UnityEditor.Rendering.HighDefinition +{ + [CustomEditor(typeof(HDDefaultSettings))] + [CanEditMultipleObjects] + sealed class HDDefaultSettingsEditor : Editor + { + SerializedHDDefaultSettings m_SerializedHDDefaultSettings; + + internal bool largeLabelWidth = true; + + void OnEnable() + { + m_SerializedHDDefaultSettings = new SerializedHDDefaultSettings(serializedObject); + } + + public override void OnInspectorGUI() + { + var serialized = m_SerializedHDDefaultSettings; + + serialized.serializedObject.Update(); + + // In the quality window use more space for the labels + if (!largeLabelWidth) + EditorGUIUtility.labelWidth *= 2; + DefaultSettingsPanelIMGUI.Inspector.Draw(serialized, this); + if (!largeLabelWidth) + EditorGUIUtility.labelWidth *= 0.5f; + + serialized.serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs index 15d312b3cd4..21c7989ce0a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs @@ -234,7 +234,7 @@ internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, Se EditorGUI.BeginProperty(rect, label, property); EditorGUI.BeginChangeCheck(); - int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDRenderPipeline.defaultAsset.decalLayerNames); + int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDRenderPipeline.currentAsset.decalLayerNames); //TODOJENNY if (EditorGUI.EndChangeCheck()) property.intValue = changedValue; @@ -251,7 +251,7 @@ internal static int DrawLightLayerMask(Rect rect, int value, GUIContent label = return lightLayer; EditorGUI.BeginChangeCheck(); - lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDRenderPipeline.defaultAsset.lightLayerNames); + lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDRenderPipeline.currentAsset.lightLayerNames); //TODOJENNY if (EditorGUI.EndChangeCheck()) lightLayer = HDAdditionalLightData.LightLayerToRenderingLayerMask(lightLayer, value); return lightLayer; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs index 9716567ee78..e293c1217bb 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs @@ -14,8 +14,6 @@ public class GeneralSection public static readonly GUIContent renderPipelineResourcesContent = EditorGUIUtility.TrTextContent("Render Pipeline Resources", "Set of resources that need to be loaded when creating stand alone"); public static readonly GUIContent renderPipelineRayTracingResourcesContent = EditorGUIUtility.TrTextContent("Render Pipeline Ray Tracing Resources", "Set of resources that need to be loaded when using ray tracing"); public static readonly GUIContent renderPipelineEditorResourcesContent = EditorGUIUtility.TrTextContent("Render Pipeline Editor Resources", "Set of resources that need to be loaded for working in editor"); - public static readonly GUIContent shaderVariantLogLevel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information appears in the Unity Console when the build finishes."); - public static readonly GUIContent lensAttenuationModeContent = EditorGUIUtility.TrTextContent("Lens Attenuation Mode", "Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier."); } public static readonly GUIContent generalSectionTitle = EditorGUIUtility.TrTextContent("General"); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs index 4c8c3bc927b..5da1b22f4d8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs @@ -13,9 +13,9 @@ static partial class HDRenderPipelineUI { enum Expandable { - CameraFrameSettings = 1 << 0, - BakedOrCustomProbeFrameSettings = 1 << 1, - RealtimeProbeFrameSettings = 1 << 2, + // CameraFrameSettings = 1 << 0, //obsolete + // BakedOrCustomProbeFrameSettings = 1 << 1, //obsolete + // RealtimeProbeFrameSettings = 1 << 2, //obsolete General = 1 << 3, Rendering = 1 << 4, Lighting = 1 << 5, @@ -44,7 +44,7 @@ enum Expandable FogQuality = 1 << 28 } - static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings | Expandable.General, "HDRP"); + static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.VirtualTexturing | Expandable.General, "HDRP"); enum ShadowResolutionValue { @@ -58,15 +58,6 @@ enum ShadowResolutionValue ShadowResolution16384 = 16384 } - internal enum SelectedFrameSettings - { - Camera, - BakedOrCustomReflection, - RealtimeReflection - } - - internal static SelectedFrameSettings selectedFrameSettings; - internal static VirtualTexturingSettingsUI virtualTexturingSettingsUI = new VirtualTexturingSettingsUI(); static HDRenderPipelineUI() @@ -103,127 +94,14 @@ static HDRenderPipelineUI() CED.FoldoutGroup(Styles.xrTitle, Expandable.XR, k_ExpandedState, Drawer_SectionXRSettings), CED.FoldoutGroup(Styles.virtualTexturingTitle, Expandable.VirtualTexturing, k_ExpandedState, Drawer_SectionVTSettings) ); - - // fix init of selection along what is serialized - if (k_ExpandedState[Expandable.BakedOrCustomProbeFrameSettings]) - selectedFrameSettings = SelectedFrameSettings.BakedOrCustomReflection; - else if (k_ExpandedState[Expandable.RealtimeProbeFrameSettings]) - selectedFrameSettings = SelectedFrameSettings.RealtimeReflection; - else //default value: camera - selectedFrameSettings = SelectedFrameSettings.Camera; } public static readonly CED.IDrawer Inspector; public static readonly CED.IDrawer GeneralSection = CED.Group(Drawer_SectionGeneral); - public static readonly CED.IDrawer FrameSettingsSection = CED.Group( - CED.Group( - (serialized, owner) => EditorGUILayout.BeginVertical("box"), - Drawer_TitleDefaultFrameSettings - ), - CED.Conditional( - (serialized, owner) => k_ExpandedState[Expandable.CameraFrameSettings], - CED.Select( - (serialized, owner) => serialized.defaultFrameSettings, - FrameSettingsUI.InspectorInnerbox(withOverride: false) - ) - ), - CED.Conditional( - (serialized, owner) => k_ExpandedState[Expandable.BakedOrCustomProbeFrameSettings], - CED.Select( - (serialized, owner) => serialized.defaultBakedOrCustomReflectionFrameSettings, - FrameSettingsUI.InspectorInnerbox(withOverride: false) - ) - ), - CED.Conditional( - (serialized, owner) => k_ExpandedState[Expandable.RealtimeProbeFrameSettings], - CED.Select( - (serialized, owner) => serialized.defaultRealtimeReflectionFrameSettings, - FrameSettingsUI.InspectorInnerbox(withOverride: false) - ) - ), - CED.Group((serialized, owner) => EditorGUILayout.EndVertical()) - ); - - static public void ApplyChangedDisplayedFrameSettings(SerializedHDRenderPipelineAsset serialized, Editor owner) - { - k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings | Expandable.BakedOrCustomProbeFrameSettings | Expandable.RealtimeProbeFrameSettings, false); - switch (selectedFrameSettings) - { - case SelectedFrameSettings.Camera: - k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings, true); - break; - case SelectedFrameSettings.BakedOrCustomReflection: - k_ExpandedState.SetExpandedAreas(Expandable.BakedOrCustomProbeFrameSettings, true); - break; - case SelectedFrameSettings.RealtimeReflection: - k_ExpandedState.SetExpandedAreas(Expandable.RealtimeProbeFrameSettings, true); - break; - } - } - - static void Drawer_TitleDefaultFrameSettings(SerializedHDRenderPipelineAsset serialized, Editor owner) - { - GUILayout.BeginHorizontal(); - EditorGUILayout.LabelField(Styles.defaultFrameSettingsContent, EditorStyles.boldLabel); - EditorGUI.BeginChangeCheck(); - selectedFrameSettings = (SelectedFrameSettings)EditorGUILayout.EnumPopup(selectedFrameSettings); - if (EditorGUI.EndChangeCheck()) - ApplyChangedDisplayedFrameSettings(serialized, owner); - GUILayout.EndHorizontal(); - } - static void Drawer_SectionGeneral(SerializedHDRenderPipelineAsset serialized, Editor owner) { - EditorGUILayout.PropertyField(serialized.renderPipelineResources, Styles.GeneralSection.renderPipelineResourcesContent); - - HDRenderPipeline hdrp = (RenderPipelineManager.currentPipeline as HDRenderPipeline); - if (hdrp != null && hdrp.rayTracingSupported) - EditorGUILayout.PropertyField(serialized.renderPipelineRayTracingResources, Styles.GeneralSection.renderPipelineRayTracingResourcesContent); - - // Not serialized as editor only datas... Retrieve them in data - EditorGUI.showMixedValue = serialized.editorResourceHasMultipleDifferentValues; - EditorGUI.BeginChangeCheck(); - var editorResources = EditorGUILayout.ObjectField(Styles.GeneralSection.renderPipelineEditorResourcesContent, serialized.firstEditorResources, typeof(HDRenderPipelineEditorResources), allowSceneObjects: false) as HDRenderPipelineEditorResources; - if (EditorGUI.EndChangeCheck()) - serialized.SetEditorResource(editorResources); - EditorGUI.showMixedValue = false; - - //EditorGUILayout.PropertyField(serialized.enableSRPBatcher, k_SRPBatcher); - EditorGUILayout.PropertyField(serialized.shaderVariantLogLevel, Styles.GeneralSection.shaderVariantLogLevel); - - EditorGUILayout.PropertyField(serialized.lensAttenuation, Styles.GeneralSection.lensAttenuationModeContent); - - m_ShowLightLayerNames = EditorGUILayout.Foldout(m_ShowLightLayerNames, Styles.lightLayerNamesText, true); - if (m_ShowLightLayerNames) - { - ++EditorGUI.indentLevel; - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName0, serialized.renderPipelineSettings.lightLayerName0); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName1, serialized.renderPipelineSettings.lightLayerName1); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName2, serialized.renderPipelineSettings.lightLayerName2); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName3, serialized.renderPipelineSettings.lightLayerName3); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName4, serialized.renderPipelineSettings.lightLayerName4); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName5, serialized.renderPipelineSettings.lightLayerName5); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName6, serialized.renderPipelineSettings.lightLayerName6); - HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName7, serialized.renderPipelineSettings.lightLayerName7); - --EditorGUI.indentLevel; - } - - m_ShowDecalLayerNames = EditorGUILayout.Foldout(m_ShowDecalLayerNames, Styles.decalLayerNamesText, true); - if (m_ShowDecalLayerNames) - { - ++EditorGUI.indentLevel; - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName0, serialized.renderPipelineSettings.decalLayerName0); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName1, serialized.renderPipelineSettings.decalLayerName1); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName2, serialized.renderPipelineSettings.decalLayerName2); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName3, serialized.renderPipelineSettings.decalLayerName3); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName4, serialized.renderPipelineSettings.decalLayerName4); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName5, serialized.renderPipelineSettings.decalLayerName5); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName6, serialized.renderPipelineSettings.decalLayerName6); - HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName7, serialized.renderPipelineSettings.decalLayerName7); - --EditorGUI.indentLevel; - } } static void Drawer_SectionCookies(SerializedHDRenderPipelineAsset serialized, Editor owner) @@ -333,8 +211,6 @@ static void Drawer_SectionSky(SerializedHDRenderPipelineAsset serialized, Editor } } - static private bool m_ShowLightLayerNames = false; - static private bool m_ShowDecalLayerNames = false; static private bool m_ShowDirectionalLightSection = false; static private bool m_ShowPunctualLightSection = false; static private bool m_ShowAreaLightSection = false; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 532e4816082..728e1289efb 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -9,6 +9,8 @@ namespace UnityEditor.Rendering.HighDefinition { + using CED = CoreEditorDrawer; + class DefaultSettingsPanelProvider { static DefaultSettingsPanelIMGUI s_IMGUIImpl = new DefaultSettingsPanelIMGUI(); @@ -16,326 +18,470 @@ class DefaultSettingsPanelProvider [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { - return new SettingsProvider("Project/HDRP Default Settings", SettingsScope.Project) + return new SettingsProvider("Project/Graphics/HDRP Default Settings", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()) - .Concat(OverridableFrameSettingsArea.frameSettingsKeywords).ToArray(), - guiHandler = s_IMGUIImpl.DoGUI, + .Concat(OverridableFrameSettingsArea.frameSettingsKeywords) + .ToArray(), + guiHandler = s_IMGUIImpl.DoGUI }; } + } + internal class DefaultSettingsPanelIMGUI + { + public class Styles + { + public const int labelWidth = 220; + internal static readonly GUIContent defaultSettingsAssetLabel = EditorGUIUtility.TrTextContent("Default Settings Asset"); + internal static readonly GUIContent defaultVolumeProfileLabel = EditorGUIUtility.TrTextContent("Default Volume Profile Asset"); + internal static readonly GUIContent lookDevVolumeProfileLabel = EditorGUIUtility.TrTextContent("LookDev Volume Profile Asset"); + internal static readonly GUIContent assetSelectionLabel = EditorGUIUtility.TrTextContent("Set Default Settings Profile for HDRP"); + internal static readonly GUIContent assetSelectionIntroLabel = EditorGUIUtility.TrTextContent("The HDRP Settings Profile is a unique asset allowing you to configure default settings and behaviors for any HDRP scene in your project."); + internal static readonly GUIContent resourceLabel = EditorGUIUtility.TrTextContent("Resources"); + internal static readonly GUIContent resourceIntroLabel = EditorGUIUtility.TrTextContent("Resources assets list the Shaders, Materials, Textures, and other Assets needed to operate the Render Pipeline."); + internal static readonly GUIContent frameSettingsLabel = EditorGUIUtility.TrTextContent("Frame Settings"); + internal static readonly GUIContent frameSettingsIntroLabel = EditorGUIUtility.TrTextContent("Frame Settings are settings HDRP uses to render Cameras, real-time, baked, and custom reflections. You can set the default Frame Settings for each of these three individually here:", "You can override the default Frame Settings on a per component basis. Enable the 'Custom Frame Settings' checkbox to set specific Frame Settings for individual Cameras and Reflection Probes."); + internal static readonly GUIContent volumeComponentsLabel = EditorGUIUtility.TrTextContent("Volume Profiles"); + internal static readonly GUIContent volumeComponentsIntroLabel = EditorGUIUtility.TrTextContent("A Volume Profile is a Scriptable Object which contains properties that Volumes use to determine how to render the Scene environment for Cameras they affect. You can define Volume Overrides default values for your project here:", "You can use Volume Overrides on Volume Profiles in your Scenes to override these values and customize the environment settings."); + internal static readonly GUIContent customPostProcessOrderLabel = EditorGUIUtility.TrTextContent("Custom Post Process Orders"); + internal static readonly GUIContent defaultFrameSettingsContent = EditorGUIUtility.TrTextContent("Applied to"); + internal static readonly GUIContent customPostProcessIntroLabel = EditorGUIUtility.TrTextContent("The High Definition Render Pipeline (HDRP) allows you to write your own post-processing effects that automatically integrate into Volume. HDRP allows you to customize the order of your custom post-processing effect at each injection point."); + + internal static readonly GUIContent renderPipelineResourcesContent = EditorGUIUtility.TrTextContent("Player Resources", "Set of resources that need to be loaded when creating stand alone"); + internal static readonly GUIContent renderPipelineRayTracingResourcesContent = EditorGUIUtility.TrTextContent("Ray Tracing Resources", "Set of resources that need to be loaded when using ray tracing"); + internal static readonly GUIContent renderPipelineEditorResourcesContent = EditorGUIUtility.TrTextContent("Editor Resources", "Set of resources that need to be loaded for working in editor"); + + internal static readonly GUIContent generalSettingsLabel = EditorGUIUtility.TrTextContent("Miscellaneous"); + + internal static readonly GUIContent layerNamesLabel = EditorGUIUtility.TrTextContent("Layers Names", "Light and Decal Layers are specific LayerMasks used to to make LightsDecals only affect Meshes that are on corresponding Light Layers, and to apply Decals only matching Mesh Renderer or Terrain. By default, Mesh Renderers, or Terrain, Decal Layers are named **Decal Layer 1-7**. To more easily differentiate between them, you can give each Decal Layer a specific name in this section."); + internal static readonly GUIContent layerNamesIntro = EditorGUIUtility.TrTextContent("By default, Mesh Renderers, or Terrain, Decal Layers are named **Decal Layer 1-7**. To more easily differentiate between them, you can give each Decal Layer a specific name in this section."); + + internal static readonly GUIContent lightLayersLabel = EditorGUIUtility.TrTextContent("Light Layers Names", "When enabled, HDRP allocates memory for processing Light Layers. For deferred rendering, this allocation includes an extra render target in memory and extra cost. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); + internal static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); + internal static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); + internal static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); + internal static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); + internal static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); + internal static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); + internal static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); + internal static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); + + internal static readonly GUIContent decalLayersLabel = EditorGUIUtility.TrTextContent("Decal Layers Names", "When enabled, HDRP allocates Shader variants and memory to the decals buffer and cluster decal. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); + internal static readonly GUIContent decalLayerName0 = EditorGUIUtility.TrTextContent("Decal Layer 0", "The display name for Decal Layer 0. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 0"); + internal static readonly GUIContent decalLayerName1 = EditorGUIUtility.TrTextContent("Decal Layer 1", "The display name for Decal Layer 1. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 1"); + internal static readonly GUIContent decalLayerName2 = EditorGUIUtility.TrTextContent("Decal Layer 2", "The display name for Decal Layer 2. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 2"); + internal static readonly GUIContent decalLayerName3 = EditorGUIUtility.TrTextContent("Decal Layer 3", "The display name for Decal Layer 3. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 3"); + internal static readonly GUIContent decalLayerName4 = EditorGUIUtility.TrTextContent("Decal Layer 4", "The display name for Decal Layer 4. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 4"); + internal static readonly GUIContent decalLayerName5 = EditorGUIUtility.TrTextContent("Decal Layer 5", "The display name for Decal Layer 5. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 5"); + internal static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); + internal static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); + + internal static readonly GUIContent shaderVariantLogLevel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information appears in the Unity Console when the build finishes.."); + + internal static readonly GUIContent lensAttenuationModeContent = EditorGUIUtility.TrTextContent("Lens Attenuation Mode", "Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier."); + + internal static GUIStyle sectionHeaderStyle = new GUIStyle(EditorStyles.boldLabel) { richText = true }; + internal static GUIStyle introStyle = new GUIStyle(EditorStyles.largeLabel) { wordWrap = true }; + } + + Vector2 m_ScrollViewPosition = Vector2.zero; + public static readonly CED.IDrawer Inspector; + + static bool m_verboseMode = false; + + static DefaultSettingsPanelIMGUI() + { + Inspector = CED.Group( + ResourcesSection, + CED.Group((serialized, owner) => EditorGUILayout.Space()), + FrameSettingsSection, + CED.Group((serialized, owner) => EditorGUILayout.Space()), + VolumeSection, + CED.Group((serialized, owner) => EditorGUILayout.Space()), + CustomPostProcessesSection, + CED.Group((serialized, owner) => EditorGUILayout.Space()), + LayerNamesSection + ); + // fix init of selection along what is serialized + if (k_ExpandedState[Expandable.BakedOrCustomProbeFrameSettings]) + selectedFrameSettings = SelectedFrameSettings.BakedOrCustomReflection; + else if (k_ExpandedState[Expandable.RealtimeProbeFrameSettings]) + selectedFrameSettings = SelectedFrameSettings.RealtimeReflection; + else //default value: camera + selectedFrameSettings = SelectedFrameSettings.Camera; + } - class DefaultSettingsPanelIMGUI + SerializedHDDefaultSettings serializedSettings; + HDDefaultSettings settingsSerialized; + DiffusionProfileSettingsListUI m_DiffusionProfileUI; + public void DoGUI(string searchContext) { - // A wrapper for CoreEditorDrawers - class CoreEditorDrawerEditorWrapper : Editor, IDefaultFrameSettingsType + if (HDRenderPipeline.currentPipeline == null) { - public FrameSettingsRenderType GetFrameSettingsType() - { - switch (HDRenderPipelineUI.selectedFrameSettings) - { - case HDRenderPipelineUI.SelectedFrameSettings.Camera: return FrameSettingsRenderType.Camera; - case HDRenderPipelineUI.SelectedFrameSettings.RealtimeReflection: return FrameSettingsRenderType.RealtimeReflection; - case HDRenderPipelineUI.SelectedFrameSettings.BakedOrCustomReflection: return FrameSettingsRenderType.CustomOrBakedReflection; - } - throw new Exception("unreachable"); - } + EditorGUILayout.HelpBox("No HDRP pipeline currently active (see Quality Settings active level).", MessageType.Warning); } - public class Styles + if ((serializedSettings == null) || (settingsSerialized != HDDefaultSettings.instance)) { - public const int labelWidth = 220; - public static GUIContent defaultHDRPAsset = new GUIContent("Asset with the default settings"); - public static GUIContent defaultVolumeProfileLabel = new GUIContent("Default Volume Profile Asset"); - public static GUIContent lookDevVolumeProfileLabel = new GUIContent("LookDev Volume Profile Asset"); - public static GUIContent frameSettingsLabel = new GUIContent("Frame Settings"); - public static GUIContent volumeComponentsLabel = new GUIContent("Volume Components"); - public static GUIContent customPostProcessOrderLabel = new GUIContent("Custom Post Process Orders"); - public static GUIContent diffusionProfileSettingsLabel = new GUIContent("Default Diffusion Profile Assets"); + settingsSerialized = HDDefaultSettings.instance; + var serializedObject = new SerializedObject(settingsSerialized); + serializedSettings = new SerializedHDDefaultSettings(serializedObject); } - - Vector2 m_ScrollViewPosition = Vector2.zero; - Editor m_CachedDefaultVolumeProfileEditor; - Editor m_CachedLookDevVolumeProfileEditor; - ReorderableList m_BeforeTransparentCustomPostProcesses; - ReorderableList m_BeforeTAACustomPostProcesses; - ReorderableList m_BeforePostProcessCustomPostProcesses; - ReorderableList m_AfterPostProcessCustomPostProcesses; - int m_CurrentVolumeProfileInstanceID; - private Editor m_Cache; - DiffusionProfileSettingsListUI m_DiffusionProfileUI; - SerializedHDRenderPipelineAsset m_SerializeHDRPAsset; - - public void DoGUI(string searchContext) + else { - if (HDRenderPipeline.defaultAsset == null) - { - EditorGUILayout.HelpBox("Base SRP Asset is not a HDRenderPipelineAsset.", MessageType.Warning); - return; - } - - m_SerializeHDRPAsset.Update(); + serializedSettings.serializedObject.Update(); + } + Draw_AssetSelection(ref serializedSettings, null); - m_ScrollViewPosition = GUILayout.BeginScrollView(m_ScrollViewPosition, EditorStyles.largeLabel); - Draw_GeneralSettings(); + if (settingsSerialized != null && serializedSettings != null) + { EditorGUILayout.Space(); + Inspector.Draw(serializedSettings, null); + } - EditorGUILayout.LabelField(Styles.frameSettingsLabel, EditorStyles.largeLabel); - Draw_DefaultFrameSettings(); - EditorGUILayout.Space(); + serializedSettings.serializedObject.ApplyModifiedProperties(); + } - EditorGUILayout.LabelField(Styles.volumeComponentsLabel, EditorStyles.largeLabel); - Draw_VolumeInspector(); - EditorGUILayout.Space(); + /// + /// Executed when activate is called from the settings provider. + /// + /// + /// + public void OnActivate(string searchContext, VisualElement rootElement) + { + m_ScrollViewPosition = Vector2.zero; + } - EditorGUILayout.LabelField(Styles.customPostProcessOrderLabel, EditorStyles.largeLabel); - Draw_CustomPostProcess(); + #region Global HDDefaultSettings asset selection + void Draw_AssetSelection(ref SerializedHDDefaultSettings serialized, Editor owner) + { + var oldWidth = EditorGUIUtility.labelWidth; + EditorGUIUtility.labelWidth = Styles.labelWidth; - EditorGUILayout.LabelField(Styles.diffusionProfileSettingsLabel, EditorStyles.largeLabel); - Draw_DiffusionProfileSettings(); - GUILayout.EndScrollView(); - } + if (m_verboseMode) + EditorGUILayout.LabelField(Styles.assetSelectionIntroLabel, Styles.introStyle); - /// - /// Executed when activate is called from the settings provider. - /// - /// - /// - public void OnActivate(string searchContext, VisualElement rootElement) + if (settingsSerialized == null) { - if (HDRenderPipeline.defaultAsset == null) - return; - - m_ScrollViewPosition = Vector2.zero; - InitializeCustomPostProcessesLists(); - - m_DiffusionProfileUI = new DiffusionProfileSettingsListUI() + EditorGUILayout.HelpBox("No active settings for HDRP. Rendering may be broken until a new one is assigned.", MessageType.Warning); + } + using (new EditorGUILayout.HorizontalScope()) + { + EditorGUI.BeginChangeCheck(); + var newAsset = (HDDefaultSettings)EditorGUILayout.ObjectField(settingsSerialized , typeof(HDDefaultSettings), false); + if (EditorGUI.EndChangeCheck()) { - drawElement = DrawDiffusionProfileElement - }; - - var serializedObject = new SerializedObject(HDRenderPipeline.defaultAsset); - m_SerializeHDRPAsset = new SerializedHDRenderPipelineAsset(serializedObject); + HDDefaultSettings.UpdateGraphicsSettings(newAsset); + EditorUtility.SetDirty(settingsSerialized); + } - var editorResources = HDRenderPipeline.defaultAsset.renderPipelineEditorResources; - if (!EditorUtility.IsPersistent(editorResources)) + if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a HD Default Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; - HDRenderPipeline.defaultAsset.renderPipelineEditorResources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); + HDAssetFactory.CreateHDDefaultSettings(); } + bool guiEnabled = GUI.enabled; + GUI.enabled = guiEnabled && (settingsSerialized != null); + if (GUILayout.Button(EditorGUIUtility.TrTextContent("Clone", "Clone a HD Default Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) + { + HDAssetFactory.HDDefaultSettingsCreator.Clone(settingsSerialized); + } + GUI.enabled = guiEnabled; } + EditorGUIUtility.labelWidth = oldWidth; + } + + #endregion // Global HDDefaultSettings asset selection - void InitializeCustomPostProcessesLists() + #region Resources + + static readonly CED.IDrawer ResourcesSection = CED.Group( + CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.resourceLabel, Styles.sectionHeaderStyle)), + CED.Group(Drawer_ResourcesSection) + ); + static void Drawer_ResourcesSection(SerializedHDDefaultSettings serialized, Editor owner) + { + if (m_verboseMode) + EditorGUILayout.LabelField(Styles.resourceIntroLabel, Styles.introStyle); + + using (new EditorGUI.IndentLevelScope()) { - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; + var oldWidth = EditorGUIUtility.labelWidth; + EditorGUIUtility.labelWidth = Styles.labelWidth; - var ppVolumeTypes = TypeCache.GetTypesDerivedFrom(); - var ppVolumeTypeInjectionPoints = new Dictionary(); - foreach (var ppVolumeType in ppVolumeTypes) - { - if (ppVolumeType.IsAbstract) - continue; + EditorGUILayout.PropertyField(serialized.renderPipelineResources, Styles.renderPipelineResourcesContent); + bool oldGuiEnabled = GUI.enabled; + GUI.enabled = false; - var comp = ScriptableObject.CreateInstance(ppVolumeType) as CustomPostProcessVolumeComponent; - ppVolumeTypeInjectionPoints[ppVolumeType] = comp.injectionPoint; - CoreUtils.Destroy(comp); - } + EditorGUILayout.PropertyField(serialized.renderPipelineRayTracingResources, Styles.renderPipelineRayTracingResourcesContent); - InitList(ref m_BeforeTransparentCustomPostProcesses, hdrpAsset.beforeTransparentCustomPostProcesses, "After Opaque And Sky", CustomPostProcessInjectionPoint.AfterOpaqueAndSky); - InitList(ref m_BeforeTAACustomPostProcesses, hdrpAsset.beforeTAACustomPostProcesses, "Before TAA", CustomPostProcessInjectionPoint.BeforeTAA); - InitList(ref m_BeforePostProcessCustomPostProcesses, hdrpAsset.beforePostProcessCustomPostProcesses, "Before Post Process", CustomPostProcessInjectionPoint.BeforePostProcess); - InitList(ref m_AfterPostProcessCustomPostProcesses, hdrpAsset.afterPostProcessCustomPostProcesses, "After Post Process", CustomPostProcessInjectionPoint.AfterPostProcess); + // Not serialized as editor only datas... Retrieve them in data + EditorGUI.showMixedValue = serialized.editorResourceHasMultipleDifferentValues; + var editorResources = EditorGUILayout.ObjectField(Styles.renderPipelineEditorResourcesContent, serialized.firstEditorResources, typeof(HDRenderPipelineEditorResources), allowSceneObjects: false) as HDRenderPipelineEditorResources; - void InitList(ref ReorderableList reorderableList, List customPostProcessTypes, string headerName, CustomPostProcessInjectionPoint injectionPoint) - { - // Sanitize the list: - customPostProcessTypes.RemoveAll(s => Type.GetType(s) == null); + EditorGUI.showMixedValue = false; - reorderableList = new ReorderableList(customPostProcessTypes, typeof(string)); - reorderableList.drawHeaderCallback = (rect) => - EditorGUI.LabelField(rect, headerName, EditorStyles.boldLabel); - reorderableList.drawElementCallback = (rect, index, isActive, isFocused) => - { - rect.height = EditorGUIUtility.singleLineHeight; - var elemType = Type.GetType(customPostProcessTypes[index]); - EditorGUI.LabelField(rect, elemType.ToString(), EditorStyles.boldLabel); - }; - reorderableList.onAddCallback = (list) => - { - var menu = new GenericMenu(); - - foreach (var kp in ppVolumeTypeInjectionPoints) - { - if (kp.Value == injectionPoint && !customPostProcessTypes.Contains(kp.Key.AssemblyQualifiedName)) - menu.AddItem(new GUIContent(kp.Key.ToString()), false, () => { - Undo.RegisterCompleteObjectUndo(hdrpAsset, $"Added {kp.Key.ToString()} Custom Post Process"); - customPostProcessTypes.Add(kp.Key.AssemblyQualifiedName); - }); - } - - if (menu.GetItemCount() == 0) - menu.AddDisabledItem(new GUIContent("No Custom Post Process Availble")); - - menu.ShowAsContext(); - EditorUtility.SetDirty(hdrpAsset); - }; - reorderableList.onRemoveCallback = (list) => - { - Undo.RegisterCompleteObjectUndo(hdrpAsset, $"Removed {list.list[list.index].ToString()} Custom Post Process"); - customPostProcessTypes.RemoveAt(list.index); - EditorUtility.SetDirty(hdrpAsset); - }; - reorderableList.elementHeightCallback = _ => EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - reorderableList.onReorderCallback = (list) => EditorUtility.SetDirty(hdrpAsset); - } + GUI.enabled = oldGuiEnabled; + EditorGUIUtility.labelWidth = oldWidth; } + } + + #endregion // Resources - void Draw_CustomPostProcess() + #region Frame Settings + + public enum SelectedFrameSettings + { + Camera, + BakedOrCustomReflection, + RealtimeReflection + } + + internal static SelectedFrameSettings selectedFrameSettings; + static readonly CED.IDrawer FrameSettingsSection = CED.Group( + CED.Group(Drawer_TitleDefaultFrameSettings), + CED.Group((serialized, owner) => EditorGUI.indentLevel++), + CED.Conditional( + (serialized, owner) => k_ExpandedState[Expandable.CameraFrameSettings], + CED.Select( + (serialized, owner) => serialized.defaultFrameSettings, + FrameSettingsUI.InspectorInnerbox(withOverride: false) + ) + ), + CED.Conditional( + (serialized, owner) => k_ExpandedState[Expandable.BakedOrCustomProbeFrameSettings], + CED.Select( + (serialized, owner) => serialized.defaultBakedOrCustomReflectionFrameSettings, + FrameSettingsUI.InspectorInnerbox(withOverride: false) + ) + ), + CED.Conditional( + (serialized, owner) => k_ExpandedState[Expandable.RealtimeProbeFrameSettings], + CED.Select( + (serialized, owner) => serialized.defaultRealtimeReflectionFrameSettings, + FrameSettingsUI.InspectorInnerbox(withOverride: false) + ) + ), + CED.Group((serialized, owner) => EditorGUI.indentLevel--) + ); + + + static void Drawer_TitleDefaultFrameSettings(SerializedHDDefaultSettings serialized, Editor owner) + { + EditorGUILayout.LabelField(Styles.frameSettingsLabel, Styles.sectionHeaderStyle); + + if (m_verboseMode) + EditorGUILayout.LabelField(Styles.frameSettingsIntroLabel, Styles.introStyle); + + using (new EditorGUILayout.HorizontalScope()) { - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; - - m_BeforeTransparentCustomPostProcesses.DoLayoutList(); - m_BeforeTAACustomPostProcesses.DoLayoutList(); - m_BeforePostProcessCustomPostProcesses.DoLayoutList(); - m_AfterPostProcessCustomPostProcesses.DoLayoutList(); + EditorGUILayout.LabelField(Styles.defaultFrameSettingsContent); + EditorGUI.BeginChangeCheck(); + selectedFrameSettings = (SelectedFrameSettings)EditorGUILayout.EnumPopup(selectedFrameSettings); + if (EditorGUI.EndChangeCheck()) + ApplyChangedDisplayedFrameSettings(serialized, owner); } + } - void Draw_GeneralSettings() - { - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - { - EditorGUILayout.HelpBox("Base SRP Asset is not a HDRenderPipelineAsset.", MessageType.Warning); - return; - } + enum Expandable + { + CameraFrameSettings = 1 << 0, //obsolete + BakedOrCustomProbeFrameSettings = 1 << 1, //obsolete + RealtimeProbeFrameSettings = 1 << 2, //obsolete + } - var oldWidth = EditorGUIUtility.labelWidth; - EditorGUIUtility.labelWidth = Styles.labelWidth; + static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings, "HDRP"); - GUI.enabled = false; - EditorGUILayout.ObjectField(Styles.defaultHDRPAsset, hdrpAsset, typeof(HDRenderPipelineAsset), false); - GUI.enabled = true; + static public void ApplyChangedDisplayedFrameSettings(SerializedHDDefaultSettings serialized, Editor owner) + { + k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings | Expandable.BakedOrCustomProbeFrameSettings | Expandable.RealtimeProbeFrameSettings, false); + switch (selectedFrameSettings) + { + case SelectedFrameSettings.Camera: + k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings, true); + break; + case SelectedFrameSettings.BakedOrCustomReflection: + k_ExpandedState.SetExpandedAreas(Expandable.BakedOrCustomProbeFrameSettings, true); + break; + case SelectedFrameSettings.RealtimeReflection: + k_ExpandedState.SetExpandedAreas(Expandable.RealtimeProbeFrameSettings, true); + break; + } + } - HDRenderPipelineUI.GeneralSection.Draw(m_SerializeHDRPAsset, null); + #endregion // Frame Settings - m_SerializeHDRPAsset.serializedObject.ApplyModifiedProperties(); - EditorGUIUtility.labelWidth = oldWidth; - } + #region Custom Post Processes - void Draw_VolumeInspector() + static readonly CED.IDrawer CustomPostProcessesSection = CED.Group( + CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.customPostProcessOrderLabel, Styles.sectionHeaderStyle)), + CED.Group(Drawer_CustomPostProcess) + ); + static void Drawer_CustomPostProcess(SerializedHDDefaultSettings serialized, Editor owner) + { + if (m_verboseMode) + EditorGUILayout.LabelField(Styles.customPostProcessIntroLabel, Styles.introStyle); + using (new EditorGUI.IndentLevelScope()) { - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; + serialized.uiBeforeTransparentCustomPostProcesses.DoLayoutList(); + serialized.uiBeforeTAACustomPostProcesses.DoLayoutList(); + serialized.uiBeforePostProcessCustomPostProcesses.DoLayoutList(); + serialized.uiAfterPostProcessCustomPostProcesses.DoLayoutList(); + } + } + + #endregion // Custom Post Processes + + #region Volume Profiles + static Editor m_CachedDefaultVolumeProfileEditor; + static Editor m_CachedLookDevVolumeProfileEditor; + static int m_CurrentVolumeProfileInstanceID; + static readonly CED.IDrawer VolumeSection = CED.Group( + CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.volumeComponentsLabel, Styles.sectionHeaderStyle)), + CED.Group(Drawer_VolumeSection) + ); + + static void Drawer_VolumeSection(SerializedHDDefaultSettings serialized, Editor owner) + { + if (m_verboseMode) + EditorGUILayout.LabelField(Styles.volumeComponentsIntroLabel, Styles.introStyle); + using (new EditorGUI.IndentLevelScope()) + { var oldWidth = EditorGUIUtility.labelWidth; EditorGUIUtility.labelWidth = Styles.labelWidth; - EditorGUILayout.BeginHorizontal(); - var asset = EditorDefaultSettings.GetOrAssignDefaultVolumeProfile(); - var newAsset = (VolumeProfile)EditorGUILayout.ObjectField(Styles.defaultVolumeProfileLabel, asset, typeof(VolumeProfile), false); - if (newAsset == null) - { - Debug.Log("Default Volume Profile Asset cannot be null. Rolling back to previous value."); - } - else if (newAsset != asset) + HDDefaultSettings defaultSettings = serialized.serializedObject.targetObject as HDDefaultSettings; + VolumeProfile asset = null; + using (new EditorGUILayout.HorizontalScope()) { - Undo.RegisterCompleteObjectUndo(hdrpAsset, "Default Volume Profile Asset Change."); - asset = newAsset; - hdrpAsset.defaultVolumeProfile = asset; - EditorUtility.SetDirty(hdrpAsset); - } + var oldAssetValue = serialized.volumeProfileDefault.objectReferenceValue; + EditorGUILayout.PropertyField(serialized.volumeProfileDefault, Styles.defaultVolumeProfileLabel); + asset = serialized.volumeProfileDefault.objectReferenceValue as VolumeProfile; + if (asset == null && oldAssetValue != null) + { + Debug.Log("Default Volume Profile Asset cannot be null. Rolling back to previous value."); + serialized.volumeProfileDefault.objectReferenceValue = oldAssetValue; + } - if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) - { - DefaultVolumeProfileCreator.CreateAndAssign(DefaultVolumeProfileCreator.Kind.Default); + if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) + { + VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.Default, defaultSettings); + } } - EditorGUILayout.EndHorizontal(); - // The state of the profile can change without the asset reference changing so in this case we need to reset the editor. - if (m_CurrentVolumeProfileInstanceID != asset.GetInstanceID() && m_CachedDefaultVolumeProfileEditor != null) + if (asset != null) { - m_CurrentVolumeProfileInstanceID = asset.GetInstanceID(); - m_CachedDefaultVolumeProfileEditor = null; - } + // The state of the profile can change without the asset reference changing so in this case we need to reset the editor. + if (m_CurrentVolumeProfileInstanceID != asset.GetInstanceID() && m_CachedDefaultVolumeProfileEditor != null) + { + m_CurrentVolumeProfileInstanceID = asset.GetInstanceID(); + m_CachedDefaultVolumeProfileEditor = null; + } - Editor.CreateCachedEditor(asset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedDefaultVolumeProfileEditor); - EditorGUIUtility.labelWidth -= 18; - bool oldEnabled = GUI.enabled; - GUI.enabled = AssetDatabase.IsOpenForEdit(asset); - m_CachedDefaultVolumeProfileEditor.OnInspectorGUI(); - GUI.enabled = oldEnabled; - EditorGUIUtility.labelWidth = oldWidth; + Editor.CreateCachedEditor(asset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedDefaultVolumeProfileEditor); + EditorGUIUtility.labelWidth -= 18; + bool oldEnabled = GUI.enabled; + GUI.enabled = AssetDatabase.IsOpenForEdit(asset); + m_CachedDefaultVolumeProfileEditor.OnInspectorGUI(); + GUI.enabled = oldEnabled; + EditorGUIUtility.labelWidth = oldWidth; + } EditorGUILayout.Space(); - EditorGUILayout.BeginHorizontal(); - var lookDevAsset = EditorDefaultSettings.GetOrAssignLookDevVolumeProfile(); - EditorGUIUtility.labelWidth = 221; - var newLookDevAsset = (VolumeProfile)EditorGUILayout.ObjectField(Styles.lookDevVolumeProfileLabel, lookDevAsset, typeof(VolumeProfile), false); - if (lookDevAsset == null) + VolumeProfile lookDevAsset = null; + using (new EditorGUILayout.HorizontalScope()) { - Debug.Log("LookDev Volume Profile Asset cannot be null. Rolling back to previous value."); - } - else if (newLookDevAsset != lookDevAsset) - { - hdrpAsset.defaultLookDevProfile = newLookDevAsset; - EditorUtility.SetDirty(hdrpAsset); - } + var oldAssetValue = serialized.volumeProfileLookDev.objectReferenceValue; + EditorGUILayout.PropertyField(serialized.volumeProfileLookDev, Styles.lookDevVolumeProfileLabel); + lookDevAsset = serialized.volumeProfileLookDev.objectReferenceValue as VolumeProfile; + if (lookDevAsset == null && oldAssetValue != null) + { + Debug.Log("LookDev Volume Profile Asset cannot be null. Rolling back to previous value."); + serialized.volumeProfileLookDev.objectReferenceValue = oldAssetValue; + } - if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) + if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) + { + VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.LookDev, defaultSettings); + } + } + if (lookDevAsset != null) { - DefaultVolumeProfileCreator.CreateAndAssign(DefaultVolumeProfileCreator.Kind.LookDev); + Editor.CreateCachedEditor(lookDevAsset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedLookDevVolumeProfileEditor); + EditorGUIUtility.labelWidth -= 18; + bool oldEnabled = GUI.enabled; + GUI.enabled = AssetDatabase.IsOpenForEdit(lookDevAsset); + m_CachedLookDevVolumeProfileEditor.OnInspectorGUI(); + GUI.enabled = oldEnabled; + EditorGUIUtility.labelWidth = oldWidth; + + if (lookDevAsset.Has()) + EditorGUILayout.HelpBox("VisualEnvironment is not modifiable and will be overridden by the LookDev", MessageType.Warning); + if (lookDevAsset.Has()) + EditorGUILayout.HelpBox("HDRISky is not modifiable and will be overridden by the LookDev", MessageType.Warning); } - EditorGUILayout.EndHorizontal(); - - Editor.CreateCachedEditor(lookDevAsset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedLookDevVolumeProfileEditor); - EditorGUIUtility.labelWidth -= 18; - oldEnabled = GUI.enabled; - GUI.enabled = AssetDatabase.IsOpenForEdit(asset); - m_CachedLookDevVolumeProfileEditor.OnInspectorGUI(); - GUI.enabled = oldEnabled; - EditorGUIUtility.labelWidth = oldWidth; - - if (lookDevAsset.Has()) - EditorGUILayout.HelpBox("VisualEnvironment is not modifiable and will be overridden by the LookDev", MessageType.Warning); - if (lookDevAsset.Has()) - EditorGUILayout.HelpBox("HDRISky is not modifiable and will be overridden by the LookDev", MessageType.Warning); } + } - void Draw_DefaultFrameSettings() - { - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; + #endregion // Volume Profiles - Editor.CreateCachedEditor(hdrpAsset, typeof(CoreEditorDrawerEditorWrapper), ref m_Cache); + #region General Settings (log level, layer names) - HDRenderPipelineUI.FrameSettingsSection.Draw(m_SerializeHDRPAsset, m_Cache); - m_SerializeHDRPAsset.serializedObject.ApplyModifiedProperties(); - } + static readonly CED.IDrawer LayerNamesSection = CED.Group( + CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.generalSettingsLabel, Styles.sectionHeaderStyle)), + CED.Group((serialized, owner) => EditorGUILayout.PropertyField(serialized.shaderVariantLogLevel, Styles.shaderVariantLogLevel)), + CED.Group(Drawer_LightLayerNames), + CED.Group(Drawer_DecalLayerNames)/*, + CED.Group((serialized,owner) => EditorGUILayout.PropertyField(serialized.lensAttenuation,Styles.lensAttenuationModeContent))*/ + ); - void DrawDiffusionProfileElement(SerializedProperty element, Rect rect, int index) + static private bool m_ShowLightLayerNames = false; + static private bool m_ShowDecalLayerNames = false; + static void Drawer_LightLayerNames(SerializedHDDefaultSettings serialized, Editor owner) + { + m_ShowLightLayerNames = EditorGUILayout.Foldout(m_ShowLightLayerNames, Styles.lightLayersLabel, true); + if (m_ShowLightLayerNames) { - EditorGUI.BeginChangeCheck(); - EditorGUI.ObjectField(rect, element, EditorGUIUtility.TrTextContent("Profile " + index)); - if (EditorGUI.EndChangeCheck()) - m_SerializeHDRPAsset.serializedObject.ApplyModifiedProperties(); + using (new EditorGUI.IndentLevelScope()) + { + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName0, serialized.lightLayerName0); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName1, serialized.lightLayerName1); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName2, serialized.lightLayerName2); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName3, serialized.lightLayerName3); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName4, serialized.lightLayerName4); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName5, serialized.lightLayerName5); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName6, serialized.lightLayerName6); + HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName7, serialized.lightLayerName7); + } } + } - void Draw_DiffusionProfileSettings() + static void Drawer_DecalLayerNames(SerializedHDDefaultSettings serialized, Editor owner) + { + m_ShowDecalLayerNames = EditorGUILayout.Foldout(m_ShowDecalLayerNames, Styles.decalLayersLabel, true); + if (m_ShowDecalLayerNames) { - m_DiffusionProfileUI.OnGUI(m_SerializeHDRPAsset.diffusionProfileSettingsList); + using (new EditorGUI.IndentLevelScope()) + { + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName0, serialized.decalLayerName0); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName1, serialized.decalLayerName1); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName2, serialized.decalLayerName2); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName3, serialized.decalLayerName3); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName4, serialized.decalLayerName4); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName5, serialized.decalLayerName5); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName6, serialized.decalLayerName6); + HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName7, serialized.decalLayerName7); + } } } + + #endregion } - class DefaultVolumeProfileCreator : ProjectWindowCallback.EndNameEditAction + class VolumeProfileCreator : ProjectWindowCallback.EndNameEditAction { public enum Kind { Default, LookDev } Kind m_Kind; @@ -351,16 +497,18 @@ public override void Action(int instanceId, string pathName, string resourceFile void Assign(VolumeProfile profile) { - var hdrpAsset = HDRenderPipeline.defaultAsset; switch (m_Kind) { case Kind.Default: - hdrpAsset.defaultVolumeProfile = profile; + if (settings != null) + settings.volumeProfile = profile; break; case Kind.LookDev: - hdrpAsset.defaultLookDevProfile = profile; + if (settings != null) + settings.volumeProfileLookDev = profile; break; } + EditorUtility.SetDirty(settings); } static string GetDefaultName(Kind kind) @@ -381,9 +529,12 @@ static string GetDefaultName(Kind kind) return defaultName; } - public static void CreateAndAssign(Kind kind) + static HDDefaultSettings settings; + public static void CreateAndAssign(Kind kind, HDDefaultSettings defaultSettings) { - var assetCreator = ScriptableObject.CreateInstance(); + settings = defaultSettings; + + var assetCreator = ScriptableObject.CreateInstance(); assetCreator.SetKind(kind); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{GetDefaultName(kind)}.asset", null, null); } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs index b08e0c09d33..7c6ca2d7dd2 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs @@ -2,6 +2,7 @@ using System.IO; using UnityEngine.Rendering.HighDefinition; using UnityEngine.Rendering; +using UnityEngine; namespace UnityEditor.Rendering.HighDefinition { @@ -11,10 +12,7 @@ static class EditorDefaultSettings /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignDefaultVolumeProfile() { - if (!(GraphicsSettings.renderPipelineAsset is HDRenderPipelineAsset hdrpAsset)) - return null; - - return GetOrAssignDefaultVolumeProfile(hdrpAsset); + return HDDefaultSettings.instance.GetOrCreateDefaultVolumeProfile(); } /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. @@ -22,24 +20,14 @@ internal static VolumeProfile GetOrAssignDefaultVolumeProfile() /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignDefaultVolumeProfile(HDRenderPipelineAsset hdrpAsset) { - if (hdrpAsset.defaultVolumeProfile == null || hdrpAsset.defaultVolumeProfile.Equals(null)) - { - hdrpAsset.defaultVolumeProfile = - hdrpAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile; - EditorUtility.SetDirty(hdrpAsset); - } - - return hdrpAsset.defaultVolumeProfile; + return GetOrAssignDefaultVolumeProfile(); } /// Get the current LookDev VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignLookDevVolumeProfile() { - if (!(GraphicsSettings.renderPipelineAsset is HDRenderPipelineAsset hdrpAsset)) - return null; - - return GetOrAssignLookDevVolumeProfile(hdrpAsset); + return GetOrAssignLookDevVolumeProfile(HDRenderPipeline.currentAsset); } /// Get the current LookDev VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. @@ -47,11 +35,7 @@ internal static VolumeProfile GetOrAssignLookDevVolumeProfile() /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignLookDevVolumeProfile(HDRenderPipelineAsset hdrpAsset) { - if (hdrpAsset.defaultLookDevProfile == null || hdrpAsset.defaultLookDevProfile.Equals(null)) - hdrpAsset.defaultLookDevProfile = - hdrpAsset.renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile; - - return hdrpAsset.defaultLookDevProfile; + return HDDefaultSettings.instance.GetOrAssignLookDevVolumeProfile(); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index f769a62783c..1981390301b 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs @@ -106,14 +106,18 @@ internal static CED.IDrawer InspectorInnerbox(bool withOverride = true) => CED.G ), CED.Group((serialized, owner) => { - RenderPipelineSettings hdrpSettings = GetHDRPAssetFor(owner).currentPlatformRenderPipelineSettings; - if (hdrpSettings.supportRayTracing) + var hdrpAsset = GetHDRPAssetFor(owner); + if (hdrpAsset != null) { - bool rtEffectUseAsync = (serialized.IsEnabled(FrameSettingsField.SSRAsync) ?? false) || (serialized.IsEnabled(FrameSettingsField.SSAOAsync) ?? false) - //|| (serialized.IsEnabled(FrameSettingsField.ContactShadowsAsync) ?? false) // Contact shadow async is not visible in the UI for now and defaults to true. - ; - if (rtEffectUseAsync) - EditorGUILayout.HelpBox("Asynchronous execution of Raytracing effects is not supported. Asynchronous Execution will be forced to false for them", MessageType.Warning); + RenderPipelineSettings hdrpSettings = hdrpAsset.currentPlatformRenderPipelineSettings; + if (hdrpSettings.supportRayTracing) + { + bool rtEffectUseAsync = (serialized.IsEnabled(FrameSettingsField.SSRAsync) ?? false) || (serialized.IsEnabled(FrameSettingsField.SSAOAsync) ?? false) + //|| (serialized.IsEnabled(FrameSettingsField.ContactShadowsAsync) ?? false) // Contact shadow async is not visible in the UI for now and defaults to true. + ; + if (rtEffectUseAsync) + EditorGUILayout.HelpBox("Asynchronous execution of Raytracing effects is not supported. Asynchronous Execution will be forced to false for them", MessageType.Warning); + } } })); @@ -135,118 +139,119 @@ static HDRenderPipelineAsset GetHDRPAssetFor(Editor owner) static FrameSettings GetDefaultFrameSettingsFor(Editor owner) { - HDRenderPipelineAsset hdrpAsset = GetHDRPAssetFor(owner); return owner is IDefaultFrameSettingsType getType - ? hdrpAsset.GetDefaultFrameSettings(getType.GetFrameSettingsType()) - : hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + ? HDDefaultSettings.instance.GetDefaultFrameSettings(getType.GetFrameSettingsType()) + : HDDefaultSettings.instance.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); } static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) { - RenderPipelineSettings hdrpSettings = GetHDRPAssetFor(owner).currentPlatformRenderPipelineSettings; + bool isGUIenabled = GUI.enabled; FrameSettings defaultFrameSettings = GetDefaultFrameSettingsFor(owner); - var area = OverridableFrameSettingsArea.GetGroupContent(0, defaultFrameSettings, serialized); - var frameSettingType = owner is IDefaultFrameSettingsType getType ? getType.GetFrameSettingsType() : FrameSettingsRenderType.Camera; + var area = OverridableFrameSettingsArea.GetGroupContent(0, defaultFrameSettings, serialized); - LitShaderMode defaultShaderLitMode; - switch (hdrpSettings.supportedLitShaderMode) + var hdrpAsset = GetHDRPAssetFor(owner); + if (hdrpAsset != null) { - case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: - defaultShaderLitMode = LitShaderMode.Forward; - break; - case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: - defaultShaderLitMode = LitShaderMode.Deferred; - break; - case RenderPipelineSettings.SupportedLitShaderMode.Both: - defaultShaderLitMode = defaultFrameSettings.litShaderMode; - break; - default: - throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); - } - - area.AmmendInfo(FrameSettingsField.LitShaderMode, - overrideable: () => hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.Both, - overridedDefaultValue: defaultShaderLitMode); - - bool hdrpAssetSupportForward = hdrpSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly; - bool hdrpAssetSupportDeferred = hdrpSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly; - bool hdrpAssetIsForward = hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly; - bool hdrpAssetIsDeferred = hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly; - - bool frameSettingsOverrideToForward = serialized.GetOverrides(FrameSettingsField.LitShaderMode) && serialized.litShaderMode == LitShaderMode.Forward; - bool frameSettingsOverrideToDeferred = serialized.GetOverrides(FrameSettingsField.LitShaderMode) && serialized.litShaderMode == LitShaderMode.Deferred; - bool defaultForwardUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Forward; - // Due to various reasons, MSAA and ray tracing are not compatible, if ray tracing is enabled on the asset. MSAA can not be enabled on the frame settings. - bool msaaEnablable = hdrpSettings.supportMSAA && ((hdrpAssetSupportForward && (frameSettingsOverrideToForward || defaultForwardUsed)) || hdrpAssetIsForward) && !hdrpSettings.supportRayTracing; - area.AmmendInfo(FrameSettingsField.MSAA, - overrideable: () => msaaEnablable, - overridedDefaultValue: msaaEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.MSAA), - customOverrideable: () => + RenderPipelineSettings hdrpSettings = hdrpAsset.currentPlatformRenderPipelineSettings; + LitShaderMode defaultShaderLitMode; + switch (hdrpSettings.supportedLitShaderMode) { - switch (hdrpSettings.supportedLitShaderMode) + case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: + defaultShaderLitMode = LitShaderMode.Forward; + break; + case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: + defaultShaderLitMode = LitShaderMode.Deferred; + break; + case RenderPipelineSettings.SupportedLitShaderMode.Both: + defaultShaderLitMode = defaultFrameSettings.litShaderMode; + break; + default: + throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); + } + + area.AmmendInfo(FrameSettingsField.LitShaderMode, + overrideable: () => hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.Both, + overridedDefaultValue: defaultShaderLitMode); + + bool hdrpAssetSupportForward = hdrpSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly; + bool hdrpAssetSupportDeferred = hdrpSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly; + bool hdrpAssetIsForward = hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly; + bool hdrpAssetIsDeferred = hdrpSettings.supportedLitShaderMode == RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly; + + bool frameSettingsOverrideToForward = serialized.GetOverrides(FrameSettingsField.LitShaderMode) && serialized.litShaderMode == LitShaderMode.Forward; + bool frameSettingsOverrideToDeferred = serialized.GetOverrides(FrameSettingsField.LitShaderMode) && serialized.litShaderMode == LitShaderMode.Deferred; + bool defaultForwardUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Forward; + // Due to various reasons, MSAA and ray tracing are not compatible, if ray tracing is enabled on the asset. MSAA can not be enabled on the frame settings. + bool msaaEnablable = hdrpSettings.supportMSAA && ((hdrpAssetSupportForward && (frameSettingsOverrideToForward || defaultForwardUsed)) || hdrpAssetIsForward) && !hdrpSettings.supportRayTracing; + area.AmmendInfo(FrameSettingsField.MSAA, + overrideable: () => msaaEnablable, + overridedDefaultValue: msaaEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.MSAA), + customOverrideable: () => { - case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: - return false; //negative dependency - case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: - return true; //negative dependency - case RenderPipelineSettings.SupportedLitShaderMode.Both: - return !(frameSettingsOverrideToForward || defaultForwardUsed); //negative dependency - default: - throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); - } - }); - - bool defaultDeferredUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Deferred; - bool depthPrepassEnablable = (hdrpAssetSupportDeferred && (defaultDeferredUsed || frameSettingsOverrideToDeferred)) || (hdrpAssetIsDeferred); - area.AmmendInfo(FrameSettingsField.DepthPrepassWithDeferredRendering, - overrideable: () => depthPrepassEnablable, - overridedDefaultValue: depthPrepassEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.DepthPrepassWithDeferredRendering), - customOverrideable: () => - { - switch (hdrpSettings.supportedLitShaderMode) + switch (hdrpSettings.supportedLitShaderMode) + { + case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: + return false; //negative dependency + case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: + return true; //negative dependency + case RenderPipelineSettings.SupportedLitShaderMode.Both: + return !(frameSettingsOverrideToForward || defaultForwardUsed); //negative dependency + default: + throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); + } + }); + + bool defaultDeferredUsed = !serialized.GetOverrides(FrameSettingsField.LitShaderMode) && defaultShaderLitMode == LitShaderMode.Deferred; + bool depthPrepassEnablable = (hdrpAssetSupportDeferred && (defaultDeferredUsed || frameSettingsOverrideToDeferred)) || (hdrpAssetIsDeferred); + area.AmmendInfo(FrameSettingsField.DepthPrepassWithDeferredRendering, + overrideable: () => depthPrepassEnablable, + overridedDefaultValue: depthPrepassEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.DepthPrepassWithDeferredRendering), + customOverrideable: () => { - case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: - return false; - case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: - return true; - case RenderPipelineSettings.SupportedLitShaderMode.Both: - return frameSettingsOverrideToDeferred || defaultDeferredUsed; - default: - throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); - } - }); - - bool clearGBufferEnablable = (hdrpAssetSupportDeferred && (defaultDeferredUsed || frameSettingsOverrideToDeferred)) || (hdrpAssetIsDeferred); - area.AmmendInfo(FrameSettingsField.ClearGBuffers, - overrideable: () => clearGBufferEnablable, - overridedDefaultValue: clearGBufferEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.ClearGBuffers), - customOverrideable: () => - { - switch (hdrpSettings.supportedLitShaderMode) + switch (hdrpSettings.supportedLitShaderMode) + { + case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: + return false; + case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: + return true; + case RenderPipelineSettings.SupportedLitShaderMode.Both: + return frameSettingsOverrideToDeferred || defaultDeferredUsed; + default: + throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); + } + }); + + bool clearGBufferEnablable = (hdrpAssetSupportDeferred && (defaultDeferredUsed || frameSettingsOverrideToDeferred)) || (hdrpAssetIsDeferred); + area.AmmendInfo(FrameSettingsField.ClearGBuffers, + overrideable: () => clearGBufferEnablable, + overridedDefaultValue: clearGBufferEnablable && defaultFrameSettings.IsEnabled(FrameSettingsField.ClearGBuffers), + customOverrideable: () => { - case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: - return false; - case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: - return true; - case RenderPipelineSettings.SupportedLitShaderMode.Both: - return frameSettingsOverrideToDeferred || defaultDeferredUsed; - default: - throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); - } - }); - - area.AmmendInfo(FrameSettingsField.RayTracing, overrideable: () => hdrpSettings.supportRayTracing); + switch (hdrpSettings.supportedLitShaderMode) + { + case RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly: + return false; + case RenderPipelineSettings.SupportedLitShaderMode.DeferredOnly: + return true; + case RenderPipelineSettings.SupportedLitShaderMode.Both: + return frameSettingsOverrideToDeferred || defaultDeferredUsed; + default: + throw new System.ArgumentOutOfRangeException("Unknown ShaderLitMode"); + } + }); + + area.AmmendInfo(FrameSettingsField.RayTracing, overrideable: () => hdrpSettings.supportRayTracing); #if !ENABLE_VIRTUALTEXTURES - area.AmmendInfo(FrameSettingsField.VirtualTexturing, overrideable: () => false); + area.AmmendInfo(FrameSettingsField.VirtualTexturing, overrideable: () => false); #endif - area.AmmendInfo(FrameSettingsField.MotionVectors, overrideable: () => hdrpSettings.supportMotionVectors); - area.AmmendInfo(FrameSettingsField.ObjectMotionVectors, overrideable: () => hdrpSettings.supportMotionVectors); - area.AmmendInfo(FrameSettingsField.TransparentsWriteMotionVector, overrideable: () => hdrpSettings.supportMotionVectors); - area.AmmendInfo(FrameSettingsField.Decals, overrideable: () => hdrpSettings.supportDecals); - area.AmmendInfo(FrameSettingsField.DecalLayers, overrideable: () => hdrpSettings.supportDecalLayers); - area.AmmendInfo(FrameSettingsField.Distortion, overrideable: () => hdrpSettings.supportDistortion); - + area.AmmendInfo(FrameSettingsField.MotionVectors, overrideable: () => hdrpSettings.supportMotionVectors); + area.AmmendInfo(FrameSettingsField.ObjectMotionVectors, overrideable: () => hdrpSettings.supportMotionVectors); + area.AmmendInfo(FrameSettingsField.TransparentsWriteMotionVector, overrideable: () => hdrpSettings.supportMotionVectors); + area.AmmendInfo(FrameSettingsField.Decals, overrideable: () => hdrpSettings.supportDecals); + area.AmmendInfo(FrameSettingsField.Distortion, overrideable: () => hdrpSettings.supportDistortion); + } area.AmmendInfo(FrameSettingsField.Postprocess, overrideable: () => (frameSettingType != FrameSettingsRenderType.CustomOrBakedReflection && frameSettingType != FrameSettingsRenderType.RealtimeReflection)); @@ -300,8 +305,8 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, customSetter: v => serialized.materialQuality.intValue = (int)((MaterialQualityMode)v).Into(), hasMixedValues: serialized.materialQuality.hasMultipleDifferentValues ); - area.Draw(withOverride); + GUI.enabled = isGUIenabled; } // Use an enum to have appropriate UI enum field in the frame setting api @@ -315,54 +320,61 @@ enum ScalableLevel3ForFrameSettingsUIOnly static void Drawer_SectionLightingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) { - RenderPipelineSettings hdrpSettings = GetHDRPAssetFor(owner).currentPlatformRenderPipelineSettings; - FrameSettings defaultFrameSettings = GetDefaultFrameSettingsFor(owner); - var area = OverridableFrameSettingsArea.GetGroupContent(1, defaultFrameSettings, serialized); - area.AmmendInfo(FrameSettingsField.Shadowmask, overrideable: () => hdrpSettings.supportShadowMask); - area.AmmendInfo(FrameSettingsField.SSR, overrideable: () => hdrpSettings.supportSSR); - area.AmmendInfo(FrameSettingsField.TransparentSSR, overrideable: () => (hdrpSettings.supportSSR && hdrpSettings.supportSSRTransparent)); - area.AmmendInfo(FrameSettingsField.SSAO, overrideable: () => hdrpSettings.supportSSAO); + bool isGUIenabled = GUI.enabled; - // SSS - area.AmmendInfo( - FrameSettingsField.SubsurfaceScattering, - overridedDefaultValue: hdrpSettings.supportSubsurfaceScattering, - overrideable: () => hdrpSettings.supportSubsurfaceScattering - ); - area.AmmendInfo( - FrameSettingsField.SssQualityMode, - overridedDefaultValue: SssQualityMode.FromQualitySettings, - customGetter: () => serialized.sssQualityMode.GetEnumValue(), - customSetter: v => serialized.sssQualityMode.SetEnumValue((SssQualityMode)v), - customOverrideable: () => hdrpSettings.supportSubsurfaceScattering - && (serialized.IsEnabled(FrameSettingsField.SubsurfaceScattering) ?? false), - hasMixedValues: serialized.sssQualityMode.hasMultipleDifferentValues - ); - area.AmmendInfo(FrameSettingsField.SssQualityLevel, - overridedDefaultValue: ScalableLevel3ForFrameSettingsUIOnly.Low, - customGetter: () => (ScalableLevel3ForFrameSettingsUIOnly)serialized.sssQualityLevel.intValue, // 3 levels - customSetter: v => serialized.sssQualityLevel.intValue = Math.Max(0, Math.Min((int)v, 2)), // Levels 0-2 - customOverrideable: () => hdrpSettings.supportSubsurfaceScattering - && (serialized.IsEnabled(FrameSettingsField.SubsurfaceScattering) ?? false) - && (serialized.sssQualityMode.GetEnumValue() == SssQualityMode.FromQualitySettings), - hasMixedValues: serialized.sssQualityLevel.hasMultipleDifferentValues - ); - area.AmmendInfo(FrameSettingsField.SssCustomSampleBudget, - overridedDefaultValue: (int)DefaultSssSampleBudgetForQualityLevel.Low, - customGetter: () => serialized.sssCustomSampleBudget.intValue, - customSetter: v => serialized.sssCustomSampleBudget.intValue = Math.Max(1, Math.Min((int)v, (int)DefaultSssSampleBudgetForQualityLevel.Max)), - customOverrideable: () => hdrpSettings.supportSubsurfaceScattering - && (serialized.IsEnabled(FrameSettingsField.SubsurfaceScattering) ?? false) - && (serialized.sssQualityMode.GetEnumValue() != SssQualityMode.FromQualitySettings), - hasMixedValues: serialized.sssCustomSampleBudget.hasMultipleDifferentValues - ); - - area.AmmendInfo(FrameSettingsField.Volumetrics, overrideable: () => hdrpSettings.supportVolumetrics); - area.AmmendInfo(FrameSettingsField.ReprojectionForVolumetrics, overrideable: () => hdrpSettings.supportVolumetrics); - area.AmmendInfo(FrameSettingsField.LightLayers, overrideable: () => hdrpSettings.supportLightLayers); - area.AmmendInfo(FrameSettingsField.ProbeVolume, overrideable: () => hdrpSettings.supportProbeVolume); - area.AmmendInfo(FrameSettingsField.ScreenSpaceShadows, overrideable: () => hdrpSettings.hdShadowInitParams.supportScreenSpaceShadows); - area.Draw(withOverride); + var hdrpAsset = GetHDRPAssetFor(owner); + if (hdrpAsset != null) //TODOJENNY? remove if when currentPlatformRenderPipelineSettings is in default + { + RenderPipelineSettings hdrpSettings = hdrpAsset.currentPlatformRenderPipelineSettings; + FrameSettings defaultFrameSettings = GetDefaultFrameSettingsFor(owner); + var area = OverridableFrameSettingsArea.GetGroupContent(1, defaultFrameSettings, serialized); + area.AmmendInfo(FrameSettingsField.Shadowmask, overrideable: () => hdrpSettings.supportShadowMask); + area.AmmendInfo(FrameSettingsField.SSR, overrideable: () => hdrpSettings.supportSSR); + area.AmmendInfo(FrameSettingsField.TransparentSSR, overrideable: () => (hdrpSettings.supportSSR && hdrpSettings.supportSSRTransparent)); + area.AmmendInfo(FrameSettingsField.SSAO, overrideable: () => hdrpSettings.supportSSAO); + + // SSS + area.AmmendInfo( + FrameSettingsField.SubsurfaceScattering, + overridedDefaultValue: hdrpSettings.supportSubsurfaceScattering, + overrideable: () => hdrpSettings.supportSubsurfaceScattering + ); + area.AmmendInfo( + FrameSettingsField.SssQualityMode, + overridedDefaultValue: SssQualityMode.FromQualitySettings, + customGetter: () => serialized.sssQualityMode.GetEnumValue(), + customSetter: v => serialized.sssQualityMode.SetEnumValue((SssQualityMode)v), + customOverrideable: () => hdrpSettings.supportSubsurfaceScattering + && (serialized.IsEnabled(FrameSettingsField.SubsurfaceScattering) ?? false), + hasMixedValues: serialized.sssQualityMode.hasMultipleDifferentValues + ); + area.AmmendInfo(FrameSettingsField.SssQualityLevel, + overridedDefaultValue: ScalableLevel3ForFrameSettingsUIOnly.Low, + customGetter: () => (ScalableLevel3ForFrameSettingsUIOnly)serialized.sssQualityLevel.intValue, // 3 levels + customSetter: v => serialized.sssQualityLevel.intValue = Math.Max(0, Math.Min((int)v, 2)), // Levels 0-2 + customOverrideable: () => hdrpSettings.supportSubsurfaceScattering + && (serialized.IsEnabled(FrameSettingsField.SubsurfaceScattering) ?? false) + && (serialized.sssQualityMode.GetEnumValue() == SssQualityMode.FromQualitySettings), + hasMixedValues: serialized.sssQualityLevel.hasMultipleDifferentValues + ); + area.AmmendInfo(FrameSettingsField.SssCustomSampleBudget, + overridedDefaultValue: (int)DefaultSssSampleBudgetForQualityLevel.Low, + customGetter: () => serialized.sssCustomSampleBudget.intValue, + customSetter: v => serialized.sssCustomSampleBudget.intValue = Math.Max(1, Math.Min((int)v, (int)DefaultSssSampleBudgetForQualityLevel.Max)), + customOverrideable: () => hdrpSettings.supportSubsurfaceScattering + && (serialized.IsEnabled(FrameSettingsField.SubsurfaceScattering) ?? false) + && (serialized.sssQualityMode.GetEnumValue() != SssQualityMode.FromQualitySettings), + hasMixedValues: serialized.sssCustomSampleBudget.hasMultipleDifferentValues + ); + + area.AmmendInfo(FrameSettingsField.Volumetrics, overrideable: () => hdrpSettings.supportVolumetrics); + area.AmmendInfo(FrameSettingsField.ReprojectionForVolumetrics, overrideable: () => hdrpSettings.supportVolumetrics); + area.AmmendInfo(FrameSettingsField.LightLayers, overrideable: () => hdrpSettings.supportLightLayers); + area.AmmendInfo(FrameSettingsField.ProbeVolume, overrideable: () => hdrpSettings.supportProbeVolume); + area.AmmendInfo(FrameSettingsField.ScreenSpaceShadows, overrideable: () => hdrpSettings.hdShadowInitParams.supportScreenSpaceShadows); + area.Draw(withOverride); + } + GUI.enabled = isGUIenabled; } static void Drawer_SectionAsyncComputeSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) @@ -379,7 +391,6 @@ static void Drawer_SectionLightLoopSettings(SerializedFrameSettings serialized, static OverridableFrameSettingsArea GetFrameSettingSectionContent(int group, SerializedFrameSettings serialized, Editor owner) { - RenderPipelineSettings hdrpSettings = GetHDRPAssetFor(owner).currentPlatformRenderPipelineSettings; FrameSettings defaultFrameSettings = GetDefaultFrameSettingsFor(owner); var area = OverridableFrameSettingsArea.GetGroupContent(group, defaultFrameSettings, serialized); return area; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs index 2793aae3d0f..237776371d8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs @@ -58,17 +58,17 @@ ref FrameSettings GetData(Object obj) return ref (obj as HDAdditionalCameraData).renderingPathCustomFrameSettings; if (obj is HDProbe) return ref (obj as HDProbe).frameSettings; - if (obj is HDRenderPipelineAsset) - switch (HDRenderPipelineUI.selectedFrameSettings) + if (obj is HDDefaultSettings) + switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) { - case HDRenderPipelineUI.SelectedFrameSettings.Camera: - return ref (obj as HDRenderPipelineAsset).GetDefaultFrameSettings(FrameSettingsRenderType.Camera); - case HDRenderPipelineUI.SelectedFrameSettings.BakedOrCustomReflection: - return ref (obj as HDRenderPipelineAsset).GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); - case HDRenderPipelineUI.SelectedFrameSettings.RealtimeReflection: - return ref (obj as HDRenderPipelineAsset).GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: + return ref (obj as HDDefaultSettings).GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: + return ref (obj as HDDefaultSettings).GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: + return ref (obj as HDDefaultSettings).GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); default: - throw new System.ArgumentException("Unknown kind of HDRenderPipelineUI.SelectedFrameSettings"); + throw new System.ArgumentException("Unknown kind of DefaultSettingsPanelIMGUI.SelectedFrameSettings"); } throw new System.ArgumentException("Unknown kind of object"); } @@ -79,7 +79,7 @@ ref FrameSettings GetData(Object obj) return (obj as HDAdditionalCameraData).renderingPathCustomFrameSettingsOverrideMask; if (obj is HDProbe) return (obj as HDProbe).frameSettingsOverrideMask; - if (obj is HDRenderPipelineAsset) + if (obj is HDDefaultSettings) return null; throw new System.ArgumentException("Unknown kind of object"); } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs new file mode 100644 index 00000000000..76f5d1ae0b8 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs @@ -0,0 +1,181 @@ +using System.Collections.Generic; +using UnityEditor.Rendering; +using UnityEngine.Rendering.HighDefinition; +using UnityEditorInternal; //ReorderableList +using UnityEngine; //ScriptableObject +using UnityEngine.Rendering; //CoreUtils.Destroy +using System; //Type + +namespace UnityEditor.Rendering.HighDefinition +{ + class SerializedHDDefaultSettings + { + public SerializedObject serializedObject; + + public SerializedProperty renderPipelineResources; + public SerializedProperty renderPipelineRayTracingResources; + + public SerializedFrameSettings defaultFrameSettings; + public SerializedFrameSettings defaultBakedOrCustomReflectionFrameSettings; + public SerializedFrameSettings defaultRealtimeReflectionFrameSettings; + + public SerializedProperty volumeProfileDefault; + public SerializedProperty volumeProfileLookDev; + + public SerializedProperty lightLayerName0; + public SerializedProperty lightLayerName1; + public SerializedProperty lightLayerName2; + public SerializedProperty lightLayerName3; + public SerializedProperty lightLayerName4; + public SerializedProperty lightLayerName5; + public SerializedProperty lightLayerName6; + public SerializedProperty lightLayerName7; + + public SerializedProperty decalLayerName0; + public SerializedProperty decalLayerName1; + public SerializedProperty decalLayerName2; + public SerializedProperty decalLayerName3; + public SerializedProperty decalLayerName4; + public SerializedProperty decalLayerName5; + public SerializedProperty decalLayerName6; + public SerializedProperty decalLayerName7; + + public SerializedProperty shaderVariantLogLevel; + public SerializedProperty lensAttenuation; + public SerializedProperty diffusionProfileSettingsList; + + //RenderPipelineResources not always exist and thus cannot be serialized normally. + public bool editorResourceHasMultipleDifferentValues + { + get + { + var initialValue = firstEditorResources; + for (int index = 1; index < serializedObject.targetObjects.Length; ++index) + { + if (initialValue != (serializedObject.targetObjects[index] as HDDefaultSettings)?.renderPipelineEditorResources) + return true; + } + return false; + } + } + + public HDRenderPipelineEditorResources firstEditorResources + => (serializedObject.targetObjects[0] as HDDefaultSettings)?.renderPipelineEditorResources; + + public SerializedHDDefaultSettings(SerializedObject serializedObject) + { + this.serializedObject = serializedObject; + + renderPipelineResources = serializedObject.FindProperty("m_RenderPipelineResources"); + renderPipelineRayTracingResources = serializedObject.FindProperty("m_RenderPipelineRayTracingResources"); + defaultFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultCameraFrameSettings"), null); //no overrides in HDRPAsset + defaultBakedOrCustomReflectionFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings"), null); //no overrides in HDRPAsset + defaultRealtimeReflectionFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultRealtimeReflectionFrameSettings"), null); //no overrides in HDRPAsset + + // We are using ReorderableList for the UI. Since the integration with SerializedProperty is still WIP, in the meantime we will not use one + InitializeCustomPostProcessesLists(); + + volumeProfileDefault = serializedObject.FindProperty("m_VolumeProfileDefault"); + volumeProfileLookDev = serializedObject.FindProperty("m_VolumeProfileLookDev"); + + lightLayerName0 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName0); + lightLayerName1 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName1); + lightLayerName2 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName2); + lightLayerName3 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName3); + lightLayerName4 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName4); + lightLayerName5 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName5); + lightLayerName6 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName6); + lightLayerName7 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName7); + + decalLayerName0 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName0); + decalLayerName1 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName1); + decalLayerName2 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName2); + decalLayerName3 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName3); + decalLayerName4 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName4); + decalLayerName5 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName5); + decalLayerName6 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName6); + decalLayerName7 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName7); + + shaderVariantLogLevel = serializedObject.Find((HDDefaultSettings s) => s.shaderVariantLogLevel); + + lensAttenuation = serializedObject.FindProperty("m_LensAttenuation"); + diffusionProfileSettingsList = serializedObject.Find((HDDefaultSettings s) => s.diffusionProfileSettingsList); + } + + internal ReorderableList uiBeforeTransparentCustomPostProcesses; + internal ReorderableList uiBeforeTAACustomPostProcesses; + internal ReorderableList uiBeforePostProcessCustomPostProcesses; + internal ReorderableList uiAfterPostProcessCustomPostProcesses; + + void InitializeCustomPostProcessesLists() + { + if (uiBeforeTransparentCustomPostProcesses != null) + return; + + var ppVolumeTypeInjectionPoints = new Dictionary(); + + var ppVolumeTypes = TypeCache.GetTypesDerivedFrom(); + foreach (var ppVolumeType in ppVolumeTypes) + { + if (ppVolumeType.IsAbstract) + continue; + + var comp = ScriptableObject.CreateInstance(ppVolumeType) as CustomPostProcessVolumeComponent; + ppVolumeTypeInjectionPoints[ppVolumeType] = comp.injectionPoint; + CoreUtils.Destroy(comp); + } + var defaultSettings = serializedObject.targetObject as HDDefaultSettings; + InitList(ref uiBeforeTransparentCustomPostProcesses, defaultSettings.beforeTransparentCustomPostProcesses, "After Opaque And Sky", CustomPostProcessInjectionPoint.AfterOpaqueAndSky); + InitList(ref uiBeforePostProcessCustomPostProcesses, defaultSettings.beforePostProcessCustomPostProcesses, "Before Post Process", CustomPostProcessInjectionPoint.BeforePostProcess); + InitList(ref uiAfterPostProcessCustomPostProcesses, defaultSettings.afterPostProcessCustomPostProcesses, "After Post Process", CustomPostProcessInjectionPoint.AfterPostProcess); + InitList(ref uiBeforeTAACustomPostProcesses, defaultSettings.beforeTAACustomPostProcesses, "Before TAA", CustomPostProcessInjectionPoint.BeforeTAA); + + void InitList(ref ReorderableList reorderableList, List customPostProcessTypes, string headerName, CustomPostProcessInjectionPoint injectionPoint) + { + // Sanitize the list + customPostProcessTypes.RemoveAll(s => Type.GetType(s) == null); + + reorderableList = new ReorderableList(customPostProcessTypes, typeof(string)); + reorderableList.drawHeaderCallback = (rect) => + EditorGUI.LabelField(rect, headerName, EditorStyles.label); + reorderableList.drawElementCallback = (rect, index, isActive, isFocused) => + { + rect.height = EditorGUIUtility.singleLineHeight; + var elemType = Type.GetType(customPostProcessTypes[index]); + EditorGUI.LabelField(rect, elemType.ToString(), EditorStyles.boldLabel); + }; + reorderableList.onAddCallback = (list) => + { + var menu = new GenericMenu(); + + foreach (var kp in ppVolumeTypeInjectionPoints) + { + if (kp.Value == injectionPoint && !customPostProcessTypes.Contains(kp.Key.AssemblyQualifiedName)) + menu.AddItem(new GUIContent(kp.Key.ToString()), false, () => + { + Undo.RegisterCompleteObjectUndo(serializedObject.targetObject, $"Added {kp.Key.ToString()} Custom Post Process"); + customPostProcessTypes.Add(kp.Key.AssemblyQualifiedName); + }); + } + + if (menu.GetItemCount() == 0) + menu.AddDisabledItem(new GUIContent("No Custom Post Process Available")); + + menu.ShowAsContext(); + EditorUtility.SetDirty(serializedObject.targetObject); + }; + reorderableList.onRemoveCallback = (list) => + { + Undo.RegisterCompleteObjectUndo(serializedObject.targetObject, $"Removed {list.list[list.index].ToString()} Custom Post Process"); + customPostProcessTypes.RemoveAt(list.index); + EditorUtility.SetDirty(serializedObject.targetObject); + }; + reorderableList.elementHeightCallback = _ => EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + reorderableList.onReorderCallback = (list) => + { + EditorUtility.SetDirty(serializedObject.targetObject); + }; + } + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineAsset.cs index 337f0c3933a..3abe39ea066 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineAsset.cs @@ -7,44 +7,13 @@ class SerializedHDRenderPipelineAsset { public SerializedObject serializedObject; - public SerializedProperty renderPipelineResources; public SerializedProperty defaultMaterialQualityLevel; public SerializedProperty availableMaterialQualityLevels; - public SerializedProperty renderPipelineRayTracingResources; - public SerializedProperty diffusionProfileSettingsList; public SerializedProperty allowShaderVariantStripping; public SerializedProperty enableSRPBatcher; - public SerializedProperty shaderVariantLogLevel; - public SerializedProperty lensAttenuation; public SerializedRenderPipelineSettings renderPipelineSettings; - public SerializedFrameSettings defaultFrameSettings; - public SerializedFrameSettings defaultBakedOrCustomReflectionFrameSettings; - public SerializedFrameSettings defaultRealtimeReflectionFrameSettings; public SerializedVirtualTexturingSettings virtualTexturingSettings; - //RenderPipelineResources not always exist and thus cannot be serialized normally. - public bool editorResourceHasMultipleDifferentValues - { - get - { - var initialValue = firstEditorResources; - for (int index = 1; index < serializedObject.targetObjects.Length; ++index) - { - if (initialValue != (serializedObject.targetObjects[index] as HDRenderPipelineAsset)?.renderPipelineEditorResources) - return true; - } - return false; - } - } - - public HDRenderPipelineEditorResources firstEditorResources - => (serializedObject.targetObjects[0] as HDRenderPipelineAsset)?.renderPipelineEditorResources; - - public void SetEditorResource(HDRenderPipelineEditorResources value) - { - for (int index = 0; index < serializedObject.targetObjects.Length; ++index) - (serializedObject.targetObjects[index] as HDRenderPipelineAsset).renderPipelineEditorResources = value; - } public SerializedHDRenderPipelineAsset(SerializedObject serializedObject) { @@ -52,19 +21,10 @@ public SerializedHDRenderPipelineAsset(SerializedObject serializedObject) defaultMaterialQualityLevel = serializedObject.FindProperty("m_DefaultMaterialQualityLevel"); availableMaterialQualityLevels = serializedObject.Find((HDRenderPipelineAsset s) => s.availableMaterialQualityLevels); - - renderPipelineResources = serializedObject.FindProperty("m_RenderPipelineResources"); - renderPipelineRayTracingResources = serializedObject.FindProperty("m_RenderPipelineRayTracingResources"); - diffusionProfileSettingsList = serializedObject.Find((HDRenderPipelineAsset s) => s.diffusionProfileSettingsList); allowShaderVariantStripping = serializedObject.Find((HDRenderPipelineAsset s) => s.allowShaderVariantStripping); enableSRPBatcher = serializedObject.Find((HDRenderPipelineAsset s) => s.enableSRPBatcher); - shaderVariantLogLevel = serializedObject.Find((HDRenderPipelineAsset s) => s.shaderVariantLogLevel); - lensAttenuation = serializedObject.FindProperty("m_LensAttenuation"); renderPipelineSettings = new SerializedRenderPipelineSettings(serializedObject.FindProperty("m_RenderPipelineSettings")); - defaultFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultCameraFrameSettings"), null); //no overrides in HDRPAsset - defaultBakedOrCustomReflectionFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings"), null); //no overrides in HDRPAsset - defaultRealtimeReflectionFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultRealtimeReflectionFrameSettings"), null); //no overrides in HDRPAsset virtualTexturingSettings = new SerializedVirtualTexturingSettings(serializedObject.FindProperty("virtualTexturingSettings")); } diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs index 822100f53c3..1c019306bcc 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs @@ -14,7 +14,7 @@ void ISceneTemplatePipeline.BeforeTemplateInstantiation(SceneTemplateAsset scene bool ISceneTemplatePipeline.IsValidTemplateForInstantiation(SceneTemplateAsset sceneTemplateAsset) { - var hdrpAsset = HDRenderPipeline.defaultAsset; + var hdrpAsset = HDRenderPipeline.currentAsset; //TODOJENNY - this used to be defaultAsset if (hdrpAsset == null) return false; return hdrpAsset.currentPlatformRenderPipelineSettings.supportRayTracing; diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs index f535dc31ef8..2e51cd1fea0 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs @@ -14,7 +14,7 @@ void ISceneTemplatePipeline.BeforeTemplateInstantiation(SceneTemplateAsset scene bool ISceneTemplatePipeline.IsValidTemplateForInstantiation(SceneTemplateAsset sceneTemplateAsset) { - var hdrpAsset = HDRenderPipeline.defaultAsset; + var hdrpAsset = HDRenderPipeline.currentAsset; //TODOJENNY - this used to be defaultAsset if (hdrpAsset == null) return false; return !hdrpAsset.currentPlatformRenderPipelineSettings.supportRayTracing; diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index 4c7d8375220..d4fbaa79f2f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -393,44 +393,24 @@ void FixHdrpAssetUsed(bool fromAsync) bool IsHdrpAssetRuntimeResourcesCorrect() => IsHdrpAssetUsedCorrect() - && HDRenderPipeline.defaultAsset.renderPipelineResources != null; + && HDDefaultSettings.instance.AreResourcesCreated(); void FixHdrpAssetRuntimeResources(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; - - var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; - var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); - hdrpAsset.renderPipelineEditorResources = objs != null && objs.Length > 0 ? objs.First() as HDRenderPipelineEditorResources : null; - if (ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineEditorResources, - HDUtils.GetHDRenderPipelinePath())) - { - InternalEditorUtility.SaveToSerializedFileAndForget( - new UnityEngine.Object[] { HDRenderPipeline.defaultAsset.renderPipelineEditorResources }, - editorResourcesPath, - true); - } + HDDefaultSettings.instance.EnsureResources(forceReload: true); } bool IsHdrpAssetEditorResourcesCorrect() => IsHdrpAssetUsedCorrect() - && HDRenderPipeline.defaultAsset.renderPipelineEditorResources != null; + && HDDefaultSettings.instance.AreEditorResourcesCreated(); void FixHdrpAssetEditorResources(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; - - hdrpAsset.renderPipelineEditorResources - = AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"); - ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineEditorResources, HDUtils.GetHDRenderPipelinePath()); + HDDefaultSettings.instance.EnsureEditorResources(forceReload: true); } bool IsSRPBatcherCorrect() @@ -440,7 +420,7 @@ void FixSRPBatcher(bool fromAsyncUnused) if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.defaultAsset; + var hdrpAsset = HDRenderPipeline.currentAsset; if (hdrpAsset == null) return; @@ -464,7 +444,7 @@ void FixHdrpAssetDiffusionProfile(bool fromAsyncUnused) return; var defaultAssetList = hdrpAsset.renderPipelineEditorResources.defaultDiffusionProfileSettingsList; - hdrpAsset.diffusionProfileSettingsList = new DiffusionProfileSettings[0]; // clear the diffusion profile list + HDRenderPipeline.defaultAsset.diffusionProfileSettingsList = new DiffusionProfileSettings[0]; // clear the diffusion profile list foreach (var diffusionProfileAsset in defaultAssetList) { @@ -472,7 +452,7 @@ void FixHdrpAssetDiffusionProfile(bool fromAsyncUnused) AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(diffusionProfileAsset), defaultDiffusionProfileSettingsPath); var userAsset = AssetDatabase.LoadAssetAtPath(defaultDiffusionProfileSettingsPath); - hdrpAsset.AddDiffusionProfile(userAsset); + HDRenderPipeline.defaultAsset.AddDiffusionProfile(userAsset); } EditorUtility.SetDirty(hdrpAsset); @@ -483,10 +463,7 @@ bool IsDefaultVolumeProfileAssigned() if (!IsHdrpAssetUsedCorrect()) return false; - var hdAsset = HDRenderPipeline.currentAsset; - return hdAsset.defaultVolumeProfile != null - && !hdAsset.defaultVolumeProfile.Equals(null) - && hdAsset.defaultVolumeProfile != hdAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile; + return HDDefaultSettings.instance.IsVolumeProfileFromResources(); } void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) @@ -498,7 +475,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) if (hdrpAsset == null) return; - VolumeProfile defaultSettingsVolumeProfileInPackage = hdrpAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile; + VolumeProfile defaultSettingsVolumeProfileInPackage = HDDefaultSettings.instance.renderPipelineEditorResources.defaultSettingsVolumeProfile; string defaultSettingsVolumeProfilePath = "Assets/" + HDProjectSettings.projectSettingsFolderPath + '/' + defaultSettingsVolumeProfileInPackage.name + ".asset"; //try load one if one already exist @@ -509,7 +486,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(defaultSettingsVolumeProfileInPackage), defaultSettingsVolumeProfilePath); defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath(defaultSettingsVolumeProfilePath); } - hdrpAsset.defaultVolumeProfile = defaultSettingsVolumeProfile; + HDDefaultSettings.instance.volumeProfile = defaultSettingsVolumeProfile; EditorUtility.SetDirty(hdrpAsset); } @@ -582,6 +559,7 @@ void FixDXRAutoGraphicsAPI(bool fromAsyncUnused) bool IsDXRDirect3D12Correct() => PlayerSettings.GetGraphicsAPIs(CalculateSelectedBuildTarget()).FirstOrDefault() == GraphicsDeviceType.Direct3D12 && !HDProjectSettings.wizardNeedRestartAfterChangingToDX12; + void FixDXRDirect3D12(bool fromAsyncUnused) { if (GetSupportedGraphicsAPIs(CalculateSelectedBuildTarget()).Contains(GraphicsDeviceType.Direct3D12)) @@ -638,16 +616,15 @@ void CheckPersistantNeedReboot() } bool IsDXRAssetCorrect() - => HDRenderPipeline.defaultAsset != null - && HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources != null + => HDDefaultSettings.instance.AreRayTracingResourcesCreated() && SystemInfo.supportsRayTracing; void FixDXRAsset(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources - = AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"); - ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); + + HDDefaultSettings.instance.EnsureRayTracingResources(forceReload: true); + // IMPORTANT: We display the error only if we are D3D12 as the supportsRayTracing always return false in any other device even if OS/HW supports DXR. // The D3D12 is a separate check in the wizard, so it is fine not to display an error in case we are not D3D12. if (!SystemInfo.supportsRayTracing && IsDXRDirect3D12Correct()) @@ -664,7 +641,7 @@ bool IsDXRScreenSpaceShadowCorrect() bool IsDXRScreenSpaceShadowFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -680,7 +657,7 @@ bool IsDXRReflectionsCorrect() bool IsDXRReflectionsFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -696,7 +673,7 @@ bool IsDXRTransparentReflectionsCorrect() bool IsDXRTransparentReflectionsFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -712,7 +689,7 @@ bool IsDXRGICorrect() bool IsDXRGIFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -945,7 +922,7 @@ void Start(string packageName, Action action) void Progress() { - //Can occures on Wizard close or if scripts reloads + //Can occur on Wizard close or if scripts reloads if (m_CurrentRequest == null || m_CurrentRequest.Equals(null)) { EditorApplication.update -= Progress; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index 103a3bc93f7..2bfa2532f2a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -186,18 +186,18 @@ bool ValidatePipeline() m_AlphaSupport = AlphaChannelSupport.Rendering; } - int indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); + int indx = HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); if (indx < 0) { //Debug.Log("Registering chroma keying pass for the HDRP pipeline"); - hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); + HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); } - indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); + indx = HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); if (indx < 0) { //Debug.Log("Registering alpha injection pass for the HDRP pipeline"); - hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); + HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); } return true; } 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 8232f666efd..9dda01f8b80 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 @@ -3504,7 +3504,7 @@ ContactShadowsParameters PrepareContactShadowsParameters(HDCamera hdCamera, floa parameters.rayTracingEnabled = RayTracedContactShadowsRequired(); if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing)) { - parameters.contactShadowsRTS = m_Asset.renderPipelineRayTracingResources.contactShadowRayTracingRT; + parameters.contactShadowsRTS = HDDefaultSettings.instance.renderPipelineRayTracingResources.contactShadowRayTracingRT; parameters.accelerationStructure = RequestAccelerationStructure(); parameters.actualWidth = hdCamera.actualWidth; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs index 2ed7a277e2c..fe0b711f90b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs @@ -192,9 +192,9 @@ void InitializeScreenSpaceShadows() // Fetch the shaders if (m_RayTracingSupported) { - m_ScreenSpaceShadowsCS = m_Asset.renderPipelineRayTracingResources.shadowRaytracingCS; - m_ScreenSpaceShadowsFilterCS = m_Asset.renderPipelineRayTracingResources.shadowFilterCS; - m_ScreenSpaceShadowsRT = m_Asset.renderPipelineRayTracingResources.shadowRaytracingRT; + m_ScreenSpaceShadowsCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowRaytracingCS; + m_ScreenSpaceShadowsFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; + m_ScreenSpaceShadowsRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowRaytracingRT; // Directional shadow kernels m_ClearShadowTexture = m_ScreenSpaceShadowsCS.FindKernel("ClearShadowTexture"); @@ -370,7 +370,7 @@ SSShadowDebugParameters PrepareSSShadowDebugParameters(HDCamera hdCamera, int ta sssdParams.debugKernel = m_WriteShadowTextureDebugKernel; // TODO: move the debug kernel outside of the ray tracing resources - sssdParams.shadowFilter = m_Asset.renderPipelineRayTracingResources.shadowFilterCS; + sssdParams.shadowFilter = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; return sssdParams; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs index 27e9764c59b..7bab8c24c26 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs @@ -306,8 +306,7 @@ void InitMaterial() if (m_Material == null) { #if UNITY_EDITOR - var hdrp = HDRenderPipeline.defaultAsset; - m_Material = hdrp != null ? hdrp.GetDefaultDecalMaterial() : null; + m_Material = HDDefaultSettings.instance != null ? HDDefaultSettings.instance.GetDefaultDecalMaterial() : null; #else m_Material = null; #endif diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs index eb7d7e0d483..8766f874321 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs @@ -44,6 +44,8 @@ internal DiffusionProfile this[int index] if (importer == null) return; + // TODOJENNY++ + /* var currentHDAsset = HDRenderPipeline.currentAsset; if (currentHDAsset == null) throw new Exception("Can't upgrade diffusion profile when the HDRenderPipeline asset is not assigned in Graphic Settings"); @@ -67,7 +69,7 @@ internal DiffusionProfile this[int index] index++; } - // We write in the main diffusion profile meta filethe list of created asset so we know where to look + // We write in the main diffusion profile meta file the list of created asset so we know where to look // when we upgrade materials inside scenes (from the menu item) SerializableGUIDs toJson; toJson.assetGUIDs = new string[16]; @@ -102,6 +104,8 @@ internal DiffusionProfile this[int index] UpgradeMaterial(mat, d); } } + */ + // TODOJENNY-- #endif #pragma warning restore 618 }) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs index 4be37c02e48..fbd571642c7 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs @@ -25,8 +25,8 @@ static RTHandle SubSurfaceHistoryBufferAllocatorFunction(string viewName, int fr void InitializeSubsurfaceScatteringRT() { - ComputeShader rayTracingSubSurfaceCS = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingCS; - ComputeShader deferredRayTracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; + ComputeShader rayTracingSubSurfaceCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + ComputeShader deferredRayTracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; m_SSSClearTextureKernel = rayTracingSubSurfaceCS.FindKernel("ClearTexture"); m_RaytracingDiffuseDeferredKernel = deferredRayTracingCS.FindKernel("RaytracingDiffuseDeferred"); @@ -79,9 +79,9 @@ SSSRayTracingParameters PrepareSSSRayTracingParameters(HDCamera hdCamera, SubSur sssrtParams.rtDeferredLightingKernel = m_RaytracingDiffuseDeferredKernel; // other required parameters - sssrtParams.rayTracingSubSurfaceRT = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingRT; - sssrtParams.rayTracingSubSurfaceCS = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingCS; - sssrtParams.deferredRayTracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; + sssrtParams.rayTracingSubSurfaceRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingRT; + sssrtParams.rayTracingSubSurfaceCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + sssrtParams.deferredRayTracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; sssrtParams.accelerationStructure = RequestAccelerationStructure(); sssrtParams.lightCluster = RequestLightCluster(); sssrtParams.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; @@ -206,7 +206,7 @@ SSSCombineParameters PrepareSSSCombineParameters(HDCamera hdCamera) ssscParams.combineSSSKernel = ssscParams.validSSGI ? m_CombineSubSurfaceWithGIKernel : m_CombineSubSurfaceKernel; // Other parameters - ssscParams.rayTracingSubSurfaceCS = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + ssscParams.rayTracingSubSurfaceCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; ssscParams.combineLightingMat = m_CombineLightingPass; return ssscParams; 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 3474889ab2b..3d40fcf20eb 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 @@ -902,7 +902,7 @@ internal void DoUserAfterOpaqueAndSky(RenderGraph renderGraph, HDCamera hdCamera using (new RenderGraphProfilingScope(renderGraph, ProfilingSampler.Get(HDProfileId.CustomPostProcessAfterOpaqueAndSky))) { TextureHandle source = colorBuffer; - bool needBlitToColorBuffer = DoCustomPostProcess(renderGraph, hdCamera, ref source, depthBuffer, normalBuffer, HDRenderPipeline.defaultAsset.beforeTransparentCustomPostProcesses); + bool needBlitToColorBuffer = DoCustomPostProcess(renderGraph, hdCamera, ref source, depthBuffer, normalBuffer, HDDefaultSettings.instance.beforeTransparentCustomPostProcesses); if (needBlitToColorBuffer) { @@ -1004,7 +1004,7 @@ public void Render(RenderGraph renderGraph, source = DynamicExposurePass(renderGraph, hdCamera, source); - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDRenderPipeline.defaultAsset.beforeTAACustomPostProcesses, HDProfileId.CustomPostProcessBeforeTAA); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDDefaultSettings.instance.beforeTAACustomPostProcesses, HDProfileId.CustomPostProcessBeforeTAA); // Temporal anti-aliasing goes first if (m_AntialiasingFS) @@ -1019,7 +1019,7 @@ public void Render(RenderGraph renderGraph, } } - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDRenderPipeline.defaultAsset.beforePostProcessCustomPostProcesses, HDProfileId.CustomPostProcessBeforePP); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDDefaultSettings.instance.beforePostProcessCustomPostProcesses, HDProfileId.CustomPostProcessBeforePP); source = DepthOfFieldPass(renderGraph, hdCamera, depthBuffer, motionVectors, depthBufferMipChain, source); @@ -1038,7 +1038,7 @@ public void Render(RenderGraph renderGraph, source = UberPass(renderGraph, hdCamera, logLutOutput, bloomTexture, source); m_HDInstance.PushFullScreenDebugTexture(renderGraph, source, FullScreenDebugMode.ColorLog); - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDRenderPipeline.defaultAsset.afterPostProcessCustomPostProcesses, HDProfileId.CustomPostProcessAfterPP); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDDefaultSettings.instance.afterPostProcessCustomPostProcesses, HDProfileId.CustomPostProcessAfterPP); source = FXAAPass(renderGraph, hdCamera, source); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs new file mode 100644 index 00000000000..e009cd4a39c --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs @@ -0,0 +1,17 @@ +using System; +using UnityEngine.Serialization; + +namespace UnityEngine.Rendering.HighDefinition +{ + public partial class HDDefaultSettings : IVersionable + { + enum Version + { + First + } + + [SerializeField] + Version m_Version = MigrationDescription.LastVersion(); + Version IVersionable.version { get => m_Version; set => m_Version = value; } + } +} diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs new file mode 100644 index 00000000000..19967767137 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs @@ -0,0 +1,708 @@ +using UnityEngine.Rendering; +using System.Collections.Generic; //needed for list of Custom Post Processes injections +using System.IO; +using System.Diagnostics; +#if UNITY_EDITOR +using UnityEditorInternal; +using UnityEditor; +using UnityEditor.Rendering; +using UnityEditor.Rendering.HighDefinition; +#endif + +namespace UnityEngine.Rendering.HighDefinition +{ + enum ShaderVariantLogLevel + { + Disabled, + OnlyHDRPShaders, + AllShaders, + } + + enum LensAttenuationMode + { + ImperfectLens, + PerfectLens + } + + /// + /// High Definition Render Pipeline Default Settings. + /// Default settings are unique per Render Pipeline type. In HD, Default Settings contain: + /// - a default Volume (Global) combined with its Default Profile (defines which components are active by default) + /// - this Volume's profile + /// - the LookDev Volume Profile + /// - Frame Settings + /// - Various resources for runtime, editor-only, and raytracing + /// + public partial class HDDefaultSettings : RenderPipelineDefaultSettings + { + private static HDDefaultSettings cachedInstance = null; + public static HDDefaultSettings instance + { + get + { + if (cachedInstance == null) + cachedInstance = GraphicsSettings.GetSettingsForRenderPipeline() as HDDefaultSettings; + return cachedInstance; + } + } + + static public void UpdateGraphicsSettings(HDDefaultSettings newSettings) + { + if (newSettings == null || newSettings == cachedInstance) + return; + GraphicsSettings.RegisterRenderPipelineSettings(newSettings as RenderPipelineDefaultSettings); + cachedInstance = newSettings; + } + +#if UNITY_EDITOR + //Making sure there is at least one HDDefaultSettings instance in the project + static public HDDefaultSettings Ensure() + { + if (HDDefaultSettings.instance) + return HDDefaultSettings.instance; + + HDDefaultSettings assetCreated = null; + string path = "Assets/HDRPDefaultResources/HDGraphicsSettings.asset"; + assetCreated = AssetDatabase.LoadAssetAtPath(path); + if (assetCreated == null) + { + var guidHDDefaultAssets = AssetDatabase.FindAssets("t:HDDefaultSettings"); + //If we could not find the asset at the default path, find the first one + if (guidHDDefaultAssets.Length > 0) + { + var curGUID = guidHDDefaultAssets[0]; + path = AssetDatabase.GUIDToAssetPath(curGUID); + assetCreated = AssetDatabase.LoadAssetAtPath(path); + } + else // or create one altogether + { + if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) + AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); + assetCreated = ScriptableObject.CreateInstance(); + AssetDatabase.CreateAsset(assetCreated, path); + assetCreated.Init(); + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + } + } + Debug.Assert(assetCreated, "Could not create HD Default Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); + UpdateGraphicsSettings(assetCreated); + return HDDefaultSettings.instance; + } + +#endif + + void Init() + { + if (beforeTransparentCustomPostProcesses == null) + { + beforeTransparentCustomPostProcesses = new List(); + beforePostProcessCustomPostProcesses = new List(); + afterPostProcessCustomPostProcesses = new List(); + beforeTAACustomPostProcesses = new List(); + } + + lightLayerName0 = "Light Layer default"; + lightLayerName1 = "Light Layer 1"; + lightLayerName2 = "Light Layer 2"; + lightLayerName3 = "Light Layer 3"; + lightLayerName4 = "Light Layer 4"; + lightLayerName5 = "Light Layer 5"; + lightLayerName6 = "Light Layer 6"; + lightLayerName7 = "Light Layer 7"; + + decalLayerName0 = "Decal Layer default"; + decalLayerName1 = "Decal Layer 1"; + decalLayerName2 = "Decal Layer 2"; + decalLayerName3 = "Decal Layer 3"; + decalLayerName4 = "Decal Layer 4"; + decalLayerName5 = "Decal Layer 5"; + decalLayerName6 = "Decal Layer 6"; + decalLayerName7 = "Decal Layer 7"; + + shaderVariantLogLevel = ShaderVariantLogLevel.Disabled; + +#if UNITY_EDITOR + EnsureEditorResources(forceReload: false); +#endif + } + + #if UNITY_EDITOR + internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) + { + string path = "Assets/HDRPDefaultResources/HDGraphicsSettings.asset"; + return MigrateFromHDRPAsset(oldAsset, path, bClearObsoleteFields); + } + + internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) + { + HDDefaultSettings assetCreated = null; + + // 1. Load or Create the HDAsset and save it on disk + assetCreated = AssetDatabase.LoadAssetAtPath(path); + if (assetCreated == null) + { + if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) + AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); + assetCreated = ScriptableObject.CreateInstance(); + AssetDatabase.CreateAsset(assetCreated, path); + assetCreated.Init(); + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + } + +#pragma warning disable 618 // Type or member is obsolete + //2. Migrate obsolete assets (version DefaultSettingsAsAnAsset) + assetCreated.volumeProfile = oldAsset.m_ObsoleteDefaultVolumeProfile; + assetCreated.volumeProfileLookDev = oldAsset.m_ObsoleteDefaultLookDevProfile; + + assetCreated.m_RenderingPathDefaultCameraFrameSettings = oldAsset.m_ObsoleteFrameSettingsMovedToDefaultSettings; + assetCreated.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings = oldAsset.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings; + assetCreated.m_RenderingPathDefaultRealtimeReflectionFrameSettings = oldAsset.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings; + + assetCreated.m_RenderPipelineResources = oldAsset.m_ObsoleteRenderPipelineResources; + assetCreated.m_RenderPipelineRayTracingResources = oldAsset.m_ObsoleteRenderPipelineRayTracingResources; + + assetCreated.beforeTransparentCustomPostProcesses.AddRange(oldAsset.m_ObsoleteBeforeTransparentCustomPostProcesses); + assetCreated.beforePostProcessCustomPostProcesses.AddRange(oldAsset.m_ObsoleteBeforePostProcessCustomPostProcesses); + assetCreated.afterPostProcessCustomPostProcesses.AddRange(oldAsset.m_ObsoleteAfterPostProcessCustomPostProcesses); + assetCreated.beforeTAACustomPostProcesses.AddRange(oldAsset.m_ObsoleteBeforeTAACustomPostProcesses); + + assetCreated.lightLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0; + assetCreated.lightLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1; + assetCreated.lightLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2; + assetCreated.lightLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3; + assetCreated.lightLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4; + assetCreated.lightLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5; + assetCreated.lightLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6; + assetCreated.lightLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7; + + assetCreated.decalLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0; + assetCreated.decalLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1; + assetCreated.decalLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2; + assetCreated.decalLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3; + assetCreated.decalLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4; + assetCreated.decalLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5; + assetCreated.decalLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6; + assetCreated.decalLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7; + + assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; + assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; + + System.Array.Resize(ref assetCreated.diffusionProfileSettingsList, oldAsset.m_ObsoleteDiffusionProfileSettingsList.Length); + for (int i = 0; i < oldAsset.m_ObsoleteDiffusionProfileSettingsList.Length; ++i) + assetCreated.diffusionProfileSettingsList[i] = oldAsset.m_ObsoleteDiffusionProfileSettingsList[i]; + + //3. Clear obsolete fields + if (bClearObsoleteFields) + { + oldAsset.m_ObsoleteDefaultVolumeProfile = null; + oldAsset.m_ObsoleteDefaultLookDevProfile = null; + + oldAsset.m_ObsoleteRenderPipelineResources = null; + oldAsset.m_ObsoleteRenderPipelineRayTracingResources = null; + + oldAsset.m_ObsoleteBeforeTransparentCustomPostProcesses = null; + oldAsset.m_ObsoleteBeforePostProcessCustomPostProcesses = null; + oldAsset.m_ObsoleteAfterPostProcessCustomPostProcesses = null; + oldAsset.m_ObsoleteBeforeTAACustomPostProcesses = null; + /* TODOJENNY - not sure why we cannot reset a string like that + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6 = ""; + oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7 = ""; + */ + System.Array.Resize(ref oldAsset.m_ObsoleteDiffusionProfileSettingsList, 0); + } +#pragma warning restore 618 + + return assetCreated; + } + + internal static HDDefaultSettings Create(string path, HDDefaultSettings src = null) + { + HDDefaultSettings assetCreated = null; + + // make sure the asset does not already exists + assetCreated = AssetDatabase.LoadAssetAtPath(path); + if (assetCreated == null) + { + assetCreated = ScriptableObject.CreateInstance(); + AssetDatabase.CreateAsset(assetCreated, path); + assetCreated.Init(); + if (assetCreated != null) + { + assetCreated.name = Path.GetFileName(path); + } + } + + if (assetCreated) + { + if (src != null) + { + assetCreated.renderPipelineResources = src.renderPipelineResources; + assetCreated.renderPipelineRayTracingResources = src.renderPipelineRayTracingResources; + + assetCreated.volumeProfile = src.volumeProfile; + assetCreated.volumeProfileLookDev = src.volumeProfileLookDev; + + assetCreated.m_RenderingPathDefaultCameraFrameSettings = src.m_RenderingPathDefaultCameraFrameSettings; + assetCreated.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings = src.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings; + assetCreated.m_RenderingPathDefaultRealtimeReflectionFrameSettings = src.m_RenderingPathDefaultRealtimeReflectionFrameSettings; + + assetCreated.beforeTransparentCustomPostProcesses.AddRange(src.beforeTransparentCustomPostProcesses); + assetCreated.beforePostProcessCustomPostProcesses.AddRange(src.beforePostProcessCustomPostProcesses); + assetCreated.afterPostProcessCustomPostProcesses.AddRange(src.afterPostProcessCustomPostProcesses); + assetCreated.beforeTAACustomPostProcesses.AddRange(src.beforeTAACustomPostProcesses); + + assetCreated.lightLayerName0 = src.lightLayerName0; + assetCreated.lightLayerName1 = src.lightLayerName1; + assetCreated.lightLayerName2 = src.lightLayerName2; + assetCreated.lightLayerName3 = src.lightLayerName3; + assetCreated.lightLayerName4 = src.lightLayerName4; + assetCreated.lightLayerName5 = src.lightLayerName5; + assetCreated.lightLayerName6 = src.lightLayerName6; + assetCreated.lightLayerName7 = src.lightLayerName7; + + assetCreated.decalLayerName0 = src.decalLayerName0; + assetCreated.decalLayerName1 = src.decalLayerName1; + assetCreated.decalLayerName2 = src.decalLayerName2; + assetCreated.decalLayerName3 = src.decalLayerName3; + assetCreated.decalLayerName4 = src.decalLayerName4; + assetCreated.decalLayerName5 = src.decalLayerName5; + assetCreated.decalLayerName6 = src.decalLayerName6; + assetCreated.decalLayerName7 = src.decalLayerName7; + + assetCreated.shaderVariantLogLevel = src.shaderVariantLogLevel; + assetCreated.lensAttenuationMode = src.lensAttenuationMode; + + System.Array.Resize(ref assetCreated.diffusionProfileSettingsList, src.diffusionProfileSettingsList.Length); + for (int i = 0; i < src.diffusionProfileSettingsList.Length; ++i) + assetCreated.diffusionProfileSettingsList[i] = src.diffusionProfileSettingsList[i]; + } + else + { + assetCreated.EnsureResources(forceReload: false); + assetCreated.EnsureRayTracingResources(forceReload: false); + assetCreated.GetOrCreateDefaultVolumeProfile(); + assetCreated.GetOrAssignLookDevVolumeProfile(); + } + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + } + + return assetCreated; + } + + #endif // UNITY_EDITOR + + #region Volume + private Volume s_DefaultVolume = null; + + internal Volume GetOrCreateDefaultVolume() + { + if (s_DefaultVolume == null || s_DefaultVolume.Equals(null)) + { + var go = new GameObject("Default Volume") { hideFlags = HideFlags.HideAndDontSave }; + s_DefaultVolume = go.AddComponent(); + s_DefaultVolume.isGlobal = true; + s_DefaultVolume.priority = float.MinValue; + s_DefaultVolume.sharedProfile = GetOrCreateDefaultVolumeProfile(); +#if UNITY_EDITOR + UnityEditor.AssemblyReloadEvents.beforeAssemblyReload += () => + { + DestroyDefaultVolume(); + }; +#endif + } + + if ( + // In case the asset was deleted or the reference removed + s_DefaultVolume.sharedProfile == null || s_DefaultVolume.sharedProfile.Equals(null) +#if UNITY_EDITOR + // In case the serialization recreated an empty volume sharedProfile + || !UnityEditor.AssetDatabase.Contains(s_DefaultVolume.sharedProfile) +#endif + ) + { + s_DefaultVolume.sharedProfile = volumeProfile; + } + + if (s_DefaultVolume.sharedProfile != volumeProfile) + { + s_DefaultVolume.sharedProfile = volumeProfile; + } + + if (s_DefaultVolume == null) + { + Debug.LogError("[HDRP] Cannot Create Default Volume."); + } + + return s_DefaultVolume; + } + +#if UNITY_EDITOR + private void DestroyDefaultVolume() + { + if (s_DefaultVolume != null && !s_DefaultVolume.Equals(null)) + { + CoreUtils.Destroy(s_DefaultVolume.gameObject); + s_DefaultVolume = null; + } + } + +#endif + + #endregion + + #region VolumeProfile + + [SerializeField] private VolumeProfile m_VolumeProfileDefault; + + internal VolumeProfile volumeProfile + { + get => m_VolumeProfileDefault; + set => m_VolumeProfileDefault = value; + } + + internal VolumeProfile GetOrCreateDefaultVolumeProfile() + { + #if UNITY_EDITOR + if (volumeProfile == null || volumeProfile.Equals(null)) + { + volumeProfile = renderPipelineEditorResources.defaultSettingsVolumeProfile; + } + #endif + return volumeProfile; + } + + #if UNITY_EDITOR + internal bool IsVolumeProfileFromResources() + { + return volumeProfile != null && renderPipelineEditorResources != null && volumeProfile.Equals(renderPipelineEditorResources.defaultSettingsVolumeProfile); + } + + #endif + + #endregion + + #region Look Dev Profile +#if UNITY_EDITOR + [SerializeField] private VolumeProfile m_VolumeProfileLookDev; + + internal VolumeProfile volumeProfileLookDev + { + get => m_VolumeProfileLookDev; + set => m_VolumeProfileLookDev = value; + } +#endif + +#if UNITY_EDITOR + internal VolumeProfile GetOrAssignLookDevVolumeProfile() + { + if (volumeProfileLookDev == null || volumeProfileLookDev.Equals(null)) + { + volumeProfileLookDev = renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile; + } + return volumeProfileLookDev; + } + +#endif + #endregion + + #region Camera's FrameSettings + // To be able to turn on/off FrameSettings properties at runtime for debugging purpose without affecting the original one + // we create a runtime copy (m_ActiveFrameSettings that is used, and any parametrization is done on serialized frameSettings) + [SerializeField] + FrameSettings m_RenderingPathDefaultCameraFrameSettings = FrameSettings.NewDefaultCamera(); + + [SerializeField] + FrameSettings m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings = FrameSettings.NewDefaultCustomOrBakeReflectionProbe(); + + [SerializeField] + FrameSettings m_RenderingPathDefaultRealtimeReflectionFrameSettings = FrameSettings.NewDefaultRealtimeReflectionProbe(); + + internal ref FrameSettings GetDefaultFrameSettings(FrameSettingsRenderType type) + { + switch (type) + { + case FrameSettingsRenderType.Camera: + return ref m_RenderingPathDefaultCameraFrameSettings; + case FrameSettingsRenderType.CustomOrBakedReflection: + return ref m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings; + case FrameSettingsRenderType.RealtimeReflection: + return ref m_RenderingPathDefaultRealtimeReflectionFrameSettings; + default: + throw new System.ArgumentException("Unknown FrameSettingsRenderType"); + } + } + + #endregion + + #region Runtime Resources + + [SerializeField] + RenderPipelineResources m_RenderPipelineResources; + + internal RenderPipelineResources renderPipelineResources + { + get + { +#if UNITY_EDITOR + EnsureResources(forceReload: false); +#endif + return m_RenderPipelineResources; + } + set { m_RenderPipelineResources = value; } + } + +#if UNITY_EDITOR + internal void EnsureResources(bool forceReload) + { + if (AreResourcesCreated()) + return; + + m_RenderPipelineResources = AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"); + + if (forceReload) + { +#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify + ResourceReloader.TryReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath()); +#else + ResourceReloader.ReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath()); +#endif + } + } + +#endif + + internal bool AreResourcesCreated() + { + return (m_RenderPipelineResources != null && !m_RenderPipelineResources.Equals(null)); + } + +#if UNITY_EDITOR + internal void EnsureShadersCompiled() + { + // We iterate over all compute shader to verify if they are all compiled, if it's not the case + // then we throw an exception to avoid allocating resources and crashing later on by using a null + // compute kernel. + foreach (var computeShader in m_RenderPipelineResources.shaders.GetAllComputeShaders()) + { + foreach (var message in UnityEditor.ShaderUtil.GetComputeShaderMessages(computeShader)) + { + if (message.severity == UnityEditor.Rendering.ShaderCompilerMessageSeverity.Error) + { + // Will be catched by the try in HDRenderPipelineAsset.CreatePipeline() + throw new System.Exception(System.String.Format( + "Compute Shader compilation error on platform {0} in file {1}:{2}: {3}{4}\n" + + "HDRP will not run until the error is fixed.\n", + message.platform, message.file, message.line, message.message, message.messageDetails + )); + } + } + } + } + +#endif //UNITY_EDITOR + #endregion // Runtime Resources + + #region Editor Resources (not serialized) +#if UNITY_EDITOR + HDRenderPipelineEditorResources m_RenderPipelineEditorResources; + internal HDRenderPipelineEditorResources renderPipelineEditorResources + { + get + { + //there is no clean way to load editor resources without having it serialized + // - impossible to load them at deserialization + // - constructor only called at asset creation + // - cannot rely on OnEnable + //thus fallback with lazy init for them + EnsureEditorResources(forceReload: false); + return m_RenderPipelineEditorResources; + } + } + + internal void EnsureEditorResources(bool forceReload) + { + if (AreEditorResourcesCreated()) + return; + + var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; + var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); + m_RenderPipelineEditorResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineEditorResources : null; + if (forceReload) + { + if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineEditorResources, HDUtils.GetHDRenderPipelinePath())) + { + InternalEditorUtility.SaveToSerializedFileAndForget( + new Object[] { m_RenderPipelineEditorResources }, + editorResourcesPath, + true); + } + } + else if (!EditorUtility.IsPersistent(m_RenderPipelineEditorResources)) + { + m_RenderPipelineEditorResources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); + } + } + + internal bool AreEditorResourcesCreated() + { + return (m_RenderPipelineEditorResources != null && !m_RenderPipelineEditorResources.Equals(null)); + } + + // Note: This function is HD specific + /// HDRP default Decal material. + public Material GetDefaultDecalMaterial() + => m_RenderPipelineEditorResources.materials.defaultDecalMat; + + // Note: This function is HD specific + /// HDRP default mirror material. + public Material GetDefaultMirrorMaterial() + => m_RenderPipelineEditorResources.materials.defaultMirrorMat; +#endif + + #endregion //Editor Resources + + #region Ray Tracing Resources + [SerializeField] + HDRenderPipelineRayTracingResources m_RenderPipelineRayTracingResources; + internal HDRenderPipelineRayTracingResources renderPipelineRayTracingResources + { + get { return m_RenderPipelineRayTracingResources; } + set { m_RenderPipelineRayTracingResources = value; } + } + +#if UNITY_EDITOR + internal void EnsureRayTracingResources(bool forceReload) + { + if (AreRayTracingResourcesCreated()) + return; + + m_RenderPipelineRayTracingResources = UnityEditor.AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"); + + if (forceReload) + { +#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify + ResourceReloader.TryReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); +#else + ResourceReloader.ReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); +#endif + } + } + + internal void ClearRayTracingResources() + { + m_RenderPipelineRayTracingResources = null; + } + + internal bool AreRayTracingResourcesCreated() + { + return (m_RenderPipelineRayTracingResources != null && !m_RenderPipelineRayTracingResources.Equals(null)); + } + +#endif + + #endregion //Ray Tracing Resources + + #region Custom Post Processes Injections + + // List of custom post process Types that will be executed in the project, in the order of the list (top to back) + [SerializeField] + internal List beforeTransparentCustomPostProcesses = new List(); + [SerializeField] + internal List beforePostProcessCustomPostProcesses = new List(); + [SerializeField] + internal List afterPostProcessCustomPostProcesses = new List(); + [SerializeField] + internal List beforeTAACustomPostProcesses = new List(); + + #endregion + + #region Layer Names [LIGHT] + + /// Name for light layer 0. + public string lightLayerName0; + /// Name for light layer 1. + public string lightLayerName1; + /// Name for light layer 2. + public string lightLayerName2; + /// Name for light layer 3. + public string lightLayerName3; + /// Name for light layer 4. + public string lightLayerName4; + /// Name for light layer 5. + public string lightLayerName5; + /// Name for light layer 6. + public string lightLayerName6; + /// Name for light layer 7. + public string lightLayerName7; + + #endregion + + #region Layer Names [DECAL] + + /// Name for decal layer 0. + public string decalLayerName0; + /// Name for decal layer 1. + public string decalLayerName1; + /// Name for decal layer 2. + public string decalLayerName2; + /// Name for decal layer 3. + public string decalLayerName3; + /// Name for decal layer 4. + public string decalLayerName4; + /// Name for decal layer 5. + public string decalLayerName5; + /// Name for decal layer 6. + public string decalLayerName6; + /// Name for decal layer 7. + public string decalLayerName7; + + #endregion + + #region Misc. + + [SerializeField] + internal ShaderVariantLogLevel shaderVariantLogLevel = ShaderVariantLogLevel.Disabled; + + [SerializeField] + internal LensAttenuationMode lensAttenuationMode; + + [SerializeField] + internal DiffusionProfileSettings[] diffusionProfileSettingsList = new DiffusionProfileSettings[0]; + + internal bool AddDiffusionProfile(DiffusionProfileSettings profile) + { + if (diffusionProfileSettingsList.Length < 15) + { + int index = diffusionProfileSettingsList.Length; + System.Array.Resize(ref diffusionProfileSettingsList, index + 1); + diffusionProfileSettingsList[index] = profile; + UnityEditor.EditorUtility.SetDirty(this); + return true; + } + else + { + Debug.LogErrorFormat("We cannot add the diffusion profile {0} to the HDRP default settings as we only allow 14 custom profiles. Please remove one before adding a new one.", profile.name); + return false; + } + } + + #endregion + } +} diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs index f18b178488d..99789b46096 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs @@ -20,18 +20,18 @@ struct LookDevDataForHDRP #if UNITY_EDITOR bool UpdateVolumeProfile(Volume volume, out VisualEnvironment visualEnvironment, out HDRISky sky, ref int volumeProfileHash) { - HDRenderPipelineAsset hdrpAsset = GraphicsSettings.renderPipelineAsset as HDRenderPipelineAsset; - if (hdrpAsset.defaultLookDevProfile == null) - hdrpAsset.defaultLookDevProfile = hdrpAsset.renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile; + HDDefaultSettings defaultSettings = HDDefaultSettings.instance; + if (defaultSettings.volumeProfileLookDev == null) + defaultSettings.volumeProfileLookDev = defaultSettings.renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile; - int newHashCode = hdrpAsset.defaultLookDevProfile.GetHashCode(); + int newHashCode = defaultSettings.volumeProfileLookDev.GetHashCode(); if (newHashCode != volumeProfileHash) { VolumeProfile oldProfile = volume.sharedProfile; volumeProfileHash = newHashCode; - VolumeProfile profile = ScriptableObject.Instantiate(hdrpAsset.defaultLookDevProfile); + VolumeProfile profile = ScriptableObject.Instantiate(defaultSettings.volumeProfileLookDev); profile.hideFlags = HideFlags.HideAndDontSave; volume.sharedProfile = profile; 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 27d7952f811..ac2a745b1d7 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -24,8 +24,11 @@ namespace UnityEngine.Rendering.HighDefinition public partial class HDRenderPipeline : RenderPipeline { #region Default Settings - internal static HDRenderPipelineAsset defaultAsset - => GraphicsSettings.renderPipelineAsset is HDRenderPipelineAsset hdrpAsset ? hdrpAsset : null; + internal static HDDefaultSettings defaultAsset + => HDDefaultSettings.instance; + + private HDDefaultSettings m_defaultSettings; + public override RenderPipelineDefaultSettings defaultSettings => m_defaultSettings; internal static HDRenderPipelineAsset currentAsset => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset : null; @@ -36,59 +39,6 @@ internal static HDRenderPipeline currentPipeline internal static bool pipelineSupportsRayTracing => HDRenderPipeline.currentPipeline != null && HDRenderPipeline.currentPipeline.rayTracingSupported; internal static bool pipelineSupportsScreenSpaceShadows => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.supportScreenSpaceShadows : false; - - - private static Volume s_DefaultVolume = null; - static VolumeProfile defaultVolumeProfile - => defaultAsset?.defaultVolumeProfile; - - static HDRenderPipeline() - { -#if UNITY_EDITOR - UnityEditor.AssemblyReloadEvents.beforeAssemblyReload += () => - { - if (s_DefaultVolume != null && !s_DefaultVolume.Equals(null)) - { - CoreUtils.Destroy(s_DefaultVolume.gameObject); - s_DefaultVolume = null; - } - }; -#endif - } - - internal static Volume GetOrCreateDefaultVolume() - { - if (s_DefaultVolume == null || s_DefaultVolume.Equals(null)) - { - var go = new GameObject("Default Volume") { hideFlags = HideFlags.HideAndDontSave }; - s_DefaultVolume = go.AddComponent(); - s_DefaultVolume.isGlobal = true; - s_DefaultVolume.priority = float.MinValue; - s_DefaultVolume.sharedProfile = defaultVolumeProfile; - } - - if ( - // In case the asset was deleted or the reference removed - s_DefaultVolume.sharedProfile == null || s_DefaultVolume.sharedProfile.Equals(null) -#if UNITY_EDITOR - - // In case the serialization recreated an empty volume sharedProfile - - || !UnityEditor.AssetDatabase.Contains(s_DefaultVolume.sharedProfile) -#endif - ) - { - s_DefaultVolume.sharedProfile = defaultVolumeProfile; - } - - if (s_DefaultVolume.sharedProfile != defaultVolumeProfile) - { - s_DefaultVolume.sharedProfile = defaultVolumeProfile; - } - - return s_DefaultVolume; - } - #endregion /// @@ -98,8 +48,7 @@ internal static Volume GetOrCreateDefaultVolume() readonly HDRenderPipelineAsset m_Asset; internal HDRenderPipelineAsset asset { get { return m_Asset; } } - readonly HDRenderPipelineAsset m_DefaultAsset; - internal RenderPipelineResources defaultResources { get { return m_DefaultAsset.renderPipelineResources; } } + internal RenderPipelineResources defaultResources { get { return m_defaultSettings.renderPipelineResources; } } internal RenderPipelineSettings currentPlatformRenderPipelineSettings { get { return m_Asset.currentPlatformRenderPipelineSettings; } } @@ -334,11 +283,23 @@ internal Material GetMSAAColorResolveMaterial() /// HDRenderPipeline constructor. /// /// Source HDRenderPipelineAsset. - /// Defauklt HDRenderPipelineAsset. - public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset defaultAsset) + /// Default HDRenderPipelineAsset. [Obsolete] + public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset obsolete_defaultAsset) : this(asset) + { + } + + /// + /// HDRenderPipeline constructor. + /// + /// Source HDRenderPipelineAsset. + public HDRenderPipeline(HDRenderPipelineAsset asset) { +#if UNITY_EDITOR + m_defaultSettings = HDDefaultSettings.Ensure(); +#else + m_defaultSettings = HDDefaultSettings.instance; +#endif m_Asset = asset; - m_DefaultAsset = defaultAsset; HDProbeSystem.Parameters = asset.reflectionSystemParameters; DebugManager.instance.RefreshEditor(); @@ -349,47 +310,40 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset defau // Initialize lod settings with the default frame settings. This will pull LoD values from the current quality level HDRP asset if necessary. // This will make the LoD Group UI consistent with the scene view camera like it is for builtin pipeline. - QualitySettings.lodBias = m_Asset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedLODBias(m_Asset); - QualitySettings.maximumLODLevel = m_Asset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedMaximumLODLevel(m_Asset); + QualitySettings.lodBias = m_defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedLODBias(m_Asset); + QualitySettings.maximumLODLevel = m_defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedMaximumLODLevel(m_Asset); // The first thing we need to do is to set the defines that depend on the render pipeline settings m_RayTracingSupported = GatherRayTracingSupport(m_Asset.currentPlatformRenderPipelineSettings); #if UNITY_EDITOR - // If defaultAsset is not ready (can happen due to loading order issue), then we should return - // There is a similar check in Render() - if (HDRenderPipeline.defaultAsset == null) - return; - UpgradeResourcesIfNeeded(); //In case we are loading element in the asset pipeline (occurs when library is not fully constructed) the creation of the HDRenderPipeline is done at a time we cannot access resources. //So in this case, the reloader would fail and the resources cannot be validated. So skip validation here. //The HDRenderPipeline will be reconstructed in a few frame which will fix this issue. - if (HDRenderPipeline.defaultAsset.renderPipelineResources == null - || HDRenderPipeline.defaultAsset.renderPipelineEditorResources == null - || (m_RayTracingSupported && HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources == null)) + if ((m_defaultSettings.AreResourcesCreated() == false) + || (m_defaultSettings.AreEditorResourcesCreated() == false) + || (m_RayTracingSupported && !m_defaultSettings.AreRayTracingResourcesCreated())) return; else m_ResourcesInitialized = true; - ValidateResources(); + m_defaultSettings.EnsureShadersCompiled(); #endif // We need to call this after the resource initialization as we attempt to use them in checking the supported API. if (!CheckAPIValidity()) { m_ValidAPI = false; - return; } - var defaultLensAttenuation = m_DefaultAsset.lensAttenuationMode; - if (defaultLensAttenuation == LensAttenuationMode.ImperfectLens) + if (m_defaultSettings.lensAttenuationMode == LensAttenuationMode.ImperfectLens) { ColorUtils.s_LensAttenuation = 0.65f; } - else if (defaultLensAttenuation == LensAttenuationMode.PerfectLens) + else if (m_defaultSettings.lensAttenuationMode == LensAttenuationMode.PerfectLens) { ColorUtils.s_LensAttenuation = 0.78f; } @@ -526,96 +480,37 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset defau CameraCaptureBridge.enabled = true; InitializePrepass(m_Asset); - m_ColorResolveMaterial = CoreUtils.CreateEngineMaterial(asset.renderPipelineResources.shaders.colorResolvePS); - m_MotionVectorResolve = CoreUtils.CreateEngineMaterial(asset.renderPipelineResources.shaders.resolveMotionVecPS); + m_ColorResolveMaterial = CoreUtils.CreateEngineMaterial(m_defaultSettings.renderPipelineResources.shaders.colorResolvePS); + m_MotionVectorResolve = CoreUtils.CreateEngineMaterial(m_defaultSettings.renderPipelineResources.shaders.resolveMotionVecPS); InitializeProbeVolumes(); CustomPassUtils.Initialize(); } #if UNITY_EDITOR - void UpgradeResourcesInAssetIfNeeded(HDRenderPipelineAsset asset) + void UpgradeResourcesIfNeeded() { + // The first thing we need to do is to set the defines that depend on the render pipeline settings + m_Asset.EvaluateSettings(); + // Check that the serialized Resources are not broken - if (asset.renderPipelineResources == null) - asset.renderPipelineResources - = UnityEditor.AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"); -#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify - ResourceReloader.TryReloadAllNullIn(asset.renderPipelineResources, HDUtils.GetHDRenderPipelinePath()); -#else - ResourceReloader.ReloadAllNullIn(asset.renderPipelineResources, HDUtils.GetHDRenderPipelinePath()); -#endif + m_defaultSettings.EnsureResources(forceReload: true); + m_defaultSettings.EnsureEditorResources(forceReload: true); if (m_RayTracingSupported) { - if (asset.renderPipelineRayTracingResources == null) - asset.renderPipelineRayTracingResources - = UnityEditor.AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"); -#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify - ResourceReloader.TryReloadAllNullIn(asset.renderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); -#else - ResourceReloader.ReloadAllNullIn(asset.renderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); -#endif + m_defaultSettings.EnsureRayTracingResources(forceReload: true); } else { // If ray tracing is not enabled we do not want to have ray tracing resources referenced - asset.renderPipelineRayTracingResources = null; + m_defaultSettings.ClearRayTracingResources(); } - - var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; - if (asset.renderPipelineEditorResources == null) - { - var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); - asset.renderPipelineEditorResources = objs != null && objs.Length > 0 ? objs.First() as HDRenderPipelineEditorResources : null; - } - - if (ResourceReloader.ReloadAllNullIn(asset.renderPipelineEditorResources, - HDUtils.GetHDRenderPipelinePath())) - { - InternalEditorUtility.SaveToSerializedFileAndForget( - new Object[] {asset.renderPipelineEditorResources }, - editorResourcesPath, - true); - } - - // Upgrade the resources (re-import every references in RenderPipelineResources) if the resource version mismatches - // It's done here because we know every HDRP assets have been imported before - asset.renderPipelineResources?.UpgradeIfNeeded(); - } - - void UpgradeResourcesIfNeeded() - { - // The first thing we need to do is to set the defines that depend on the render pipeline settings - m_Asset.EvaluateSettings(); - - // Check and fix both the default and current HDRP asset - UpgradeResourcesInAssetIfNeeded(HDRenderPipeline.defaultAsset); - UpgradeResourcesInAssetIfNeeded(HDRenderPipeline.currentAsset); } void ValidateResources() { - var resources = HDRenderPipeline.defaultAsset.renderPipelineResources; - - // We iterate over all compute shader to verify if they are all compiled, if it's not the case - // then we throw an exception to avoid allocating resources and crashing later on by using a null - // compute kernel. - foreach (var computeShader in resources.shaders.GetAllComputeShaders()) - { - foreach (var message in UnityEditor.ShaderUtil.GetComputeShaderMessages(computeShader)) - { - if (message.severity == UnityEditor.Rendering.ShaderCompilerMessageSeverity.Error) - { - // Will be catched by the try in HDRenderPipelineAsset.CreatePipeline() - throw new Exception(String.Format( - "Compute Shader compilation error on platform {0} in file {1}:{2}: {3}{4}\n" + - "HDRP will not run until the error is fixed.\n", - message.platform, message.file, message.line, message.message, message.messageDetails - )); - } - } - } + HDDefaultSettings.instance.EnsureShadersCompiled(); } #endif @@ -1236,7 +1131,7 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c #endif return; - GetOrCreateDefaultVolume(); + m_defaultSettings.GetOrCreateDefaultVolume(); // This function should be called once every render (once for all camera) LightLoopNewRender(); @@ -2234,9 +2129,9 @@ out ScriptableCullingParameters cullingParams // Compute the FrameSettings actually used to draw the frame // FrameSettingsHistory do the same while keeping all step of FrameSettings aggregation in memory for DebugMenu if (m_FrameSettingsHistoryEnabled && camera.cameraType != CameraType.Preview && camera.cameraType != CameraType.Reflection) - FrameSettingsHistory.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset, m_DefaultAsset); + FrameSettingsHistory.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset); else - FrameSettings.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset, m_DefaultAsset); + FrameSettings.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset); // With the Frame Settings now properly set up, we can resolve the sample budget. currentFrameSettings.sssResolvedSampleBudget = currentFrameSettings.GetResolvedSssSampleBudget(m_Asset); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs index 8f481a52552..f5e1981218d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs @@ -1,5 +1,7 @@ using System; using UnityEngine.Serialization; +using UnityEditor; +using System.Collections.Generic; //needed for list of Custom Post Processes injections namespace UnityEngine.Rendering.HighDefinition { @@ -24,7 +26,8 @@ enum Version AddedAdaptiveSSS, RemoveCookieCubeAtlasToOctahedral2D, RoughDistortion, - VirtualTexturing + VirtualTexturing, + DefaultSettingsAsAnAsset } static readonly MigrationDescription k_Migration = MigrationDescription.New( @@ -33,40 +36,52 @@ enum Version #pragma warning disable 618 // Type or member is obsolete FrameSettingsOverrideMask unusedMaskForDefault = new FrameSettingsOverrideMask(); if (data.m_ObsoleteFrameSettings != null) - FrameSettings.MigrateFromClassVersion(ref data.m_ObsoleteFrameSettings, ref data.m_RenderingPathDefaultCameraFrameSettings, ref unusedMaskForDefault); + FrameSettings.MigrateFromClassVersion(ref data.m_ObsoleteFrameSettings, ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings, ref unusedMaskForDefault); if (data.m_ObsoleteBakedOrCustomReflectionFrameSettings != null) - FrameSettings.MigrateFromClassVersion(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettings, ref data.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings, ref unusedMaskForDefault); + FrameSettings.MigrateFromClassVersion(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettings, ref data.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings, ref unusedMaskForDefault); if (data.m_ObsoleteRealtimeReflectionFrameSettings != null) - FrameSettings.MigrateFromClassVersion(ref data.m_ObsoleteRealtimeReflectionFrameSettings, ref data.m_RenderingPathDefaultRealtimeReflectionFrameSettings, ref unusedMaskForDefault); + FrameSettings.MigrateFromClassVersion(ref data.m_ObsoleteRealtimeReflectionFrameSettings, ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings, ref unusedMaskForDefault); #pragma warning restore 618 }), MigrationStep.New(Version.AddAfterPostProcessFrameSetting, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToAfterPostprocess(ref data.m_RenderingPathDefaultCameraFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToAfterPostprocess(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.AddReflectionSettings, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToDefaultReflectionSettings(ref data.m_RenderingPathDefaultCameraFrameSettings); - FrameSettings.MigrateToNoReflectionSettings(ref data.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings); - FrameSettings.MigrateToNoReflectionRealtimeSettings(ref data.m_RenderingPathDefaultRealtimeReflectionFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToDefaultReflectionSettings(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateToNoReflectionSettings(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateToNoReflectionRealtimeSettings(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.AddPostProcessFrameSettings, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToPostProcess(ref data.m_RenderingPathDefaultCameraFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToPostProcess(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.AddRayTracingFrameSettings, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToRayTracing(ref data.m_RenderingPathDefaultCameraFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToRayTracing(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.AddFrameSettingDirectSpecularLighting, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToDirectSpecularLighting(ref data.m_RenderingPathDefaultCameraFrameSettings); - FrameSettings.MigrateToNoDirectSpecularLighting(ref data.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings); - FrameSettings.MigrateToDirectSpecularLighting(ref data.m_RenderingPathDefaultRealtimeReflectionFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToDirectSpecularLighting(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateToNoDirectSpecularLighting(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateToDirectSpecularLighting(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.AddCustomPostprocessAndCustomPass, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToCustomPostprocessAndCustomPass(ref data.m_RenderingPathDefaultCameraFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToCustomPostprocessAndCustomPass(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.ScalableSettingsRefactor, (HDRenderPipelineAsset data) => { @@ -82,7 +97,9 @@ enum Version }), MigrationStep.New(Version.SeparateColorGradingAndTonemappingFrameSettings, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateToSeparateColorGradingAndTonemapping(ref data.m_RenderingPathDefaultCameraFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateToSeparateColorGradingAndTonemapping(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.ReplaceTextureArraysByAtlasForCookieAndPlanar, (HDRenderPipelineAsset data) => { @@ -108,11 +125,10 @@ enum Version { #pragma warning disable 618 // Type or member is obsolete bool previouslyHighQuality = data.m_RenderPipelineSettings.m_ObsoleteincreaseSssSampleCount; - #pragma warning restore 618 - - FrameSettings.MigrateSubsurfaceParams(ref data.m_RenderingPathDefaultCameraFrameSettings, previouslyHighQuality); - FrameSettings.MigrateSubsurfaceParams(ref data.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings, previouslyHighQuality); - FrameSettings.MigrateSubsurfaceParams(ref data.m_RenderingPathDefaultRealtimeReflectionFrameSettings, previouslyHighQuality); + FrameSettings.MigrateSubsurfaceParams(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings, previouslyHighQuality); + FrameSettings.MigrateSubsurfaceParams(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings, previouslyHighQuality); + FrameSettings.MigrateSubsurfaceParams(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings, previouslyHighQuality); +#pragma warning restore 618 }), MigrationStep.New(Version.RemoveCookieCubeAtlasToOctahedral2D, (HDRenderPipelineAsset data) => { @@ -127,15 +143,33 @@ enum Version }), MigrationStep.New(Version.RoughDistortion, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateRoughDistortion(ref data.m_RenderingPathDefaultCameraFrameSettings); - FrameSettings.MigrateRoughDistortion(ref data.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings); - FrameSettings.MigrateRoughDistortion(ref data.m_RenderingPathDefaultRealtimeReflectionFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateRoughDistortion(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateRoughDistortion(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateRoughDistortion(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 }), MigrationStep.New(Version.VirtualTexturing, (HDRenderPipelineAsset data) => { - FrameSettings.MigrateVirtualTexturing(ref data.m_RenderingPathDefaultCameraFrameSettings); - FrameSettings.MigrateVirtualTexturing(ref data.m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings); - FrameSettings.MigrateVirtualTexturing(ref data.m_RenderingPathDefaultRealtimeReflectionFrameSettings); +#pragma warning disable 618 // Type or member is obsolete + FrameSettings.MigrateVirtualTexturing(ref data.m_ObsoleteFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateVirtualTexturing(ref data.m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings); + FrameSettings.MigrateVirtualTexturing(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings); +#pragma warning restore 618 + }) , + MigrationStep.New(Version.DefaultSettingsAsAnAsset, (HDRenderPipelineAsset data) => + { +#if UNITY_EDITOR + // 2/ it acted as the definition of the Default Settings - now migrated to its own asset +#pragma warning disable 618 // Type or member is obsolete + if (data == GraphicsSettings.defaultRenderPipeline) +#pragma warning restore 618 + { + HDDefaultSettings defaultSettings = HDDefaultSettings.MigrateFromHDRPAsset(data, true); + HDDefaultSettings.UpdateGraphicsSettings(defaultSettings); + EditorUtility.SetDirty(defaultSettings); + } +#endif }) ); @@ -155,6 +189,56 @@ enum Version [SerializeField] [FormerlySerializedAs("m_RealtimeReflectionFrameSettings"), Obsolete("For data migration")] ObsoleteFrameSettings m_ObsoleteRealtimeReflectionFrameSettings; + + #region Settings Moved from the HDRP Asset to HDDefaultSettings + [SerializeField] + [FormerlySerializedAs("m_DefaultVolumeProfile"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal VolumeProfile m_ObsoleteDefaultVolumeProfile; + [SerializeField] + [FormerlySerializedAs("m_DefaultLookDevProfile"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal VolumeProfile m_ObsoleteDefaultLookDevProfile; + + [SerializeField] + [FormerlySerializedAs("m_RenderingPathDefaultCameraFrameSettings"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal FrameSettings m_ObsoleteFrameSettingsMovedToDefaultSettings; + [SerializeField] + [FormerlySerializedAs("m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal FrameSettings m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings; + [SerializeField] + [FormerlySerializedAs("m_RenderingPathDefaultRealtimeReflectionFrameSettings"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal FrameSettings m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings; + + [SerializeField] + [FormerlySerializedAs("m_RenderPipelineResources"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal RenderPipelineResources m_ObsoleteRenderPipelineResources; + [SerializeField] + [FormerlySerializedAs("m_RenderPipelineRayTracingResources"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal HDRenderPipelineRayTracingResources m_ObsoleteRenderPipelineRayTracingResources; + + [SerializeField] + [FormerlySerializedAs("beforeTransparentCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal List m_ObsoleteBeforeTransparentCustomPostProcesses; + [SerializeField] + [FormerlySerializedAs("beforePostProcessCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal List m_ObsoleteBeforePostProcessCustomPostProcesses; + [SerializeField] + [FormerlySerializedAs("afterPostProcessCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal List m_ObsoleteAfterPostProcessCustomPostProcesses; + [SerializeField] + [FormerlySerializedAs("beforeTAACustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal List m_ObsoleteBeforeTAACustomPostProcesses; + + [SerializeField] + [FormerlySerializedAs("shaderVariantLogLevel"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal ShaderVariantLogLevel m_ObsoleteShaderVariantLogLevel; + [SerializeField] + [FormerlySerializedAs("m_LensAttenuation"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal LensAttenuationMode m_ObsoleteLensAttenuation; + [SerializeField] + [FormerlySerializedAs("diffusionProfileSettingsList"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + internal DiffusionProfileSettings[] m_ObsoleteDiffusionProfileSettingsList; + #endregion + #pragma warning restore 618 } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index d7129b99584..496393dffe8 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -7,19 +7,6 @@ #endif namespace UnityEngine.Rendering.HighDefinition { - enum ShaderVariantLogLevel - { - Disabled, - OnlyHDRPShaders, - AllShaders, - } - - enum LensAttenuationMode - { - ImperfectLens, - PerfectLens - } - /// /// High Definition Render Pipeline asset. /// @@ -40,7 +27,7 @@ public partial class HDRenderPipelineAsset : RenderPipelineAsset, IVirtualTextur /// /// A new HDRenderPipeline instance. protected override RenderPipeline CreatePipeline() - => new HDRenderPipeline(this, HDRenderPipeline.defaultAsset); + => new HDRenderPipeline(this); /// /// OnValidate implementation. @@ -48,7 +35,9 @@ protected override RenderPipeline CreatePipeline() protected override void OnValidate() { isInOnValidateCall = true; - +#if UNITY_EDITOR + HDDefaultSettings.Ensure(); +#endif //Do not reconstruct the pipeline if we modify other assets. //OnValidate is called once at first selection of the asset. if (GraphicsSettings.currentRenderPipeline == this) @@ -59,95 +48,12 @@ protected override void OnValidate() isInOnValidateCall = false; } - [SerializeField] - RenderPipelineResources m_RenderPipelineResources; + public HDDefaultSettings defaultSettings => HDDefaultSettings.instance; internal RenderPipelineResources renderPipelineResources { - get { return m_RenderPipelineResources; } - set { m_RenderPipelineResources = value; } - } - - [SerializeField] - HDRenderPipelineRayTracingResources m_RenderPipelineRayTracingResources; - internal HDRenderPipelineRayTracingResources renderPipelineRayTracingResources - { - get { return m_RenderPipelineRayTracingResources; } - set { m_RenderPipelineRayTracingResources = value; } - } - - [SerializeField] private VolumeProfile m_DefaultVolumeProfile; - - internal VolumeProfile defaultVolumeProfile - { - get => m_DefaultVolumeProfile; - set => m_DefaultVolumeProfile = value; - } - - [SerializeField] private LensAttenuationMode m_LensAttenuation; - - internal LensAttenuationMode lensAttenuationMode - { - get => m_LensAttenuation; - set => m_LensAttenuation = value; - } - -#if UNITY_EDITOR - [SerializeField] private VolumeProfile m_DefaultLookDevProfile; - - internal VolumeProfile defaultLookDevProfile - { - get => m_DefaultLookDevProfile; - set => m_DefaultLookDevProfile = value; - } - - HDRenderPipelineEditorResources m_RenderPipelineEditorResources; - - internal HDRenderPipelineEditorResources renderPipelineEditorResources - { - get - { - //there is no clean way to load editor resources without having it serialized - // - impossible to load them at deserialization - // - constructor only called at asset creation - // - cannot rely on OnEnable - //thus fallback with lazy init for them - if (m_RenderPipelineEditorResources == null || m_RenderPipelineEditorResources.Equals(null)) - { - var objs = InternalEditorUtility.LoadSerializedFileAndForget(HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"); - m_RenderPipelineEditorResources = objs != null && objs.Length > 0 ? objs.First() as HDRenderPipelineEditorResources : null; - } - - return m_RenderPipelineEditorResources; - } - set { m_RenderPipelineEditorResources = value; } - } -#endif - - // To be able to turn on/off FrameSettings properties at runtime for debugging purpose without affecting the original one - // we create a runtime copy (m_ActiveFrameSettings that is used, and any parametrization is done on serialized frameSettings) - [SerializeField] - FrameSettings m_RenderingPathDefaultCameraFrameSettings = FrameSettings.NewDefaultCamera(); - - [SerializeField] - FrameSettings m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings = FrameSettings.NewDefaultCustomOrBakeReflectionProbe(); - - [SerializeField] - FrameSettings m_RenderingPathDefaultRealtimeReflectionFrameSettings = FrameSettings.NewDefaultRealtimeReflectionProbe(); - - internal ref FrameSettings GetDefaultFrameSettings(FrameSettingsRenderType type) - { - switch (type) - { - case FrameSettingsRenderType.Camera: - return ref m_RenderingPathDefaultCameraFrameSettings; - case FrameSettingsRenderType.CustomOrBakedReflection: - return ref m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings; - case FrameSettingsRenderType.RealtimeReflection: - return ref m_RenderingPathDefaultRealtimeReflectionFrameSettings; - default: - throw new ArgumentException("Unknown FrameSettingsRenderType"); - } + get { return defaultSettings.renderPipelineResources; } + set { defaultSettings.renderPipelineResources = value; } } internal bool frameSettingsHistory { get; set; } = false; @@ -183,8 +89,6 @@ internal ReflectionSystemParameters reflectionSystemParameters internal bool allowShaderVariantStripping = true; [SerializeField] internal bool enableSRPBatcher = true; - [SerializeField] - internal ShaderVariantLogLevel shaderVariantLogLevel = ShaderVariantLogLevel.Disabled; /// Available material quality levels for this asset. [FormerlySerializedAs("materialQualityLevels")] @@ -200,30 +104,27 @@ internal ReflectionSystemParameters reflectionSystemParameters [Obsolete("Use diffusionProfileSettingsList instead")] internal DiffusionProfileSettings diffusionProfileSettings; - [SerializeField] - internal DiffusionProfileSettings[] diffusionProfileSettingsList = new DiffusionProfileSettings[0]; - void UpdateRenderingLayerNames() { m_RenderingLayerNames = new string[32]; - m_RenderingLayerNames[0] = m_RenderPipelineSettings.lightLayerName0; - m_RenderingLayerNames[1] = m_RenderPipelineSettings.lightLayerName1; - m_RenderingLayerNames[2] = m_RenderPipelineSettings.lightLayerName2; - m_RenderingLayerNames[3] = m_RenderPipelineSettings.lightLayerName3; - m_RenderingLayerNames[4] = m_RenderPipelineSettings.lightLayerName4; - m_RenderingLayerNames[5] = m_RenderPipelineSettings.lightLayerName5; - m_RenderingLayerNames[6] = m_RenderPipelineSettings.lightLayerName6; - m_RenderingLayerNames[7] = m_RenderPipelineSettings.lightLayerName7; - - m_RenderingLayerNames[8] = m_RenderPipelineSettings.decalLayerName0; - m_RenderingLayerNames[9] = m_RenderPipelineSettings.decalLayerName1; - m_RenderingLayerNames[10] = m_RenderPipelineSettings.decalLayerName2; - m_RenderingLayerNames[11] = m_RenderPipelineSettings.decalLayerName3; - m_RenderingLayerNames[12] = m_RenderPipelineSettings.decalLayerName4; - m_RenderingLayerNames[13] = m_RenderPipelineSettings.decalLayerName5; - m_RenderingLayerNames[14] = m_RenderPipelineSettings.decalLayerName6; - m_RenderingLayerNames[15] = m_RenderPipelineSettings.decalLayerName7; + m_RenderingLayerNames[0] = HDDefaultSettings.instance.lightLayerName0; + m_RenderingLayerNames[1] = HDDefaultSettings.instance.lightLayerName1; + m_RenderingLayerNames[2] = HDDefaultSettings.instance.lightLayerName2; + m_RenderingLayerNames[3] = HDDefaultSettings.instance.lightLayerName3; + m_RenderingLayerNames[4] = HDDefaultSettings.instance.lightLayerName4; + m_RenderingLayerNames[5] = HDDefaultSettings.instance.lightLayerName5; + m_RenderingLayerNames[6] = HDDefaultSettings.instance.lightLayerName6; + m_RenderingLayerNames[7] = HDDefaultSettings.instance.lightLayerName7; + + m_RenderingLayerNames[8] = HDDefaultSettings.instance.decalLayerName0; + m_RenderingLayerNames[9] = HDDefaultSettings.instance.decalLayerName1; + m_RenderingLayerNames[10] = HDDefaultSettings.instance.decalLayerName2; + m_RenderingLayerNames[11] = HDDefaultSettings.instance.decalLayerName3; + m_RenderingLayerNames[12] = HDDefaultSettings.instance.decalLayerName4; + m_RenderingLayerNames[13] = HDDefaultSettings.instance.decalLayerName5; + m_RenderingLayerNames[14] = HDDefaultSettings.instance.decalLayerName6; + m_RenderingLayerNames[15] = HDDefaultSettings.instance.decalLayerName7; // Unused for (int i = 16; i < m_RenderingLayerNames.Length; ++i) @@ -276,6 +177,8 @@ public string[] lightLayerNames } } + //TODOJENNY - move to Default Settings + [System.NonSerialized] string[] m_DecalLayerNames = null; /// @@ -301,68 +204,67 @@ public string[] decalLayerNames /// HDRP default shader. public override Shader defaultShader - => m_RenderPipelineResources?.shaders.defaultPS; - - // List of custom post process Types that will be executed in the project, in the order of the list (top to back) - [SerializeField] - internal List beforeTransparentCustomPostProcesses = new List(); - [SerializeField] - internal List beforeTAACustomPostProcesses = new List(); - [SerializeField] - internal List beforePostProcessCustomPostProcesses = new List(); - [SerializeField] - internal List afterPostProcessCustomPostProcesses = new List(); + => defaultSettings.renderPipelineResources?.shaders.defaultPS; [SerializeField] internal VirtualTexturingSettingsSRP virtualTexturingSettings = new VirtualTexturingSettingsSRP(); + + [SerializeField] private bool m_UseRenderGraph = true; + + internal bool useRenderGraph + { + get => m_UseRenderGraph; + set => m_UseRenderGraph = value; + } + #if UNITY_EDITOR /// HDRP default material. public override Material defaultMaterial - => renderPipelineEditorResources?.materials.defaultDiffuseMat; + => defaultSettings.renderPipelineEditorResources?.materials.defaultDiffuseMat; // call to GetAutodeskInteractiveShaderXXX are only from within editor /// HDRP default autodesk interactive shader. public override Shader autodeskInteractiveShader - => renderPipelineEditorResources?.shaderGraphs.autodeskInteractive; + => defaultSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractive; /// HDRP default autodesk interactive transparent shader. public override Shader autodeskInteractiveTransparentShader - => renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveTransparent; + => defaultSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveTransparent; /// HDRP default autodesk interactive masked shader. public override Shader autodeskInteractiveMaskedShader - => renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveMasked; + => defaultSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveMasked; /// HDRP default terrain detail lit shader. public override Shader terrainDetailLitShader - => renderPipelineEditorResources?.shaders.terrainDetailLitShader; + => defaultSettings.renderPipelineEditorResources.shaders.terrainDetailLitShader; /// HDRP default terrain detail grass shader. public override Shader terrainDetailGrassShader - => renderPipelineEditorResources?.shaders.terrainDetailGrassShader; + => defaultSettings.renderPipelineEditorResources.shaders.terrainDetailGrassShader; /// HDRP default terrain detail grass billboard shader. public override Shader terrainDetailGrassBillboardShader - => renderPipelineEditorResources?.shaders.terrainDetailGrassBillboardShader; + => defaultSettings.renderPipelineEditorResources.shaders.terrainDetailGrassBillboardShader; // Note: This function is HD specific /// HDRP default Decal material. public Material GetDefaultDecalMaterial() - => renderPipelineEditorResources?.materials.defaultDecalMat; + => defaultSettings.renderPipelineEditorResources.materials.defaultDecalMat; // Note: This function is HD specific /// HDRP default mirror material. public Material GetDefaultMirrorMaterial() - => renderPipelineEditorResources?.materials.defaultMirrorMat; + => defaultSettings.renderPipelineEditorResources.materials.defaultMirrorMat; /// HDRP default particles material. public override Material defaultParticleMaterial - => renderPipelineEditorResources?.materials.defaultParticleMat; + => defaultSettings.renderPipelineEditorResources.materials.defaultParticleMat; /// HDRP default terrain material. public override Material defaultTerrainMaterial - => renderPipelineEditorResources?.materials.defaultTerrainMat; + => defaultSettings.renderPipelineEditorResources.materials.defaultTerrainMat; // Array structure that allow us to manipulate the set of defines that the HD render pipeline needs List defineArray = new List(); @@ -408,23 +310,6 @@ internal void EvaluateSettings() } } - internal bool AddDiffusionProfile(DiffusionProfileSettings profile) - { - if (diffusionProfileSettingsList.Length < 15) - { - int index = diffusionProfileSettingsList.Length; - Array.Resize(ref diffusionProfileSettingsList, index + 1); - diffusionProfileSettingsList[index] = profile; - UnityEditor.EditorUtility.SetDirty(this); - return true; - } - else - { - Debug.LogError("There are too many diffusion profile settings in your HDRP. Please remove one before adding a new one."); - return false; - } - } - #endif /// diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs index c10c22ad40a..af878ef84c4 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs @@ -242,7 +242,7 @@ PathTracingParameters PreparePathTracingParameters(HDCamera hdCamera) { PathTracingParameters parameters = new PathTracingParameters(); - parameters.pathTracingShader = m_Asset.renderPipelineRayTracingResources.pathTracing; + parameters.pathTracingShader = HDDefaultSettings.instance.renderPipelineRayTracingResources.pathTracing; parameters.cameraData = m_SubFrameManager.GetCameraData(hdCamera.camera.GetInstanceID()); parameters.ditheredTextureSet = GetBlueNoiseManager().DitheredTextureSet256SPP(); parameters.backgroundColor = hdCamera.backgroundColorHDR; @@ -321,7 +321,7 @@ TextureHandle RenderPathTracing(RenderGraph renderGraph, in PathTracingParameter TextureHandle RenderPathTracing(RenderGraph renderGraph, HDCamera hdCamera) { - RayTracingShader pathTracingShader = m_Asset.renderPipelineRayTracingResources.pathTracing; + RayTracingShader pathTracingShader = HDDefaultSettings.instance.renderPipelineRayTracingResources.pathTracing; m_PathTracingSettings = hdCamera.volumeStack.GetComponent(); // Check the validity of the state before moving on with the computation diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs index bdc47f7d17b..5b0a11b2c07 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs @@ -19,7 +19,7 @@ partial class HDRaytracingAmbientOcclusion public void Init(HDRenderPipeline renderPipeline) { // Keep track of the pipeline asset - m_PipelineRayTracingResources = renderPipeline.asset.renderPipelineRayTracingResources; + m_PipelineRayTracingResources = HDDefaultSettings.instance.renderPipelineRayTracingResources; // keep track of the render pipeline m_RenderPipeline = renderPipeline; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs index 70d0866aaf4..f8a9dc129cf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs @@ -16,7 +16,7 @@ public partial class HDRenderPipeline void InitRayTracedIndirectDiffuse() { - ComputeShader indirectDiffuseShaderCS = m_Asset.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + ComputeShader indirectDiffuseShaderCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; // Grab all the kernels we shall be using m_RaytracingIndirectDiffuseFullResKernel = indirectDiffuseShaderCS.FindKernel("RaytracingIndirectDiffuseFullRes"); @@ -68,9 +68,9 @@ DeferredLightingRTParameters PrepareIndirectDiffuseDeferredLightingRTParameters( deferredParameters.lightCluster = RequestLightCluster(); // Shaders - deferredParameters.gBufferRaytracingRT = m_Asset.renderPipelineRayTracingResources.gBufferRaytracingRT; - deferredParameters.deferredRaytracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; - deferredParameters.rayBinningCS = m_Asset.renderPipelineRayTracingResources.rayBinningCS; + deferredParameters.gBufferRaytracingRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; + deferredParameters.deferredRaytracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + deferredParameters.rayBinningCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.rayBinningCS; // XRTODO: add ray binning support for single-pass if (deferredParameters.viewCount > 1 && deferredParameters.rayBinning) @@ -121,7 +121,7 @@ RTIndirectDiffuseDirGenParameters PrepareRTIndirectDiffuseDirGenParameters(HDCam rtidDirGenParams.fullResolution = settings.fullResolution; // Grab the right kernel - rtidDirGenParams.directionGenCS = m_Asset.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + rtidDirGenParams.directionGenCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; rtidDirGenParams.dirGenKernel = settings.fullResolution ? m_RaytracingIndirectDiffuseFullResKernel : m_RaytracingIndirectDiffuseHalfResKernel; // Grab the additional parameters @@ -202,13 +202,13 @@ RTIndirectDiffuseUpscaleParameters PrepareRTIndirectDiffuseUpscaleParameters(HDC rtidUpscaleParams.upscaleRadius = settings.upscaleRadius; // Grab the right kernel - rtidUpscaleParams.upscaleCS = m_Asset.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + rtidUpscaleParams.upscaleCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; rtidUpscaleParams.upscaleKernel = settings.fullResolution ? m_IndirectDiffuseUpscaleFullResKernel : m_IndirectDiffuseUpscaleHalfResKernel; // Grab the additional parameters BlueNoise blueNoise = GetBlueNoiseManager(); rtidUpscaleParams.blueNoiseTexture = blueNoise.textureArray16RGB; - rtidUpscaleParams.scramblingTexture = m_Asset.renderPipelineResources.textures.scramblingTex; + rtidUpscaleParams.scramblingTexture = HDDefaultSettings.instance.renderPipelineResources.textures.scramblingTex; return rtidUpscaleParams; } @@ -274,7 +274,7 @@ AdjustRTIDWeightParameters PrepareAdjustRTIDWeightParametersParameters(HDCamera parameters.viewCount = hdCamera.viewCount; // Grab the right kernel - parameters.adjustWeightCS = m_Asset.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + parameters.adjustWeightCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; parameters.adjustWeightKernel = m_AdjustIndirectDiffuseWeightKernel; return parameters; @@ -341,7 +341,7 @@ QualityRTIndirectDiffuseParameters PrepareQualityRTIndirectDiffuseParameters(HDC qrtidParams.bounceCount = settings.bounceCount.value; // Grab the additional parameters - qrtidParams.indirectDiffuseRT = m_Asset.renderPipelineRayTracingResources.indirectDiffuseRaytracingRT; + qrtidParams.indirectDiffuseRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingRT; qrtidParams.accelerationStructure = RequestAccelerationStructure(); qrtidParams.lightCluster = RequestLightCluster(); qrtidParams.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs index 658138dee2e..f197abfdcf4 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs @@ -81,7 +81,7 @@ public void Initialize(HDRenderPipeline renderPipeline) { // Keep track of the external buffers m_RenderPipelineResources = renderPipeline.asset.renderPipelineResources; - m_RenderPipelineRayTracingResources = renderPipeline.asset.renderPipelineRayTracingResources; + m_RenderPipelineRayTracingResources = HDDefaultSettings.instance.renderPipelineRayTracingResources; // Keep track of the render pipeline m_RenderPipeline = renderPipeline; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs index 7adbba53340..5098caae0e2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs @@ -87,7 +87,7 @@ internal void InitRayTracingManager() { // Init the ray count manager m_RayCountManager = new RayCountManager(); - m_RayCountManager.Init(m_Asset.renderPipelineRayTracingResources); + m_RayCountManager.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); // Build the light cluster m_RayTracingLightCluster = new HDRaytracingLightCluster(); @@ -645,7 +645,7 @@ internal HDTemporalFilter GetTemporalFilter() if (m_TemporalFilter == null) { m_TemporalFilter = new HDTemporalFilter(); - m_TemporalFilter.Init(m_Asset.renderPipelineRayTracingResources); + m_TemporalFilter.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); } return m_TemporalFilter; } @@ -655,7 +655,7 @@ internal HDSimpleDenoiser GetSimpleDenoiser() if (m_SimpleDenoiser == null) { m_SimpleDenoiser = new HDSimpleDenoiser(); - m_SimpleDenoiser.Init(m_Asset.renderPipelineRayTracingResources); + m_SimpleDenoiser.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); } return m_SimpleDenoiser; } @@ -665,7 +665,7 @@ internal SSGIDenoiser GetSSGIDenoiser() if (m_SSGIDenoiser == null) { m_SSGIDenoiser = new SSGIDenoiser(); - m_SSGIDenoiser.Init(m_Asset.renderPipelineResources); + m_SSGIDenoiser.Init(HDDefaultSettings.instance.renderPipelineResources); } return m_SSGIDenoiser; } @@ -675,7 +675,7 @@ internal HDDiffuseDenoiser GetDiffuseDenoiser() if (m_DiffuseDenoiser == null) { m_DiffuseDenoiser = new HDDiffuseDenoiser(); - m_DiffuseDenoiser.Init(m_Asset.renderPipelineResources, m_Asset.renderPipelineRayTracingResources, this); + m_DiffuseDenoiser.Init(HDDefaultSettings.instance.renderPipelineResources, HDDefaultSettings.instance.renderPipelineRayTracingResources, this); } return m_DiffuseDenoiser; } @@ -685,7 +685,7 @@ internal HDReflectionDenoiser GetReflectionDenoiser() if (m_ReflectionDenoiser == null) { m_ReflectionDenoiser = new HDReflectionDenoiser(); - m_ReflectionDenoiser.Init(m_Asset.renderPipelineRayTracingResources); + m_ReflectionDenoiser.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); } return m_ReflectionDenoiser; } @@ -695,7 +695,7 @@ internal HDDiffuseShadowDenoiser GetDiffuseShadowDenoiser() if (m_DiffuseShadowDenoiser == null) { m_DiffuseShadowDenoiser = new HDDiffuseShadowDenoiser(); - m_DiffuseShadowDenoiser.Init(m_Asset.renderPipelineRayTracingResources); + m_DiffuseShadowDenoiser.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); } return m_DiffuseShadowDenoiser; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs index 69d05b643fe..305919972ae 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs @@ -72,7 +72,7 @@ RecursiveRendererParameters PrepareRecursiveRendererParameters(HDCamera hdCamera // Other data rrParams.accelerationStructure = RequestAccelerationStructure(); rrParams.lightCluster = RequestLightCluster(); - rrParams.recursiveRenderingRT = m_Asset.renderPipelineRayTracingResources.forwardRaytracing; + rrParams.recursiveRenderingRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.forwardRaytracing; rrParams.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); rrParams.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; BlueNoise blueNoise = GetBlueNoiseManager(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs index b83d7ad8390..f664eab067e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs @@ -21,8 +21,8 @@ public partial class HDRenderPipeline void InitRayTracedReflections() { - ComputeShader reflectionShaderCS = m_Asset.renderPipelineRayTracingResources.reflectionRaytracingCS; - ComputeShader reflectionBilateralFilterCS = m_Asset.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + ComputeShader reflectionShaderCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; + ComputeShader reflectionBilateralFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; // Grab all the kernels we shall be using m_RaytracingReflectionsFullResKernel = reflectionShaderCS.FindKernel("RaytracingReflectionsFullRes"); @@ -72,7 +72,7 @@ RTReflectionDirGenParameters PrepareRTReflectionDirGenParameters(HDCamera hdCame rtrDirGenParams.minSmoothness = settings.minSmoothness; // Grab the right kernel - rtrDirGenParams.directionGenCS = m_Asset.renderPipelineRayTracingResources.reflectionRaytracingCS; + rtrDirGenParams.directionGenCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; if (settings.fullResolution) { rtrDirGenParams.dirGenKernel = transparent ? m_RaytracingReflectionsTransparentFullResKernel : m_RaytracingReflectionsFullResKernel; @@ -172,9 +172,9 @@ DeferredLightingRTParameters PrepareReflectionDeferredLightingRTParameters(HDCam deferredParameters.lightCluster = RequestLightCluster(); // Shaders - deferredParameters.gBufferRaytracingRT = m_Asset.renderPipelineRayTracingResources.gBufferRaytracingRT; - deferredParameters.deferredRaytracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; - deferredParameters.rayBinningCS = m_Asset.renderPipelineRayTracingResources.rayBinningCS; + deferredParameters.gBufferRaytracingRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; + deferredParameters.deferredRaytracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + deferredParameters.rayBinningCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.rayBinningCS; // XRTODO: add ray binning support for single-pass if (deferredParameters.viewCount > 1 && deferredParameters.rayBinning) @@ -232,7 +232,7 @@ RTReflectionUpscaleParameters PrepareRTReflectionUpscaleParameters(HDCamera hdCa // Other parameters rtrUpscaleParams.blueNoiseTexture = GetBlueNoiseManager().textureArray16RGB; - rtrUpscaleParams.reflectionFilterCS = m_Asset.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + rtrUpscaleParams.reflectionFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; return rtrUpscaleParams; } @@ -313,7 +313,7 @@ RTRQualityRenderingParameters PrepareRTRQualityRenderingParameters(HDCamera hdCa rtrQualityRenderingParameters.ditheredTextureSet = blueNoise.DitheredTextureSet8SPP(); rtrQualityRenderingParameters.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; rtrQualityRenderingParameters.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); - rtrQualityRenderingParameters.reflectionShader = m_Asset.renderPipelineRayTracingResources.reflectionRaytracingRT; + rtrQualityRenderingParameters.reflectionShader = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingRT; return rtrQualityRenderingParameters; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs index 0896dc0db4a..5c53ca853a8 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs @@ -837,12 +837,12 @@ internal static void Sanitize(ref FrameSettings sanitizedFrameSettings, Camera c /// The camera rendering. /// Additional data of the camera rendering. /// HDRenderPipelineAsset contening default FrameSettings. - internal static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSettings, Camera camera, HDAdditionalCameraData additionalData, HDRenderPipelineAsset hdrpAsset, HDRenderPipelineAsset defaultHdrpAsset) + internal static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSettings, Camera camera, HDAdditionalCameraData additionalData, HDRenderPipelineAsset hdrpAsset) => AggregateFrameSettings( ref aggregatedFrameSettings, camera, additionalData, - ref defaultHdrpAsset.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera + ref HDDefaultSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera hdrpAsset.currentPlatformRenderPipelineSettings ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs index 125120fabad..961eef8eb9c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs @@ -62,7 +62,7 @@ string IFrameSettingsHistoryContainer.panelName => "Scene Camera"; public MinimalHistoryContainer() - => m_FrameSettingsHistory.debug = HDRenderPipeline.defaultAsset?.GetDefaultFrameSettings(FrameSettingsRenderType.Camera) ?? new FrameSettings(); + => m_FrameSettingsHistory.debug = HDDefaultSettings.instance?.GetDefaultFrameSettings(FrameSettingsRenderType.Camera) ?? new FrameSettings(); Action IDebugData.GetReset() //caution: we actually need to retrieve the @@ -120,8 +120,7 @@ static FrameSettingsHistory() /// The aggregated FrameSettings result. /// The camera rendering. /// Additional data of the camera rendering. - /// HDRenderPipelineAsset contening default FrameSettings. - public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSettings, Camera camera, HDAdditionalCameraData additionalData, HDRenderPipelineAsset hdrpAsset, HDRenderPipelineAsset defaultHdrpAsset) + public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSettings, Camera camera, HDAdditionalCameraData additionalData, HDRenderPipelineAsset hdrpAsset) => AggregateFrameSettings( ref aggregatedFrameSettings, camera, @@ -129,7 +128,7 @@ public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSetti camera.cameraType == CameraType.SceneView ? sceneViewFrameSettingsContainer : #endif additionalData, - ref defaultHdrpAsset.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera + ref HDDefaultSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera hdrpAsset.currentPlatformRenderPipelineSettings ); @@ -177,7 +176,7 @@ public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSetti historyContainer.frameSettingsHistory = history; } - static DebugUI.HistoryBoolField GenerateHistoryBoolField(HDRenderPipelineAsset defaultHdrpAsset, IFrameSettingsHistoryContainer frameSettingsContainer, FrameSettingsField field, FrameSettingsFieldAttribute attribute) + static DebugUI.HistoryBoolField GenerateHistoryBoolField(IFrameSettingsHistoryContainer frameSettingsContainer, FrameSettingsField field, FrameSettingsFieldAttribute attribute) { string displayIndent = ""; for (int indent = 0; indent < attribute.indentLevel; ++indent) @@ -196,12 +195,12 @@ static DebugUI.HistoryBoolField GenerateHistoryBoolField(HDRenderPipelineAsset d { () => frameSettingsContainer.frameSettingsHistory.sanitazed.IsEnabled(field), () => frameSettingsContainer.frameSettingsHistory.overridden.IsEnabled(field), - () => defaultHdrpAsset.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) + () => HDDefaultSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) } }; } - static DebugUI.HistoryEnumField GenerateHistoryEnumField(HDRenderPipelineAsset defaultHdrpAsset, IFrameSettingsHistoryContainer frameSettingsContainer, FrameSettingsField field, FrameSettingsFieldAttribute attribute, Type autoEnum) + static DebugUI.HistoryEnumField GenerateHistoryEnumField(IFrameSettingsHistoryContainer frameSettingsContainer, FrameSettingsField field, FrameSettingsFieldAttribute attribute, Type autoEnum) { string displayIndent = ""; for (int indent = 0; indent < attribute.indentLevel; ++indent) @@ -227,12 +226,12 @@ static DebugUI.HistoryEnumField GenerateHistoryEnumField(HDRenderPipelineAsset d { () => frameSettingsContainer.frameSettingsHistory.sanitazed.IsEnabled(field) ? 1 : 0, () => frameSettingsContainer.frameSettingsHistory.overridden.IsEnabled(field) ? 1 : 0, - () => defaultHdrpAsset.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) ? 1 : 0 + () => HDDefaultSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) ? 1 : 0 } }; } - static ObservableList GenerateHistoryArea(HDRenderPipelineAsset defaultHdrpAsset, IFrameSettingsHistoryContainer frameSettingsContainer, int groupIndex) + static ObservableList GenerateHistoryArea(IFrameSettingsHistoryContainer frameSettingsContainer, int groupIndex) { if (!attributesGroup.ContainsKey(groupIndex) || attributesGroup[groupIndex] == null) attributesGroup[groupIndex] = attributes?.Where(pair => pair.Value?.group == groupIndex)?.OrderBy(pair => pair.Value.orderInGroup); @@ -246,14 +245,12 @@ static DebugUI.HistoryEnumField GenerateHistoryEnumField(HDRenderPipelineAsset d { case FrameSettingsFieldAttribute.DisplayType.BoolAsCheckbox: area.Add(GenerateHistoryBoolField( - defaultHdrpAsset, frameSettingsContainer, field.Key, field.Value)); break; case FrameSettingsFieldAttribute.DisplayType.BoolAsEnumPopup: area.Add(GenerateHistoryEnumField( - defaultHdrpAsset, frameSettingsContainer, field.Key, field.Value, @@ -267,21 +264,20 @@ static DebugUI.HistoryEnumField GenerateHistoryEnumField(HDRenderPipelineAsset d return area; } - static DebugUI.Widget[] GenerateFrameSettingsPanelContent(HDRenderPipelineAsset defaultHdrpAsset, IFrameSettingsHistoryContainer frameSettingsContainer) + static DebugUI.Widget[] GenerateFrameSettingsPanelContent(IFrameSettingsHistoryContainer frameSettingsContainer) { var panelContent = new DebugUI.Widget[foldoutNames.Length]; for (int index = 0; index < foldoutNames.Length; ++index) { - panelContent[index] = new DebugUI.Foldout(foldoutNames[index], GenerateHistoryArea(defaultHdrpAsset, frameSettingsContainer, index), columnNames); + panelContent[index] = new DebugUI.Foldout(foldoutNames[index], GenerateHistoryArea(frameSettingsContainer, index), columnNames); } return panelContent; } static void GenerateFrameSettingsPanel(string menuName, IFrameSettingsHistoryContainer frameSettingsContainer) { - HDRenderPipelineAsset defaultHdrpAsset = HDRenderPipeline.defaultAsset; List widgets = new List(); - widgets.AddRange(GenerateFrameSettingsPanelContent(defaultHdrpAsset, frameSettingsContainer)); + widgets.AddRange(GenerateFrameSettingsPanelContent(frameSettingsContainer)); var panel = DebugManager.instance.GetPanel( menuName, createIfNull: true, diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs index ce4622f6685..f4697490e1d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs @@ -93,14 +93,6 @@ internal static RenderPipelineSettings NewDefault() supportedLitShaderMode = SupportedLitShaderMode.DeferredOnly, supportDecals = true, supportDecalLayers = false, - decalLayerName0 = "Decal Layer default", - decalLayerName1 = "Decal Layer 1", - decalLayerName2 = "Decal Layer 2", - decalLayerName3 = "Decal Layer 3", - decalLayerName4 = "Decal Layer 4", - decalLayerName5 = "Decal Layer 5", - decalLayerName6 = "Decal Layer 6", - decalLayerName7 = "Decal Layer 7", msaaSampleCount = MSAASamples.None, supportMotionVectors = true, supportRuntimeDebugDisplay = false, @@ -126,14 +118,6 @@ internal static RenderPipelineSettings NewDefault() supportedRayTracingMode = SupportedRayTracingMode.Both, lodBias = new FloatScalableSetting(new[] { 1.0f, 1, 1 }, ScalableSettingSchemaId.With3Levels), maximumLODLevel = new IntScalableSetting(new[] { 0, 0, 0 }, ScalableSettingSchemaId.With3Levels), - lightLayerName0 = "Light Layer default", - lightLayerName1 = "Light Layer 1", - lightLayerName2 = "Light Layer 2", - lightLayerName3 = "Light Layer 3", - lightLayerName4 = "Light Layer 4", - lightLayerName5 = "Light Layer 5", - lightLayerName6 = "Light Layer 6", - lightLayerName7 = "Light Layer 7", supportProbeVolume = false, probeVolumeSettings = GlobalProbeVolumeSettings.@default, }; @@ -193,21 +177,53 @@ public PlanarReflectionAtlasResolutionScalableSetting(PlanarReflectionAtlasResol /// Support light layers. public bool supportLightLayers; /// Name for light layer 0. - public string lightLayerName0; + public string lightLayerName0 + { + get { return HDDefaultSettings.instance.lightLayerName0; } + set { HDDefaultSettings.instance.lightLayerName0 = value; } + } /// Name for light layer 1. - public string lightLayerName1; + public string lightLayerName1 + { + get { return HDDefaultSettings.instance.lightLayerName1; } + set { HDDefaultSettings.instance.lightLayerName1 = value; } + } /// Name for light layer 2. - public string lightLayerName2; + public string lightLayerName2 + { + get { return HDDefaultSettings.instance.lightLayerName2; } + set { HDDefaultSettings.instance.lightLayerName2 = value; } + } /// Name for light layer 3. - public string lightLayerName3; + public string lightLayerName3 + { + get { return HDDefaultSettings.instance.lightLayerName3; } + set { HDDefaultSettings.instance.lightLayerName3 = value; } + } /// Name for light layer 4. - public string lightLayerName4; + public string lightLayerName4 + { + get { return HDDefaultSettings.instance.lightLayerName4; } + set { HDDefaultSettings.instance.lightLayerName4 = value; } + } /// Name for light layer 5. - public string lightLayerName5; + public string lightLayerName5 + { + get { return HDDefaultSettings.instance.lightLayerName5; } + set { HDDefaultSettings.instance.lightLayerName5 = value; } + } /// Name for light layer 6. - public string lightLayerName6; + public string lightLayerName6 + { + get { return HDDefaultSettings.instance.lightLayerName6; } + set { HDDefaultSettings.instance.lightLayerName6 = value; } + } /// Name for light layer 7. - public string lightLayerName7; + public string lightLayerName7 + { + get { return HDDefaultSettings.instance.lightLayerName7; } + set { HDDefaultSettings.instance.lightLayerName7 = value; } + } /// Support distortion. public bool supportDistortion; /// Support transparent backface pass. @@ -232,21 +248,53 @@ public PlanarReflectionAtlasResolutionScalableSetting(PlanarReflectionAtlasResol /// Support decal Layers. public bool supportDecalLayers; /// Name for decal layer 0. - public string decalLayerName0; + public string decalLayerName0 + { + get { return HDDefaultSettings.instance.decalLayerName0; } + set { HDDefaultSettings.instance.decalLayerName0 = value; } + } /// Name for decal layer 1. - public string decalLayerName1; + public string decalLayerName1 + { + get { return HDDefaultSettings.instance.decalLayerName1; } + set { HDDefaultSettings.instance.decalLayerName1 = value; } + } /// Name for decal layer 2. - public string decalLayerName2; + public string decalLayerName2 + { + get { return HDDefaultSettings.instance.decalLayerName2; } + set { HDDefaultSettings.instance.decalLayerName2 = value; } + } /// Name for decal layer 3. - public string decalLayerName3; + public string decalLayerName3 + { + get { return HDDefaultSettings.instance.decalLayerName3; } + set { HDDefaultSettings.instance.decalLayerName3 = value; } + } /// Name for decal layer 4. - public string decalLayerName4; + public string decalLayerName4 + { + get { return HDDefaultSettings.instance.decalLayerName4; } + set { HDDefaultSettings.instance.decalLayerName4 = value; } + } /// Name for decal layer 5. - public string decalLayerName5; + public string decalLayerName5 + { + get { return HDDefaultSettings.instance.decalLayerName5; } + set { HDDefaultSettings.instance.decalLayerName5 = value; } + } /// Name for decal layer 6. - public string decalLayerName6; + public string decalLayerName6 + { + get { return HDDefaultSettings.instance.decalLayerName6; } + set { HDDefaultSettings.instance.decalLayerName6 = value; } + } /// Name for decal layer 7. - public string decalLayerName7; + public string decalLayerName7 + { + get { return HDDefaultSettings.instance.decalLayerName7; } + set { HDDefaultSettings.instance.decalLayerName7 = value; } + } /// Number of samples when using MSAA. public MSAASamples msaaSampleCount; @@ -305,6 +353,40 @@ public PlanarReflectionAtlasResolutionScalableSetting(PlanarReflectionAtlasResol #pragma warning disable 618 // Type or member is obsolete [Obsolete("For data migration")] internal bool m_ObsoleteincreaseSssSampleCount; + + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName0; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName1; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName2; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName3; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName4; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName5; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName6; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletelightLayerName7; + + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName0; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName1; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName2; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName3; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName4; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName5; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName6; + [Obsolete("Moved to HDDefault Settings")] + internal string m_ObsoletedecalLayerName7; #pragma warning restore 618 } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs index c6185774709..0dee6ef2878 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs @@ -113,6 +113,9 @@ void GetSkyFromIDAndVolume(int skyUniqueID, VolumeProfile profile, out SkySettin void UpdateCurrentStaticLightingSky() { + if ((RenderPipelineManager.currentPipeline is HDRenderPipeline) == false) + return; + // First, grab the sky settings of the right type in the profile. CoreUtils.Destroy(m_SkySettings); m_SkySettings = null; @@ -132,7 +135,7 @@ void UpdateCurrentStaticLightingSky() var newSkyParameters = m_SkySettings.parameters; var profileSkyParameters = m_SkySettingsFromProfile.parameters; - var defaultVolume = HDRenderPipeline.GetOrCreateDefaultVolume(); + var defaultVolume = HDDefaultSettings.instance.GetOrCreateDefaultVolume(); SkySettings defaultSky = null; if (defaultVolume.sharedProfile != null) // This can happen with old projects. defaultVolume.sharedProfile.TryGet(skyType, out defaultSky); From 075f82244fa12389679960ad8122db9db854882a Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 22 Dec 2020 11:02:19 +0100 Subject: [PATCH 02/58] Fixed Scene Template to refer to currentAsset instead of defaultAsset --- .../Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs | 2 +- .../Editor/SceneTemplates/HDRPBasicScenePipeline.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs index 1c019306bcc..ad98c70f231 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicDxrScenePipeline.cs @@ -14,7 +14,7 @@ void ISceneTemplatePipeline.BeforeTemplateInstantiation(SceneTemplateAsset scene bool ISceneTemplatePipeline.IsValidTemplateForInstantiation(SceneTemplateAsset sceneTemplateAsset) { - var hdrpAsset = HDRenderPipeline.currentAsset; //TODOJENNY - this used to be defaultAsset + var hdrpAsset = HDRenderPipeline.currentAsset; if (hdrpAsset == null) return false; return hdrpAsset.currentPlatformRenderPipelineSettings.supportRayTracing; diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs index 2e51cd1fea0..8ea289125f7 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/HDRPBasicScenePipeline.cs @@ -14,7 +14,7 @@ void ISceneTemplatePipeline.BeforeTemplateInstantiation(SceneTemplateAsset scene bool ISceneTemplatePipeline.IsValidTemplateForInstantiation(SceneTemplateAsset sceneTemplateAsset) { - var hdrpAsset = HDRenderPipeline.currentAsset; //TODOJENNY - this used to be defaultAsset + var hdrpAsset = HDRenderPipeline.currentAsset; if (hdrpAsset == null) return false; return !hdrpAsset.currentPlatformRenderPipelineSettings.supportRayTracing; From c4a0df6f58c10e3f681bede1de3a253bd7369bda Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 22 Dec 2020 15:28:47 +0100 Subject: [PATCH 03/58] Fixed light+decal layers serialization --- .../RenderPipeline/HDRenderPipelineUI.Skin.cs | 8 ----- .../Settings/DefaultSettingsPanel.cs | 32 +++++++++---------- .../SerializedRenderPipelineSettings.cs | 32 ------------------- 3 files changed, 16 insertions(+), 56 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs index e293c1217bb..485c1a5d1ef 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs @@ -94,14 +94,6 @@ public class GeneralSection public static readonly GUIContent supportVolumetricContent = EditorGUIUtility.TrTextContent("Volumetrics", "When enabled, HDRP allocates Shader variants and memory for volumetric effects. This allows you to use volumetric lighting and fog in your Unity Project."); public static readonly GUIContent volumetricResolutionContent = EditorGUIUtility.TrTextContent("High Quality ", "When enabled, HDRP increases the resolution of volumetric lighting buffers. Warning: There is a high performance cost, do not enable on consoles."); public static readonly GUIContent supportLightLayerContent = EditorGUIUtility.TrTextContent("Light Layers", "When enabled, HDRP allocates memory for processing Light Layers. This allows you to use Light Layers in your Unity Project. For deferred rendering, this allocation includes an extra render target in memory and extra cost."); - public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer Name 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); - public static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer Name 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); - public static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer Name 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); - public static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer Name 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); - public static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer Name 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); - public static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer Name 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); - public static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer Name 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); - public static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer Name 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); public static readonly GUIContent colorBufferFormatContent = EditorGUIUtility.TrTextContent("Color Buffer Format", "Specifies the format used by the scene color render target. R11G11B10 is a faster option and should have sufficient precision."); public static readonly GUIContent supportCustomPassContent = EditorGUIUtility.TrTextContent("Custom Pass", "When enabled, HDRP allocates a custom pass buffer. It also enable custom passes inside Custom Pass Volume components."); public static readonly GUIContent customBufferFormatContent = EditorGUIUtility.TrTextContent("Custom Buffer Format", "Specifies the format used by the custom pass render target."); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 728e1289efb..68a3f127069 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -59,24 +59,24 @@ public class Styles internal static readonly GUIContent layerNamesIntro = EditorGUIUtility.TrTextContent("By default, Mesh Renderers, or Terrain, Decal Layers are named **Decal Layer 1-7**. To more easily differentiate between them, you can give each Decal Layer a specific name in this section."); internal static readonly GUIContent lightLayersLabel = EditorGUIUtility.TrTextContent("Light Layers Names", "When enabled, HDRP allocates memory for processing Light Layers. For deferred rendering, this allocation includes an extra render target in memory and extra cost. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); - internal static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); - internal static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); - internal static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); - internal static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); - internal static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); - internal static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); - internal static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); - internal static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); + public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer Name 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); + public static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer Name 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); + public static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer Name 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); + public static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer Name 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); + public static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer Name 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); + public static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer Name 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); + public static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer Name 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); + public static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer Name 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); internal static readonly GUIContent decalLayersLabel = EditorGUIUtility.TrTextContent("Decal Layers Names", "When enabled, HDRP allocates Shader variants and memory to the decals buffer and cluster decal. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); - internal static readonly GUIContent decalLayerName0 = EditorGUIUtility.TrTextContent("Decal Layer 0", "The display name for Decal Layer 0. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 0"); - internal static readonly GUIContent decalLayerName1 = EditorGUIUtility.TrTextContent("Decal Layer 1", "The display name for Decal Layer 1. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 1"); - internal static readonly GUIContent decalLayerName2 = EditorGUIUtility.TrTextContent("Decal Layer 2", "The display name for Decal Layer 2. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 2"); - internal static readonly GUIContent decalLayerName3 = EditorGUIUtility.TrTextContent("Decal Layer 3", "The display name for Decal Layer 3. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 3"); - internal static readonly GUIContent decalLayerName4 = EditorGUIUtility.TrTextContent("Decal Layer 4", "The display name for Decal Layer 4. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 4"); - internal static readonly GUIContent decalLayerName5 = EditorGUIUtility.TrTextContent("Decal Layer 5", "The display name for Decal Layer 5. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 5"); - internal static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); - internal static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); + public static readonly GUIContent decalLayerName0 = EditorGUIUtility.TrTextContent("Decal Layer Name 0", "The display name for Decal Layer 0. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 0"); + public static readonly GUIContent decalLayerName1 = EditorGUIUtility.TrTextContent("Decal Layer Name 1", "The display name for Decal Layer 1. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 1"); + public static readonly GUIContent decalLayerName2 = EditorGUIUtility.TrTextContent("Decal Layer Name 2", "The display name for Decal Layer 2. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 2"); + public static readonly GUIContent decalLayerName3 = EditorGUIUtility.TrTextContent("Decal Layer Name 3", "The display name for Decal Layer 3. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 3"); + public static readonly GUIContent decalLayerName4 = EditorGUIUtility.TrTextContent("Decal Layer Name 4", "The display name for Decal Layer 4. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 4"); + public static readonly GUIContent decalLayerName5 = EditorGUIUtility.TrTextContent("Decal Layer Name 5", "The display name for Decal Layer 5. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 5"); + public static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer Name 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); + public static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer Name 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); internal static readonly GUIContent shaderVariantLogLevel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information appears in the Unity Console when the build finishes.."); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedRenderPipelineSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedRenderPipelineSettings.cs index c53ee8030f9..5963d3c19a0 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedRenderPipelineSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedRenderPipelineSettings.cs @@ -28,14 +28,6 @@ class SerializedRenderPipelineSettings [FormerlySerializedAs("supportVolumetric")] public SerializedProperty supportVolumetrics; public SerializedProperty supportLightLayers; - public SerializedProperty lightLayerName0; - public SerializedProperty lightLayerName1; - public SerializedProperty lightLayerName2; - public SerializedProperty lightLayerName3; - public SerializedProperty lightLayerName4; - public SerializedProperty lightLayerName5; - public SerializedProperty lightLayerName6; - public SerializedProperty lightLayerName7; public SerializedProperty supportedLitShaderMode; public SerializedProperty colorBufferFormat; public SerializedProperty supportCustomPass; @@ -44,14 +36,6 @@ class SerializedRenderPipelineSettings public SerializedProperty supportDecals; public SerializedProperty supportDecalLayers; - public SerializedProperty decalLayerName0; - public SerializedProperty decalLayerName1; - public SerializedProperty decalLayerName2; - public SerializedProperty decalLayerName3; - public SerializedProperty decalLayerName4; - public SerializedProperty decalLayerName5; - public SerializedProperty decalLayerName6; - public SerializedProperty decalLayerName7; public bool supportMSAA => MSAASampleCount.GetEnumValue() != UnityEngine.Rendering.MSAASamples.None; public SerializedProperty MSAASampleCount; @@ -102,14 +86,6 @@ public SerializedRenderPipelineSettings(SerializedProperty root) sssSampleBudget = new SerializedScalableSetting(root.Find((RenderPipelineSettings s) => s.sssSampleBudget)); supportVolumetrics = root.Find((RenderPipelineSettings s) => s.supportVolumetrics); supportLightLayers = root.Find((RenderPipelineSettings s) => s.supportLightLayers); - lightLayerName0 = root.Find((RenderPipelineSettings s) => s.lightLayerName0); - lightLayerName1 = root.Find((RenderPipelineSettings s) => s.lightLayerName1); - lightLayerName2 = root.Find((RenderPipelineSettings s) => s.lightLayerName2); - lightLayerName3 = root.Find((RenderPipelineSettings s) => s.lightLayerName3); - lightLayerName4 = root.Find((RenderPipelineSettings s) => s.lightLayerName4); - lightLayerName5 = root.Find((RenderPipelineSettings s) => s.lightLayerName5); - lightLayerName6 = root.Find((RenderPipelineSettings s) => s.lightLayerName6); - lightLayerName7 = root.Find((RenderPipelineSettings s) => s.lightLayerName7); colorBufferFormat = root.Find((RenderPipelineSettings s) => s.colorBufferFormat); customBufferFormat = root.Find((RenderPipelineSettings s) => s.customBufferFormat); supportCustomPass = root.Find((RenderPipelineSettings s) => s.supportCustomPass); @@ -118,14 +94,6 @@ public SerializedRenderPipelineSettings(SerializedProperty root) supportDecals = root.Find((RenderPipelineSettings s) => s.supportDecals); supportDecalLayers = root.Find((RenderPipelineSettings s) => s.supportDecalLayers); - decalLayerName0 = root.Find((RenderPipelineSettings s) => s.decalLayerName0); - decalLayerName1 = root.Find((RenderPipelineSettings s) => s.decalLayerName1); - decalLayerName2 = root.Find((RenderPipelineSettings s) => s.decalLayerName2); - decalLayerName3 = root.Find((RenderPipelineSettings s) => s.decalLayerName3); - decalLayerName4 = root.Find((RenderPipelineSettings s) => s.decalLayerName4); - decalLayerName5 = root.Find((RenderPipelineSettings s) => s.decalLayerName5); - decalLayerName6 = root.Find((RenderPipelineSettings s) => s.decalLayerName6); - decalLayerName7 = root.Find((RenderPipelineSettings s) => s.decalLayerName7); MSAASampleCount = root.Find((RenderPipelineSettings s) => s.msaaSampleCount); supportMotionVectors = root.Find((RenderPipelineSettings s) => s.supportMotionVectors); supportRuntimeDebugDisplay = root.Find((RenderPipelineSettings s) => s.supportRuntimeDebugDisplay); From fb7cf047522076722ca673ae587168ae25be89f4 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Wed, 6 Jan 2021 13:39:10 +0100 Subject: [PATCH 04/58] Revert "Fixed light+decal layers serialization" + a few other fixes This reverts commit c4a0df6f58c10e3f681bede1de3a253bd7369bda. --- .../Editor/RenderPipeline/HDAssetFactory.cs | 4 +- .../Editor/RenderPipeline/HDEditorUtils.cs | 4 +- .../RenderPipeline/HDRenderPipelineUI.Skin.cs | 16 ++++---- .../Settings/DefaultSettingsPanel.cs | 38 +++++++++---------- .../Settings/FrameSettingsUI.Drawers.cs | 2 +- .../RenderPipeline/HDDefaultSettings.cs | 34 ++++++++--------- .../RenderPipeline/HDRenderPipelineAsset.cs | 2 - .../Settings/RenderPipelineSettings.cs | 32 ++++++++-------- 8 files changed, 65 insertions(+), 67 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index c16214e1284..4bcc3dbc32f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -126,7 +126,7 @@ public static void Clone(HDDefaultSettings src) settings = src; var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); var assetCreator = ScriptableObject.CreateInstance(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/New HDDefaultSettings.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); } } @@ -134,7 +134,7 @@ public static void Clone(HDDefaultSettings src) internal static void CreateHDDefaultSettings() { var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDDefaultSettings.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDDefaultSettings.asset", icon, null); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs index 21c7989ce0a..e0fdbec576f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs @@ -234,7 +234,7 @@ internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, Se EditorGUI.BeginProperty(rect, label, property); EditorGUI.BeginChangeCheck(); - int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDRenderPipeline.currentAsset.decalLayerNames); //TODOJENNY + int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDRenderPipeline.currentAsset.decalLayerNames); if (EditorGUI.EndChangeCheck()) property.intValue = changedValue; @@ -251,7 +251,7 @@ internal static int DrawLightLayerMask(Rect rect, int value, GUIContent label = return lightLayer; EditorGUI.BeginChangeCheck(); - lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDRenderPipeline.currentAsset.lightLayerNames); //TODOJENNY + lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDRenderPipeline.currentAsset.lightLayerNames); if (EditorGUI.EndChangeCheck()) lightLayer = HDAdditionalLightData.LightLayerToRenderingLayerMask(lightLayer, value); return lightLayer; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs index 485c1a5d1ef..1d3f69469ef 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs @@ -94,6 +94,14 @@ public class GeneralSection public static readonly GUIContent supportVolumetricContent = EditorGUIUtility.TrTextContent("Volumetrics", "When enabled, HDRP allocates Shader variants and memory for volumetric effects. This allows you to use volumetric lighting and fog in your Unity Project."); public static readonly GUIContent volumetricResolutionContent = EditorGUIUtility.TrTextContent("High Quality ", "When enabled, HDRP increases the resolution of volumetric lighting buffers. Warning: There is a high performance cost, do not enable on consoles."); public static readonly GUIContent supportLightLayerContent = EditorGUIUtility.TrTextContent("Light Layers", "When enabled, HDRP allocates memory for processing Light Layers. This allows you to use Light Layers in your Unity Project. For deferred rendering, this allocation includes an extra render target in memory and extra cost."); + public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer Name 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); + public static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer Name 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); + public static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer Name 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); + public static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer Name 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); + public static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer Name 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); + public static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer Name 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); + public static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer Name 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); + public static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer Name 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); public static readonly GUIContent colorBufferFormatContent = EditorGUIUtility.TrTextContent("Color Buffer Format", "Specifies the format used by the scene color render target. R11G11B10 is a faster option and should have sufficient precision."); public static readonly GUIContent supportCustomPassContent = EditorGUIUtility.TrTextContent("Custom Pass", "When enabled, HDRP allocates a custom pass buffer. It also enable custom passes inside Custom Pass Volume components."); public static readonly GUIContent customBufferFormatContent = EditorGUIUtility.TrTextContent("Custom Buffer Format", "Specifies the format used by the custom pass render target."); @@ -101,14 +109,6 @@ public class GeneralSection public static readonly GUIContent MSAASampleCountContent = EditorGUIUtility.TrTextContent("Multisample Anti-aliasing Quality", "Specifies the maximum quality HDRP supports for MSAA. Set Lit Shader Mode to Forward Only or Both to use this feature."); public static readonly GUIContent supportDecalContent = EditorGUIUtility.TrTextContent("Enable", "When enabled, HDRP allocates Shader variants and memory to the decals buffer and cluster decal. This allows you to use decals in your Unity Project."); public static readonly GUIContent supportDecalLayersContent = EditorGUIUtility.TrTextContent("Layers", "When enabled, HDRP allocates Shader variants and memory to the decals layers buffer. This allows you to use decal layers in your Unity Project."); - public static readonly GUIContent decalLayerName0 = EditorGUIUtility.TrTextContent("Decal Layer Name 0", "The display name for Decal Layer 0. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 0"); - public static readonly GUIContent decalLayerName1 = EditorGUIUtility.TrTextContent("Decal Layer Name 1", "The display name for Decal Layer 1. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 1"); - public static readonly GUIContent decalLayerName2 = EditorGUIUtility.TrTextContent("Decal Layer Name 2", "The display name for Decal Layer 2. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 2"); - public static readonly GUIContent decalLayerName3 = EditorGUIUtility.TrTextContent("Decal Layer Name 3", "The display name for Decal Layer 3. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 3"); - public static readonly GUIContent decalLayerName4 = EditorGUIUtility.TrTextContent("Decal Layer Name 4", "The display name for Decal Layer 4. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 4"); - public static readonly GUIContent decalLayerName5 = EditorGUIUtility.TrTextContent("Decal Layer Name 5", "The display name for Decal Layer 5. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 5"); - public static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer Name 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); - public static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer Name 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); public static readonly GUIContent supportMotionVectorContent = EditorGUIUtility.TrTextContent("Motion Vectors", "When enabled, HDRP allocates memory for processing motion vectors which it uses for Motion Blur, TAA, and temporal re-projection of various effect like SSR."); public static readonly GUIContent supportRuntimeDebugDisplayContent = EditorGUIUtility.TrTextContent("Runtime Debug Display", "When disabled, HDRP removes all debug display Shader variants when you build for the Unity Player. This decreases build time."); public static readonly GUIContent supportRuntimeAOVAPIContent = EditorGUIUtility.TrTextContent("Runtime AOV API", "When disabled, HDRP removes all AOV API Shader variants when you build for the Unity Player. This decreases build time."); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 68a3f127069..3bc894e4bed 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -59,24 +59,24 @@ public class Styles internal static readonly GUIContent layerNamesIntro = EditorGUIUtility.TrTextContent("By default, Mesh Renderers, or Terrain, Decal Layers are named **Decal Layer 1-7**. To more easily differentiate between them, you can give each Decal Layer a specific name in this section."); internal static readonly GUIContent lightLayersLabel = EditorGUIUtility.TrTextContent("Light Layers Names", "When enabled, HDRP allocates memory for processing Light Layers. For deferred rendering, this allocation includes an extra render target in memory and extra cost. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); - public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer Name 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); - public static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer Name 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); - public static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer Name 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); - public static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer Name 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); - public static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer Name 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); - public static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer Name 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); - public static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer Name 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); - public static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer Name 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); + internal static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); + internal static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); + internal static readonly GUIContent lightLayerName2 = EditorGUIUtility.TrTextContent("Light Layer 2", "The display name for Light Layer 2. This is purely cosmetic, and can be used to articulate intended use of Light Layer 2"); + internal static readonly GUIContent lightLayerName3 = EditorGUIUtility.TrTextContent("Light Layer 3", "The display name for Light Layer 3. This is purely cosmetic, and can be used to articulate intended use of Light Layer 3"); + internal static readonly GUIContent lightLayerName4 = EditorGUIUtility.TrTextContent("Light Layer 4", "The display name for Light Layer 4. This is purely cosmetic, and can be used to articulate intended use of Light Layer 4"); + internal static readonly GUIContent lightLayerName5 = EditorGUIUtility.TrTextContent("Light Layer 5", "The display name for Light Layer 5. This is purely cosmetic, and can be used to articulate intended use of Light Layer 5"); + internal static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer 6", "The display name for Light Layer 6. This is purely cosmetic, and can be used to articulate intended use of Light Layer 6"); + internal static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer 7", "The display name for Light Layer 7. This is purely cosmetic, and can be used to articulate intended use of Light Layer 7"); internal static readonly GUIContent decalLayersLabel = EditorGUIUtility.TrTextContent("Decal Layers Names", "When enabled, HDRP allocates Shader variants and memory to the decals buffer and cluster decal. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); - public static readonly GUIContent decalLayerName0 = EditorGUIUtility.TrTextContent("Decal Layer Name 0", "The display name for Decal Layer 0. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 0"); - public static readonly GUIContent decalLayerName1 = EditorGUIUtility.TrTextContent("Decal Layer Name 1", "The display name for Decal Layer 1. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 1"); - public static readonly GUIContent decalLayerName2 = EditorGUIUtility.TrTextContent("Decal Layer Name 2", "The display name for Decal Layer 2. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 2"); - public static readonly GUIContent decalLayerName3 = EditorGUIUtility.TrTextContent("Decal Layer Name 3", "The display name for Decal Layer 3. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 3"); - public static readonly GUIContent decalLayerName4 = EditorGUIUtility.TrTextContent("Decal Layer Name 4", "The display name for Decal Layer 4. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 4"); - public static readonly GUIContent decalLayerName5 = EditorGUIUtility.TrTextContent("Decal Layer Name 5", "The display name for Decal Layer 5. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 5"); - public static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer Name 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); - public static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer Name 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); + internal static readonly GUIContent decalLayerName0 = EditorGUIUtility.TrTextContent("Decal Layer 0", "The display name for Decal Layer 0. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 0"); + internal static readonly GUIContent decalLayerName1 = EditorGUIUtility.TrTextContent("Decal Layer 1", "The display name for Decal Layer 1. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 1"); + internal static readonly GUIContent decalLayerName2 = EditorGUIUtility.TrTextContent("Decal Layer 2", "The display name for Decal Layer 2. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 2"); + internal static readonly GUIContent decalLayerName3 = EditorGUIUtility.TrTextContent("Decal Layer 3", "The display name for Decal Layer 3. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 3"); + internal static readonly GUIContent decalLayerName4 = EditorGUIUtility.TrTextContent("Decal Layer 4", "The display name for Decal Layer 4. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 4"); + internal static readonly GUIContent decalLayerName5 = EditorGUIUtility.TrTextContent("Decal Layer 5", "The display name for Decal Layer 5. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 5"); + internal static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); + internal static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); internal static readonly GUIContent shaderVariantLogLevel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information appears in the Unity Console when the build finishes.."); @@ -517,10 +517,10 @@ static string GetDefaultName(Kind kind) switch (kind) { case Kind.Default: - defaultName = "DefaultVolumeSettingsProfile"; + defaultName = "VolumeProfile_Default"; break; case Kind.LookDev: - defaultName = "LookDevVolumeSettingsProfile"; + defaultName = "LookDevProfile_Default"; break; default: defaultName = "N/A"; @@ -536,7 +536,7 @@ public static void CreateAndAssign(Kind kind, HDDefaultSettings defaultSettings) var assetCreator = ScriptableObject.CreateInstance(); assetCreator.SetKind(kind); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{GetDefaultName(kind)}.asset", null, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{defaultSettings.name}_{GetDefaultName(kind)}.asset", null, null); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index 1981390301b..07659df0d39 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs @@ -323,7 +323,7 @@ static void Drawer_SectionLightingSettings(SerializedFrameSettings serialized, E bool isGUIenabled = GUI.enabled; var hdrpAsset = GetHDRPAssetFor(owner); - if (hdrpAsset != null) //TODOJENNY? remove if when currentPlatformRenderPipelineSettings is in default + if (hdrpAsset != null) { RenderPipelineSettings hdrpSettings = hdrpAsset.currentPlatformRenderPipelineSettings; FrameSettings defaultFrameSettings = GetDefaultFrameSettingsFor(owner); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs index 19967767137..980aeff180c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs @@ -168,23 +168,23 @@ internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset old assetCreated.afterPostProcessCustomPostProcesses.AddRange(oldAsset.m_ObsoleteAfterPostProcessCustomPostProcesses); assetCreated.beforeTAACustomPostProcesses.AddRange(oldAsset.m_ObsoleteBeforeTAACustomPostProcesses); - assetCreated.lightLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0; - assetCreated.lightLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1; - assetCreated.lightLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2; - assetCreated.lightLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3; - assetCreated.lightLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4; - assetCreated.lightLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5; - assetCreated.lightLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6; - assetCreated.lightLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7; - - assetCreated.decalLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0; - assetCreated.decalLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1; - assetCreated.decalLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2; - assetCreated.decalLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3; - assetCreated.decalLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4; - assetCreated.decalLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5; - assetCreated.decalLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6; - assetCreated.decalLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7; + assetCreated.lightLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0; + assetCreated.lightLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1; + assetCreated.lightLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2; + assetCreated.lightLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3; + assetCreated.lightLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4; + assetCreated.lightLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5; + assetCreated.lightLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6; + assetCreated.lightLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7; + + assetCreated.decalLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0; + assetCreated.decalLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1; + assetCreated.decalLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2; + assetCreated.decalLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3; + assetCreated.decalLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4; + assetCreated.decalLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5; + assetCreated.decalLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6; + assetCreated.decalLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7; assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 496393dffe8..c566ee5f515 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -177,8 +177,6 @@ public string[] lightLayerNames } } - //TODOJENNY - move to Default Settings - [System.NonSerialized] string[] m_DecalLayerNames = null; /// diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs index f4697490e1d..8d195b9c78b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs @@ -355,38 +355,38 @@ public string decalLayerName7 internal bool m_ObsoleteincreaseSssSampleCount; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName0; + internal string m_ObsoleteLightLayerName0; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName1; + internal string m_ObsoleteLightLayerName1; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName2; + internal string m_ObsoleteLightLayerName2; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName3; + internal string m_ObsoleteLightLayerName3; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName4; + internal string m_ObsoleteLightLayerName4; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName5; + internal string m_ObsoleteLightLayerName5; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName6; + internal string m_ObsoleteLightLayerName6; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletelightLayerName7; + internal string m_ObsoleteLightLayerName7; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName0; + internal string m_ObsoleteDecalLayerName0; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName1; + internal string m_ObsoleteDecalLayerName1; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName2; + internal string m_ObsoleteDecalLayerName2; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName3; + internal string m_ObsoleteDecalLayerName3; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName4; + internal string m_ObsoleteDecalLayerName4; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName5; + internal string m_ObsoleteDecalLayerName5; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName6; + internal string m_ObsoleteDecalLayerName6; [Obsolete("Moved to HDDefault Settings")] - internal string m_ObsoletedecalLayerName7; + internal string m_ObsoleteDecalLayerName7; #pragma warning restore 618 } } From dce157d5bd81db05598272aa9e936393cf88cfc8 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 11 Jan 2021 16:51:54 +0100 Subject: [PATCH 05/58] A couple more reference fixed --- .../Settings/FrameSettingsUI.Drawers.cs | 35 +++++++++++-------- .../Raytracing/HDRaytracingReflection.cs | 2 +- .../Runtime/Sky/StaticLightingSky.cs | 2 +- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index 3d308aec46e..0200f1d8aae 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs @@ -252,6 +252,7 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, area.AmmendInfo(FrameSettingsField.Decals, overrideable: () => hdrpSettings.supportDecals); area.AmmendInfo(FrameSettingsField.Distortion, overrideable: () => hdrpSettings.supportDistortion); } + area.AmmendInfo(FrameSettingsField.Postprocess, overrideable: () => (frameSettingType != FrameSettingsRenderType.CustomOrBakedReflection && frameSettingType != FrameSettingsRenderType.RealtimeReflection)); @@ -269,13 +270,16 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, customOverrideable: () => serialized.lodBiasMode.GetEnumValue() != LODBiasMode.OverrideQualitySettings, hasMixedValues: serialized.lodBiasQualityLevel.hasMultipleDifferentValues); - area.AmmendInfo(FrameSettingsField.LODBias, - overridedDefaultValue: hdrpSettings.lodBias[serialized.lodBiasQualityLevel.intValue], - customGetter: () => serialized.lodBias.floatValue, - customSetter: v => serialized.lodBias.floatValue = (float)v, - customOverrideable: () => serialized.lodBiasMode.GetEnumValue() != LODBiasMode.FromQualitySettings, - labelOverride: serialized.lodBiasMode.GetEnumValue() == LODBiasMode.ScaleQualitySettings ? "Scale Factor" : "LOD Bias", - hasMixedValues: serialized.lodBias.hasMultipleDifferentValues); + if (hdrpAsset != null) + { + area.AmmendInfo(FrameSettingsField.LODBias, + overridedDefaultValue: hdrpAsset.currentPlatformRenderPipelineSettings.lodBias[serialized.lodBiasQualityLevel.intValue], + customGetter: () => serialized.lodBias.floatValue, + customSetter: v => serialized.lodBias.floatValue = (float)v, + customOverrideable: () => serialized.lodBiasMode.GetEnumValue() != LODBiasMode.FromQualitySettings, + labelOverride: serialized.lodBiasMode.GetEnumValue() == LODBiasMode.ScaleQualitySettings ? "Scale Factor" : "LOD Bias", + hasMixedValues: serialized.lodBias.hasMultipleDifferentValues); + } area.AmmendInfo( FrameSettingsField.MaximumLODLevelMode, @@ -291,13 +295,16 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, customOverrideable: () => serialized.maximumLODLevelMode.GetEnumValue() != MaximumLODLevelMode.OverrideQualitySettings, hasMixedValues: serialized.maximumLODLevelQualityLevel.hasMultipleDifferentValues); - area.AmmendInfo(FrameSettingsField.MaximumLODLevel, - overridedDefaultValue: hdrpSettings.maximumLODLevel[serialized.maximumLODLevelQualityLevel.intValue], - customGetter: () => serialized.maximumLODLevel.intValue, - customSetter: v => serialized.maximumLODLevel.intValue = (int)v, - customOverrideable: () => serialized.maximumLODLevelMode.GetEnumValue() != MaximumLODLevelMode.FromQualitySettings, - labelOverride: serialized.maximumLODLevelMode.GetEnumValue() == MaximumLODLevelMode.OffsetQualitySettings ? "Offset Factor" : "Maximum LOD Level", - hasMixedValues: serialized.maximumLODLevel.hasMultipleDifferentValues); + if (hdrpAsset != null) + { + area.AmmendInfo(FrameSettingsField.MaximumLODLevel, + overridedDefaultValue: hdrpAsset.currentPlatformRenderPipelineSettings.maximumLODLevel[serialized.maximumLODLevelQualityLevel.intValue], + customGetter: () => serialized.maximumLODLevel.intValue, + customSetter: v => serialized.maximumLODLevel.intValue = (int)v, + customOverrideable: () => serialized.maximumLODLevelMode.GetEnumValue() != MaximumLODLevelMode.FromQualitySettings, + labelOverride: serialized.maximumLODLevelMode.GetEnumValue() == MaximumLODLevelMode.OffsetQualitySettings ? "Offset Factor" : "Maximum LOD Level", + hasMixedValues: serialized.maximumLODLevel.hasMultipleDifferentValues); + } area.AmmendInfo(FrameSettingsField.MaterialQualityLevel, overridedDefaultValue: defaultFrameSettings.materialQuality.Into(), diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs index 295bd0c5171..c6994993d4e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs @@ -294,7 +294,7 @@ RTRUpscaleParameters PrepareRTRUpscaleParameters(HDCamera hdCamera, ScreenSpaceR parameters.viewCount = hdCamera.viewCount; // Other parameters - parameters.reflectionFilterCS = m_Asset.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + parameters.reflectionFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; parameters.upscaleKernel = m_ReflectionUpscaleKernel; return parameters; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs index ff4d312ae2e..6689621e521 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs @@ -189,7 +189,7 @@ private int InitComponentFromProfile(T component, T componentFromProfile, Typ var newParameters = component.parameters; var profileParameters = componentFromProfile.parameters; - var defaultVolume = HDRenderPipeline.GetOrCreateDefaultVolume(); + var defaultVolume = HDDefaultSettings.instance.GetOrCreateDefaultVolume(); T defaultComponent = null; if (defaultVolume.sharedProfile != null) // This can happen with old projects. defaultVolume.sharedProfile.TryGet(type, out defaultComponent); From 5f3783319bc65e221b161347a39f58e1cf533dcb Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 12 Jan 2021 14:37:38 +0100 Subject: [PATCH 06/58] Added missing changelog --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 797b99b9e93..7e9abab6147 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Density Volumes can now take a 3D RenderTexture as mask, the mask can use RGBA format for RGB fog. - Decreased the minimal Fog Distance value in the Density Volume to 0.05. - Changed the convergence time of ssgi to 16 frames and the preset value +- HDRP Default Settings are now saved into their own asset and HDRenderPipeline's default asset refers to this new asset. ## [10.3.0] - 2020-12-01 From b130f544b28a9114b8ca1d754e074758019e8b39 Mon Sep 17 00:00:00 2001 From: "Jennifer S. Roig-Deslandes" Date: Tue, 2 Feb 2021 14:29:03 +0100 Subject: [PATCH 07/58] Change from RenderPipeline_Default_Settings to Global renaming --- .../Runtime/RenderPipeline/HDDefaultSettings.cs | 4 ++-- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs index 980aeff180c..55d8e3e8f65 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs @@ -33,7 +33,7 @@ enum LensAttenuationMode /// - Frame Settings /// - Various resources for runtime, editor-only, and raytracing /// - public partial class HDDefaultSettings : RenderPipelineDefaultSettings + public partial class HDDefaultSettings : RenderPipelineGlobalSettings { private static HDDefaultSettings cachedInstance = null; public static HDDefaultSettings instance @@ -50,7 +50,7 @@ static public void UpdateGraphicsSettings(HDDefaultSettings newSettings) { if (newSettings == null || newSettings == cachedInstance) return; - GraphicsSettings.RegisterRenderPipelineSettings(newSettings as RenderPipelineDefaultSettings); + GraphicsSettings.RegisterRenderPipelineSettings(newSettings as RenderPipelineGlobalSettings); cachedInstance = newSettings; } 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 58e2210d0a1..cf42a8d91f7 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -28,7 +28,7 @@ internal static HDDefaultSettings defaultAsset => HDDefaultSettings.instance; private HDDefaultSettings m_defaultSettings; - public override RenderPipelineDefaultSettings defaultSettings => m_defaultSettings; + public override RenderPipelineGlobalSettings defaultSettings => m_defaultSettings; internal static HDRenderPipelineAsset currentAsset => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset : null; From 6a4b1366b6f556f2ade17b6e9624ddf083ee48b2 Mon Sep 17 00:00:00 2001 From: "Jennifer S. Roig-Deslandes" Date: Wed, 3 Feb 2021 14:35:32 +0100 Subject: [PATCH 08/58] [Fix] layer names are pulled from the default settings --- .../Editor/RenderPipeline/HDEditorUtils.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs index e0fdbec576f..9b9b8aeeb25 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs @@ -234,7 +234,7 @@ internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, Se EditorGUI.BeginProperty(rect, label, property); EditorGUI.BeginChangeCheck(); - int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDRenderPipeline.currentAsset.decalLayerNames); + int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDDefaultSettings.instance.decalLayerNames); if (EditorGUI.EndChangeCheck()) property.intValue = changedValue; @@ -251,7 +251,7 @@ internal static int DrawLightLayerMask(Rect rect, int value, GUIContent label = return lightLayer; EditorGUI.BeginChangeCheck(); - lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDRenderPipeline.currentAsset.lightLayerNames); + lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDDefaultSettings.instance.lightLayerNames); if (EditorGUI.EndChangeCheck()) lightLayer = HDAdditionalLightData.LightLayerToRenderingLayerMask(lightLayer, value); return lightLayer; From 3350f131059d58acd58e192e62e90f78d7655c06 Mon Sep 17 00:00:00 2001 From: "Jennifer S. Roig-Deslandes" Date: Thu, 4 Feb 2021 16:59:22 +0100 Subject: [PATCH 09/58] [Fix] Ensure HDDefault settings before showing menu + refactor light/decal layer names to exist on DefaultSettings --- .../Editor/RenderPipeline/HDEditorUtils.cs | 4 +- .../Settings/DefaultSettingsPanel.cs | 4 +- .../RenderPipeline/HDDefaultSettings.cs | 79 +++++++++++++------ .../RenderPipeline/HDRenderPipelineAsset.cs | 42 +--------- 4 files changed, 63 insertions(+), 66 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs index 9b9b8aeeb25..447b782c04c 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs @@ -228,7 +228,7 @@ internal static void DrawLightLayerMask_Internal(Rect rect, GUIContent label, Se internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, SerializedProperty property) { - if (HDRenderPipeline.defaultAsset == null) + if (HDDefaultSettings.instance == null) return; EditorGUI.BeginProperty(rect, label, property); @@ -247,7 +247,7 @@ internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, Se internal static int DrawLightLayerMask(Rect rect, int value, GUIContent label = null) { int lightLayer = HDAdditionalLightData.RenderingLayerMaskToLightLayer(value); - if (HDRenderPipeline.defaultAsset == null) + if (HDDefaultSettings.instance == null) return lightLayer; EditorGUI.BeginChangeCheck(); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 3bc894e4bed..5c88dea2606 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -18,7 +18,7 @@ class DefaultSettingsPanelProvider [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { - return new SettingsProvider("Project/Graphics/HDRP Default Settings", SettingsScope.Project) + return new SettingsProvider("Project/Graphics/HDRP Settings", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() @@ -125,7 +125,7 @@ public void DoGUI(string searchContext) if ((serializedSettings == null) || (settingsSerialized != HDDefaultSettings.instance)) { - settingsSerialized = HDDefaultSettings.instance; + settingsSerialized = HDDefaultSettings.Ensure(); var serializedObject = new SerializedObject(settingsSerialized); serializedSettings = new SerializedHDDefaultSettings(serializedObject); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs index 55d8e3e8f65..ff39cd40435 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs @@ -188,10 +188,7 @@ internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset old assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; - - System.Array.Resize(ref assetCreated.diffusionProfileSettingsList, oldAsset.m_ObsoleteDiffusionProfileSettingsList.Length); - for (int i = 0; i < oldAsset.m_ObsoleteDiffusionProfileSettingsList.Length; ++i) - assetCreated.diffusionProfileSettingsList[i] = oldAsset.m_ObsoleteDiffusionProfileSettingsList[i]; + assetCreated.diffusionProfileSettingsList = oldAsset.m_ObsoleteDiffusionProfileSettingsList; //3. Clear obsolete fields if (bClearObsoleteFields) @@ -206,25 +203,7 @@ internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset old oldAsset.m_ObsoleteBeforePostProcessCustomPostProcesses = null; oldAsset.m_ObsoleteAfterPostProcessCustomPostProcesses = null; oldAsset.m_ObsoleteBeforeTAACustomPostProcesses = null; - /* TODOJENNY - not sure why we cannot reset a string like that - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName0 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName1 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName2 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName3 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName4 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName5 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName6 = ""; - oldAsset.currentPlatformRenderPipelineSettings.m_ObsoletelightLayerName7 = ""; - */ - System.Array.Resize(ref oldAsset.m_ObsoleteDiffusionProfileSettingsList, 0); + oldAsset.m_ObsoleteDiffusionProfileSettingsList = null; } #pragma warning restore 618 @@ -652,6 +631,34 @@ internal bool AreRayTracingResourcesCreated() /// Name for light layer 7. public string lightLayerName7; + + [System.NonSerialized] + string[] m_LightLayerNames = null; + /// + /// Names used for display of light layers. + /// + public string[] lightLayerNames + { + get + { + if (m_LightLayerNames == null) + { + m_LightLayerNames = new string[8]; + } + + m_LightLayerNames[0] = lightLayerName0; + m_LightLayerNames[1] = lightLayerName1; + m_LightLayerNames[2] = lightLayerName2; + m_LightLayerNames[3] = lightLayerName3; + m_LightLayerNames[4] = lightLayerName4; + m_LightLayerNames[5] = lightLayerName5; + m_LightLayerNames[6] = lightLayerName6; + m_LightLayerNames[7] = lightLayerName7; + + return m_LightLayerNames; + } + } + #endregion #region Layer Names [DECAL] @@ -673,6 +680,32 @@ internal bool AreRayTracingResourcesCreated() /// Name for decal layer 7. public string decalLayerName7; + [System.NonSerialized] + string[] m_DecalLayerNames = null; + /// + /// Names used for display of decal layers. + /// + public string[] decalLayerNames + { + get + { + if (m_DecalLayerNames == null) + { + m_DecalLayerNames = new string[8]; + } + + m_DecalLayerNames[0] = decalLayerName0; + m_DecalLayerNames[1] = decalLayerName1; + m_DecalLayerNames[2] = decalLayerName2; + m_DecalLayerNames[3] = decalLayerName3; + m_DecalLayerNames[4] = decalLayerName4; + m_DecalLayerNames[5] = decalLayerName5; + m_DecalLayerNames[6] = decalLayerName6; + m_DecalLayerNames[7] = decalLayerName7; + + return m_DecalLayerNames; + } + } #endregion #region Misc. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index c566ee5f515..62ebcd4cc90 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -154,51 +154,15 @@ string[] renderingLayerNames public override string[] renderingLayerMaskNames => renderingLayerNames; - [System.NonSerialized] - string[] m_LightLayerNames = null; /// /// Names used for display of light layers. /// - public string[] lightLayerNames - { - get - { - if (m_LightLayerNames == null) - { - m_LightLayerNames = new string[8]; - } + public string[] lightLayerNames => HDDefaultSettings.instance.lightLayerNames; - for (int i = 0; i < 8; ++i) - { - m_LightLayerNames[i] = renderingLayerNames[i]; - } - - return m_LightLayerNames; - } - } - - [System.NonSerialized] - string[] m_DecalLayerNames = null; /// - /// Names used for display of light layers. + /// Names used for display of decal layers. /// - public string[] decalLayerNames - { - get - { - if (m_DecalLayerNames == null) - { - m_DecalLayerNames = new string[8]; - } - - for (int i = 0; i < 8; ++i) - { - m_DecalLayerNames[i] = renderingLayerNames[i + 8]; - } - - return m_DecalLayerNames; - } - } + public string[] decalLayerNames => HDDefaultSettings.instance.decalLayerNames; /// HDRP default shader. public override Shader defaultShader From 2dbd454658459176a0cd6f3eac39aa0107f0d6b2 Mon Sep 17 00:00:00 2001 From: "Jennifer S. Roig-Deslandes" Date: Thu, 11 Feb 2021 14:57:29 +0100 Subject: [PATCH 10/58] Obselete EditorDefaultSettings, fixed a few bad references --- .../Editor/RenderPipeline/HDAssetFactory.cs | 2 +- .../Settings/EditorDefaultSettings.cs | 5 +-- .../Settings/SerializedFrameSettings.cs | 40 +++++++++++-------- .../VolumeComponentWithQualityEditor.cs | 2 +- .../DensityVolumeManager.cs | 2 +- .../DiffusionProfileSettings.Migration.cs | 14 +++---- .../RenderPipeline/HDDefaultSettings.cs | 9 +++-- .../RenderPipeline/Utility/Texture3DAtlas.cs | 2 +- .../Sky/CloudSystem/CloudLayer/CloudLayer.cs | 2 +- 9 files changed, 41 insertions(+), 37 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index 4bcc3dbc32f..8b0a0cea990 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -22,7 +22,7 @@ public override void Action(int instanceId, string pathName, string resourceFile newAsset.name = Path.GetFileName(pathName); // Load default renderPipelineResources / Material / Shader newAsset.renderPipelineResources = AssetDatabase.LoadAssetAtPath(s_RenderPipelineResourcesPath); - EditorDefaultSettings.GetOrAssignDefaultVolumeProfile(newAsset); + HDDefaultSettings.instance.GetOrCreateDefaultVolumeProfile(); //as we must init the editor resources with lazy init, it is not required here diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs index 7c6ca2d7dd2..aa84ed51a4b 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs @@ -1,11 +1,10 @@ using System; -using System.IO; -using UnityEngine.Rendering.HighDefinition; using UnityEngine.Rendering; -using UnityEngine; +using UnityEngine.Rendering.HighDefinition; namespace UnityEditor.Rendering.HighDefinition { + [Obsolete("Please use HDDefaultSettings.instance.* instead.", false)] static class EditorDefaultSettings { /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs index 237776371d8..371236335b8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs @@ -54,22 +54,30 @@ public bool HaveMultipleOverride(FrameSettingsField field) ref FrameSettings GetData(Object obj) { - if (obj is HDAdditionalCameraData) - return ref (obj as HDAdditionalCameraData).renderingPathCustomFrameSettings; - if (obj is HDProbe) - return ref (obj as HDProbe).frameSettings; - if (obj is HDDefaultSettings) - switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) - { - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: - return ref (obj as HDDefaultSettings).GetDefaultFrameSettings(FrameSettingsRenderType.Camera); - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: - return ref (obj as HDDefaultSettings).GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: - return ref (obj as HDDefaultSettings).GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); - default: - throw new System.ArgumentException("Unknown kind of DefaultSettingsPanelIMGUI.SelectedFrameSettings"); - } + switch (obj) + { + case HDAdditionalCameraData data: + return ref data.renderingPathCustomFrameSettings; + case HDProbe probe: + return ref probe.frameSettings; + default: + { + if (obj is HDDefaultSettings defaultSettings) + { + switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) + { + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: + return ref defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: + return ref defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: + return ref defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); + } + } + + break; + } + } throw new System.ArgumentException("Unknown kind of object"); } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs index 392332b145a..0c1916f3f14 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs @@ -139,7 +139,7 @@ public override void OnEnable() // Ensure we reflect presets in the pipeline asset, not the hardcoded defaults. // Warning: base.OnEnable must be called after VolumeComponentWithQuality has unpacked SerializedData. - var pipeline = (HDRenderPipeline)RenderPipelineManager.currentPipeline; + var pipeline = HDRenderPipeline.currentPipeline; if (pipeline != null) { serializedObject.Update(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs index 8927159c156..1627883fb6b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs @@ -23,7 +23,7 @@ public Texture3DAtlas volumeAtlas { get { - if (m_VolumeAtlas == null) + if (m_VolumeAtlas == null && HDRenderPipeline.currentAsset != null) { var settings = HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.lightLoopSettings; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs index 8766f874321..5bfe4c5016c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs @@ -43,12 +43,10 @@ internal DiffusionProfile this[int index] var importer = AssetImporter.GetAtPath(assetPath); if (importer == null) return; - - // TODOJENNY++ - /* + var currentHDAsset = HDRenderPipeline.currentAsset; if (currentHDAsset == null) - throw new Exception("Can't upgrade diffusion profile when the HDRenderPipeline asset is not assigned in Graphic Settings"); + throw new Exception("Can't upgrade diffusion profile without an active HD Render Pipeline asset (see Quality Settings)."); var defaultProfile = new DiffusionProfile(true); @@ -86,9 +84,9 @@ internal DiffusionProfile this[int index] if (hdAsset.diffusionProfileSettings == d) { // Assign the new diffusion profile assets into the HD asset - hdAsset.diffusionProfileSettingsList = new DiffusionProfileSettings[newProfiles.Keys.Max() + 1]; + hdAsset.m_ObsoleteDiffusionProfileSettingsList = new DiffusionProfileSettings[newProfiles.Keys.Max() + 1]; foreach (var kp in newProfiles) - hdAsset.diffusionProfileSettingsList[kp.Key] = kp.Value; + hdAsset.m_ObsoleteDiffusionProfileSettingsList[kp.Key] = kp.Value; UnityEditor.EditorUtility.SetDirty(hdAsset); } } @@ -104,13 +102,11 @@ internal DiffusionProfile this[int index] UpgradeMaterial(mat, d); } } - */ - // TODOJENNY-- #endif #pragma warning restore 618 }) ); - + #if UNITY_EDITOR public static void UpgradeMaterial(Material mat, DiffusionProfileSettings mainProfile) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs index ff39cd40435..694a42f747e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs @@ -1,12 +1,8 @@ -using UnityEngine.Rendering; using System.Collections.Generic; //needed for list of Custom Post Processes injections using System.IO; -using System.Diagnostics; #if UNITY_EDITOR using UnityEditorInternal; using UnityEditor; -using UnityEditor.Rendering; -using UnityEditor.Rendering.HighDefinition; #endif namespace UnityEngine.Rendering.HighDefinition @@ -188,6 +184,9 @@ internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset old assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; + // we need to make sure the old diffusion profile had time to upgrade before moving it away + if (oldAsset.diffusionProfileSettings != null) + oldAsset.diffusionProfileSettings.TryToUpgrade(); assetCreated.diffusionProfileSettingsList = oldAsset.m_ObsoleteDiffusionProfileSettingsList; //3. Clear obsolete fields @@ -356,6 +355,8 @@ internal VolumeProfile volumeProfile set => m_VolumeProfileDefault = value; } + /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. + /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal VolumeProfile GetOrCreateDefaultVolumeProfile() { #if UNITY_EDITOR diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs index 1d89cf6e6ed..5e41c7e4d56 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs @@ -152,7 +152,7 @@ public Texture3DAtlas(GraphicsFormat format, int maxElementSize, int maxElementC m_Elements.Add(elem); } - m_Texture3DAtlasCompute = HDRenderPipeline.defaultAsset.renderPipelineResources.shaders.texture3DAtlasCS; + m_Texture3DAtlasCompute = HDDefaultSettings.instance.renderPipelineResources.shaders.texture3DAtlasCS; m_CopyKernel = m_Texture3DAtlasCompute.FindKernel("Copy"); m_GenerateMipKernel = m_Texture3DAtlasCompute.FindKernel("GenerateMipMap"); m_Texture3DAtlasCompute.GetKernelThreadGroupSizes(m_CopyKernel, out var groupThreadX, out var groupThreadY, out var groupThreadZ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs index 49c35ec9c91..dd84d229b4a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs @@ -331,7 +331,7 @@ public override int GetHashCode() /// static void Init() { - var asset = HDRenderPipeline.currentAsset; + var asset = HDDefaultSettings.instance; if (asset != null) CloudMap.s_DefaultTexture = asset.renderPipelineResources?.textures.defaultCloudMap; } From 6488f01852dfc7aa9f95c2aed50d9128ac9cb3fc Mon Sep 17 00:00:00 2001 From: "Jennifer S. Roig-Deslandes" Date: Thu, 11 Feb 2021 17:04:34 +0100 Subject: [PATCH 11/58] Renamed from HDDefaultSettings to HDGlobalSettings --- .../BuildProcessors/HDRPPreprocessShaders.cs | 12 +-- .../Editor/RenderPipeline/HDAssetFactory.cs | 18 ++-- .../RenderPipeline/HDDefaultSettingsEditor.cs | 10 +- .../HDDefaultSettingsEditor.cs.meta | 11 +++ .../Editor/RenderPipeline/HDEditorUtils.cs | 8 +- .../Settings/DefaultSettingsPanel.cs | 60 ++++++------ .../Settings/EditorDefaultSettings.cs | 6 +- .../Settings/FrameSettingsUI.Drawers.cs | 4 +- .../Settings/SerializedFrameSettings.cs | 10 +- ...tings.cs => SerializedHDGlobalSettings.cs} | 58 +++++------ .../Editor/Wizard/HDWizard.Configuration.cs | 18 ++-- .../Runtime/Compositor/CompositionManager.cs | 8 +- .../Runtime/Lighting/LightLoop/LightLoop.cs | 2 +- .../Shadow/ScreenSpaceShadowManager.cs | 8 +- .../DensityVolumeManager.cs | 2 +- .../Runtime/Material/Decal/DecalProjector.cs | 2 +- .../SubsurfaceScatteringManagerRT.cs | 12 +-- .../PostProcessSystem.RenderGraph.cs | 8 +- ...ation.cs => HDGlobalSettings.Migration.cs} | 4 +- ...DefaultSettings.cs => HDGlobalSettings.cs} | 68 ++++++------- .../HDRenderPipeline.LookDev.cs | 9 +- .../RenderPipeline/HDRenderPipeline.cs | 48 +++++----- .../HDRenderPipelineAsset.Migration.cs | 44 ++++----- .../RenderPipeline/HDRenderPipelineAsset.cs | 44 ++++----- .../RenderPipeline/PathTracing/PathTracing.cs | 4 +- .../HDRaytracingAmbientOcclusion.cs | 2 +- .../Raytracing/HDRaytracingIndirectDiffuse.cs | 18 ++-- .../Raytracing/HDRaytracingLightCluster.cs | 2 +- .../Raytracing/HDRaytracingManager.cs | 14 +-- .../HDRaytracingRecursiveRenderer.cs | 2 +- .../Raytracing/HDRaytracingReflection.cs | 18 ++-- .../RenderPipeline/Settings/FrameSettings.cs | 2 +- .../Settings/FrameSettingsHistory.cs | 8 +- .../Settings/RenderPipelineSettings.cs | 96 +++++++++---------- .../RenderPipeline/Utility/Texture3DAtlas.cs | 2 +- .../Sky/CloudSystem/CloudLayer/CloudLayer.cs | 2 +- .../Runtime/Sky/StaticLightingSky.cs | 2 +- 37 files changed, 327 insertions(+), 319 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs.meta rename com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/{SerializedHDDefaulltSettings.cs => SerializedHDGlobalSettings.cs} (74%) rename com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/{HDDefaultSettings.Migration.cs => HDGlobalSettings.Migration.cs} (77%) rename com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/{HDDefaultSettings.cs => HDGlobalSettings.cs} (92%) diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index d78f98e8cdd..feb1be6a0b6 100644 --- a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -298,7 +298,7 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis return; var exportLog = ShaderBuildPreprocessor.hdrpAssets.Count > 0 - && (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + && (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); Stopwatch shaderStripingWatch = new Stopwatch(); shaderStripingWatch.Start(); @@ -343,13 +343,13 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis inputData.RemoveAt(i); } - if (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + if (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { foreach (var hdAsset in hdPipelineAssets) { m_TotalVariantsInputCount += preStrippingCount; m_TotalVariantsOutputCount += (uint)inputData.Count; - LogShaderVariants(shader, kernelName, HDDefaultSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + LogShaderVariants(shader, kernelName, HDGlobalSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); } } } @@ -453,7 +453,7 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList 0 - && (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + && (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); Stopwatch shaderStripingWatch = new Stopwatch(); shaderStripingWatch.Start(); @@ -514,13 +514,13 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList= inputShaderVariantCount; --i) inputData.RemoveAt(i); - if (HDDefaultSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + if (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { foreach (var hdAsset in hdPipelineAssets) { m_TotalVariantsInputCount += preStrippingCount; m_TotalVariantsOutputCount += (uint)inputData.Count; - LogShaderVariants(shader, snippet, HDDefaultSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + LogShaderVariants(shader, snippet, HDGlobalSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index 8b0a0cea990..9508c6deee1 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -22,7 +22,7 @@ public override void Action(int instanceId, string pathName, string resourceFile newAsset.name = Path.GetFileName(pathName); // Load default renderPipelineResources / Material / Shader newAsset.renderPipelineResources = AssetDatabase.LoadAssetAtPath(s_RenderPipelineResourcesPath); - HDDefaultSettings.instance.GetOrCreateDefaultVolumeProfile(); + HDGlobalSettings.instance.GetOrCreateDefaultVolumeProfile(); //as we must init the editor resources with lazy init, it is not required here @@ -111,30 +111,30 @@ static void CreateRenderPipelineEditorResources() ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDRenderPipelineEditorResources.asset", icon, null); } - internal class HDDefaultSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction + internal class HDGlobalSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction { public override void Action(int instanceId, string pathName, string resourceFile) { - var newAsset = HDDefaultSettings.Create(pathName, settings); - HDDefaultSettings.UpdateGraphicsSettings(newAsset); + var newAsset = HDGlobalSettings.Create(pathName, settings); + HDGlobalSettings.UpdateGraphicsSettings(newAsset); ProjectWindowUtil.ShowCreatedAsset(newAsset); } - static HDDefaultSettings settings; - public static void Clone(HDDefaultSettings src) + static HDGlobalSettings settings; + public static void Clone(HDGlobalSettings src) { settings = src; var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - var assetCreator = ScriptableObject.CreateInstance(); + var assetCreator = ScriptableObject.CreateInstance(); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); } } [MenuItem("Assets/Create/Rendering/High Definition Default Settings Asset", priority = CoreUtils.assetCreateMenuPriority2)] - internal static void CreateHDDefaultSettings() + internal static void CreateHDGlobalSettings() { var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDDefaultSettings.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDGlobalSettings.asset", icon, null); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs index c0c7cb88af5..66c6d2b106a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs @@ -3,22 +3,22 @@ namespace UnityEditor.Rendering.HighDefinition { - [CustomEditor(typeof(HDDefaultSettings))] + [CustomEditor(typeof(HDGlobalSettings))] [CanEditMultipleObjects] - sealed class HDDefaultSettingsEditor : Editor + sealed class HDGlobalSettingsEditor : Editor { - SerializedHDDefaultSettings m_SerializedHDDefaultSettings; + SerializedHDGlobalSettings m_SerializedHDGlobalSettings; internal bool largeLabelWidth = true; void OnEnable() { - m_SerializedHDDefaultSettings = new SerializedHDDefaultSettings(serializedObject); + m_SerializedHDGlobalSettings = new SerializedHDGlobalSettings(serializedObject); } public override void OnInspectorGUI() { - var serialized = m_SerializedHDDefaultSettings; + var serialized = m_SerializedHDGlobalSettings; serialized.serializedObject.Update(); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs.meta new file mode 100644 index 00000000000..8ffa185cc6f --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a1a3def070e23aa48b8fc5b7736dcc2a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs index 447b782c04c..19b4318bbfd 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs @@ -228,13 +228,13 @@ internal static void DrawLightLayerMask_Internal(Rect rect, GUIContent label, Se internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, SerializedProperty property) { - if (HDDefaultSettings.instance == null) + if (HDGlobalSettings.instance == null) return; EditorGUI.BeginProperty(rect, label, property); EditorGUI.BeginChangeCheck(); - int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDDefaultSettings.instance.decalLayerNames); + int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDGlobalSettings.instance.decalLayerNames); if (EditorGUI.EndChangeCheck()) property.intValue = changedValue; @@ -247,11 +247,11 @@ internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, Se internal static int DrawLightLayerMask(Rect rect, int value, GUIContent label = null) { int lightLayer = HDAdditionalLightData.RenderingLayerMaskToLightLayer(value); - if (HDDefaultSettings.instance == null) + if (HDGlobalSettings.instance == null) return lightLayer; EditorGUI.BeginChangeCheck(); - lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDDefaultSettings.instance.lightLayerNames); + lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDGlobalSettings.instance.lightLayerNames); if (EditorGUI.EndChangeCheck()) lightLayer = HDAdditionalLightData.LightLayerToRenderingLayerMask(lightLayer, value); return lightLayer; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 5c88dea2606..906ef8a85bc 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -9,7 +9,7 @@ namespace UnityEditor.Rendering.HighDefinition { - using CED = CoreEditorDrawer; + using CED = CoreEditorDrawer; class DefaultSettingsPanelProvider { @@ -113,8 +113,8 @@ static DefaultSettingsPanelIMGUI() selectedFrameSettings = SelectedFrameSettings.Camera; } - SerializedHDDefaultSettings serializedSettings; - HDDefaultSettings settingsSerialized; + SerializedHDGlobalSettings serializedSettings; + HDGlobalSettings settingsSerialized; DiffusionProfileSettingsListUI m_DiffusionProfileUI; public void DoGUI(string searchContext) { @@ -123,11 +123,11 @@ public void DoGUI(string searchContext) EditorGUILayout.HelpBox("No HDRP pipeline currently active (see Quality Settings active level).", MessageType.Warning); } - if ((serializedSettings == null) || (settingsSerialized != HDDefaultSettings.instance)) + if ((serializedSettings == null) || (settingsSerialized != HDGlobalSettings.instance)) { - settingsSerialized = HDDefaultSettings.Ensure(); + settingsSerialized = HDGlobalSettings.Ensure(); var serializedObject = new SerializedObject(settingsSerialized); - serializedSettings = new SerializedHDDefaultSettings(serializedObject); + serializedSettings = new SerializedHDGlobalSettings(serializedObject); } else { @@ -154,8 +154,8 @@ public void OnActivate(string searchContext, VisualElement rootElement) m_ScrollViewPosition = Vector2.zero; } - #region Global HDDefaultSettings asset selection - void Draw_AssetSelection(ref SerializedHDDefaultSettings serialized, Editor owner) + #region Global HDGlobalSettings asset selection + void Draw_AssetSelection(ref SerializedHDGlobalSettings serialized, Editor owner) { var oldWidth = EditorGUIUtility.labelWidth; EditorGUIUtility.labelWidth = Styles.labelWidth; @@ -170,29 +170,29 @@ void Draw_AssetSelection(ref SerializedHDDefaultSettings serialized, Editor owne using (new EditorGUILayout.HorizontalScope()) { EditorGUI.BeginChangeCheck(); - var newAsset = (HDDefaultSettings)EditorGUILayout.ObjectField(settingsSerialized , typeof(HDDefaultSettings), false); + var newAsset = (HDGlobalSettings)EditorGUILayout.ObjectField(settingsSerialized , typeof(HDGlobalSettings), false); if (EditorGUI.EndChangeCheck()) { - HDDefaultSettings.UpdateGraphicsSettings(newAsset); + HDGlobalSettings.UpdateGraphicsSettings(newAsset); EditorUtility.SetDirty(settingsSerialized); } - if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a HD Default Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) + if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a HD Global Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - HDAssetFactory.CreateHDDefaultSettings(); + HDAssetFactory.CreateHDGlobalSettings(); } bool guiEnabled = GUI.enabled; GUI.enabled = guiEnabled && (settingsSerialized != null); - if (GUILayout.Button(EditorGUIUtility.TrTextContent("Clone", "Clone a HD Default Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) + if (GUILayout.Button(EditorGUIUtility.TrTextContent("Clone", "Clone a HD Global Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - HDAssetFactory.HDDefaultSettingsCreator.Clone(settingsSerialized); + HDAssetFactory.HDGlobalSettingsCreator.Clone(settingsSerialized); } GUI.enabled = guiEnabled; } EditorGUIUtility.labelWidth = oldWidth; } - #endregion // Global HDDefaultSettings asset selection + #endregion // Global HDGlobalSettings asset selection #region Resources @@ -200,7 +200,7 @@ void Draw_AssetSelection(ref SerializedHDDefaultSettings serialized, Editor owne CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.resourceLabel, Styles.sectionHeaderStyle)), CED.Group(Drawer_ResourcesSection) ); - static void Drawer_ResourcesSection(SerializedHDDefaultSettings serialized, Editor owner) + static void Drawer_ResourcesSection(SerializedHDGlobalSettings serialized, Editor owner) { if (m_verboseMode) EditorGUILayout.LabelField(Styles.resourceIntroLabel, Styles.introStyle); @@ -267,7 +267,7 @@ public enum SelectedFrameSettings ); - static void Drawer_TitleDefaultFrameSettings(SerializedHDDefaultSettings serialized, Editor owner) + static void Drawer_TitleDefaultFrameSettings(SerializedHDGlobalSettings serialized, Editor owner) { EditorGUILayout.LabelField(Styles.frameSettingsLabel, Styles.sectionHeaderStyle); @@ -291,9 +291,9 @@ enum Expandable RealtimeProbeFrameSettings = 1 << 2, //obsolete } - static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings, "HDRP"); + static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings, "HDRP"); - static public void ApplyChangedDisplayedFrameSettings(SerializedHDDefaultSettings serialized, Editor owner) + static public void ApplyChangedDisplayedFrameSettings(SerializedHDGlobalSettings serialized, Editor owner) { k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings | Expandable.BakedOrCustomProbeFrameSettings | Expandable.RealtimeProbeFrameSettings, false); switch (selectedFrameSettings) @@ -318,7 +318,7 @@ static public void ApplyChangedDisplayedFrameSettings(SerializedHDDefaultSetting CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.customPostProcessOrderLabel, Styles.sectionHeaderStyle)), CED.Group(Drawer_CustomPostProcess) ); - static void Drawer_CustomPostProcess(SerializedHDDefaultSettings serialized, Editor owner) + static void Drawer_CustomPostProcess(SerializedHDGlobalSettings serialized, Editor owner) { if (m_verboseMode) EditorGUILayout.LabelField(Styles.customPostProcessIntroLabel, Styles.introStyle); @@ -343,7 +343,7 @@ static void Drawer_CustomPostProcess(SerializedHDDefaultSettings serialized, Edi CED.Group(Drawer_VolumeSection) ); - static void Drawer_VolumeSection(SerializedHDDefaultSettings serialized, Editor owner) + static void Drawer_VolumeSection(SerializedHDGlobalSettings serialized, Editor owner) { if (m_verboseMode) EditorGUILayout.LabelField(Styles.volumeComponentsIntroLabel, Styles.introStyle); @@ -352,7 +352,7 @@ static void Drawer_VolumeSection(SerializedHDDefaultSettings serialized, Editor var oldWidth = EditorGUIUtility.labelWidth; EditorGUIUtility.labelWidth = Styles.labelWidth; - HDDefaultSettings defaultSettings = serialized.serializedObject.targetObject as HDDefaultSettings; + HDGlobalSettings globalSettings = serialized.serializedObject.targetObject as HDGlobalSettings; VolumeProfile asset = null; using (new EditorGUILayout.HorizontalScope()) { @@ -367,7 +367,7 @@ static void Drawer_VolumeSection(SerializedHDDefaultSettings serialized, Editor if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) { - VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.Default, defaultSettings); + VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.Default, globalSettings); } } @@ -405,7 +405,7 @@ static void Drawer_VolumeSection(SerializedHDDefaultSettings serialized, Editor if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) { - VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.LookDev, defaultSettings); + VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.LookDev, globalSettings); } } if (lookDevAsset != null) @@ -440,7 +440,7 @@ static void Drawer_VolumeSection(SerializedHDDefaultSettings serialized, Editor static private bool m_ShowLightLayerNames = false; static private bool m_ShowDecalLayerNames = false; - static void Drawer_LightLayerNames(SerializedHDDefaultSettings serialized, Editor owner) + static void Drawer_LightLayerNames(SerializedHDGlobalSettings serialized, Editor owner) { m_ShowLightLayerNames = EditorGUILayout.Foldout(m_ShowLightLayerNames, Styles.lightLayersLabel, true); if (m_ShowLightLayerNames) @@ -459,7 +459,7 @@ static void Drawer_LightLayerNames(SerializedHDDefaultSettings serialized, Edito } } - static void Drawer_DecalLayerNames(SerializedHDDefaultSettings serialized, Editor owner) + static void Drawer_DecalLayerNames(SerializedHDGlobalSettings serialized, Editor owner) { m_ShowDecalLayerNames = EditorGUILayout.Foldout(m_ShowDecalLayerNames, Styles.decalLayersLabel, true); if (m_ShowDecalLayerNames) @@ -529,14 +529,14 @@ static string GetDefaultName(Kind kind) return defaultName; } - static HDDefaultSettings settings; - public static void CreateAndAssign(Kind kind, HDDefaultSettings defaultSettings) + static HDGlobalSettings settings; + public static void CreateAndAssign(Kind kind, HDGlobalSettings globalSettings) { - settings = defaultSettings; + settings = globalSettings; var assetCreator = ScriptableObject.CreateInstance(); assetCreator.SetKind(kind); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{defaultSettings.name}_{GetDefaultName(kind)}.asset", null, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{globalSettings.name}_{GetDefaultName(kind)}.asset", null, null); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs index aa84ed51a4b..3cea99ebfc3 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs @@ -4,14 +4,14 @@ namespace UnityEditor.Rendering.HighDefinition { - [Obsolete("Please use HDDefaultSettings.instance.* instead.", false)] + [Obsolete("Please use HDGlobalSettings.instance.* instead.", false)] static class EditorDefaultSettings { /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignDefaultVolumeProfile() { - return HDDefaultSettings.instance.GetOrCreateDefaultVolumeProfile(); + return HDGlobalSettings.instance.GetOrCreateDefaultVolumeProfile(); } /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. @@ -34,7 +34,7 @@ internal static VolumeProfile GetOrAssignLookDevVolumeProfile() /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignLookDevVolumeProfile(HDRenderPipelineAsset hdrpAsset) { - return HDDefaultSettings.instance.GetOrAssignLookDevVolumeProfile(); + return HDGlobalSettings.instance.GetOrAssignLookDevVolumeProfile(); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index 0200f1d8aae..62d4d54e59a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs @@ -140,8 +140,8 @@ static HDRenderPipelineAsset GetHDRPAssetFor(Editor owner) static FrameSettings GetDefaultFrameSettingsFor(Editor owner) { return owner is IDefaultFrameSettingsType getType - ? HDDefaultSettings.instance.GetDefaultFrameSettings(getType.GetFrameSettingsType()) - : HDDefaultSettings.instance.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + ? HDGlobalSettings.instance.GetDefaultFrameSettings(getType.GetFrameSettingsType()) + : HDGlobalSettings.instance.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); } static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs index 371236335b8..f3ec7c0fc3f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs @@ -62,16 +62,16 @@ ref FrameSettings GetData(Object obj) return ref probe.frameSettings; default: { - if (obj is HDDefaultSettings defaultSettings) + if (obj is HDGlobalSettings globalSettings) { switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) { case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: - return ref defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: - return ref defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); + return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: - return ref defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); + return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); } } @@ -87,7 +87,7 @@ ref FrameSettings GetData(Object obj) return (obj as HDAdditionalCameraData).renderingPathCustomFrameSettingsOverrideMask; if (obj is HDProbe) return (obj as HDProbe).frameSettingsOverrideMask; - if (obj is HDDefaultSettings) + if (obj is HDGlobalSettings) return null; throw new System.ArgumentException("Unknown kind of object"); } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDGlobalSettings.cs similarity index 74% rename from com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs rename to com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDGlobalSettings.cs index 76f5d1ae0b8..087dbe84999 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDDefaulltSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDGlobalSettings.cs @@ -8,7 +8,7 @@ namespace UnityEditor.Rendering.HighDefinition { - class SerializedHDDefaultSettings + class SerializedHDGlobalSettings { public SerializedObject serializedObject; @@ -52,7 +52,7 @@ public bool editorResourceHasMultipleDifferentValues var initialValue = firstEditorResources; for (int index = 1; index < serializedObject.targetObjects.Length; ++index) { - if (initialValue != (serializedObject.targetObjects[index] as HDDefaultSettings)?.renderPipelineEditorResources) + if (initialValue != (serializedObject.targetObjects[index] as HDGlobalSettings)?.renderPipelineEditorResources) return true; } return false; @@ -60,9 +60,9 @@ public bool editorResourceHasMultipleDifferentValues } public HDRenderPipelineEditorResources firstEditorResources - => (serializedObject.targetObjects[0] as HDDefaultSettings)?.renderPipelineEditorResources; + => (serializedObject.targetObjects[0] as HDGlobalSettings)?.renderPipelineEditorResources; - public SerializedHDDefaultSettings(SerializedObject serializedObject) + public SerializedHDGlobalSettings(SerializedObject serializedObject) { this.serializedObject = serializedObject; @@ -78,28 +78,28 @@ public SerializedHDDefaultSettings(SerializedObject serializedObject) volumeProfileDefault = serializedObject.FindProperty("m_VolumeProfileDefault"); volumeProfileLookDev = serializedObject.FindProperty("m_VolumeProfileLookDev"); - lightLayerName0 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName0); - lightLayerName1 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName1); - lightLayerName2 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName2); - lightLayerName3 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName3); - lightLayerName4 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName4); - lightLayerName5 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName5); - lightLayerName6 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName6); - lightLayerName7 = serializedObject.Find((HDDefaultSettings s) => s.lightLayerName7); - - decalLayerName0 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName0); - decalLayerName1 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName1); - decalLayerName2 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName2); - decalLayerName3 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName3); - decalLayerName4 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName4); - decalLayerName5 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName5); - decalLayerName6 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName6); - decalLayerName7 = serializedObject.Find((HDDefaultSettings s) => s.decalLayerName7); - - shaderVariantLogLevel = serializedObject.Find((HDDefaultSettings s) => s.shaderVariantLogLevel); + lightLayerName0 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName0); + lightLayerName1 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName1); + lightLayerName2 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName2); + lightLayerName3 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName3); + lightLayerName4 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName4); + lightLayerName5 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName5); + lightLayerName6 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName6); + lightLayerName7 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName7); + + decalLayerName0 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName0); + decalLayerName1 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName1); + decalLayerName2 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName2); + decalLayerName3 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName3); + decalLayerName4 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName4); + decalLayerName5 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName5); + decalLayerName6 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName6); + decalLayerName7 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName7); + + shaderVariantLogLevel = serializedObject.Find((HDGlobalSettings s) => s.shaderVariantLogLevel); lensAttenuation = serializedObject.FindProperty("m_LensAttenuation"); - diffusionProfileSettingsList = serializedObject.Find((HDDefaultSettings s) => s.diffusionProfileSettingsList); + diffusionProfileSettingsList = serializedObject.Find((HDGlobalSettings s) => s.diffusionProfileSettingsList); } internal ReorderableList uiBeforeTransparentCustomPostProcesses; @@ -124,11 +124,11 @@ void InitializeCustomPostProcessesLists() ppVolumeTypeInjectionPoints[ppVolumeType] = comp.injectionPoint; CoreUtils.Destroy(comp); } - var defaultSettings = serializedObject.targetObject as HDDefaultSettings; - InitList(ref uiBeforeTransparentCustomPostProcesses, defaultSettings.beforeTransparentCustomPostProcesses, "After Opaque And Sky", CustomPostProcessInjectionPoint.AfterOpaqueAndSky); - InitList(ref uiBeforePostProcessCustomPostProcesses, defaultSettings.beforePostProcessCustomPostProcesses, "Before Post Process", CustomPostProcessInjectionPoint.BeforePostProcess); - InitList(ref uiAfterPostProcessCustomPostProcesses, defaultSettings.afterPostProcessCustomPostProcesses, "After Post Process", CustomPostProcessInjectionPoint.AfterPostProcess); - InitList(ref uiBeforeTAACustomPostProcesses, defaultSettings.beforeTAACustomPostProcesses, "Before TAA", CustomPostProcessInjectionPoint.BeforeTAA); + var globalSettings = serializedObject.targetObject as HDGlobalSettings; + InitList(ref uiBeforeTransparentCustomPostProcesses, globalSettings.beforeTransparentCustomPostProcesses, "After Opaque And Sky", CustomPostProcessInjectionPoint.AfterOpaqueAndSky); + InitList(ref uiBeforePostProcessCustomPostProcesses, globalSettings.beforePostProcessCustomPostProcesses, "Before Post Process", CustomPostProcessInjectionPoint.BeforePostProcess); + InitList(ref uiAfterPostProcessCustomPostProcesses, globalSettings.afterPostProcessCustomPostProcesses, "After Post Process", CustomPostProcessInjectionPoint.AfterPostProcess); + InitList(ref uiBeforeTAACustomPostProcesses, globalSettings.beforeTAACustomPostProcesses, "Before TAA", CustomPostProcessInjectionPoint.BeforeTAA); void InitList(ref ReorderableList reorderableList, List customPostProcessTypes, string headerName, CustomPostProcessInjectionPoint injectionPoint) { diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index d4fbaa79f2f..3d2c41b9273 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -393,24 +393,24 @@ void FixHdrpAssetUsed(bool fromAsync) bool IsHdrpAssetRuntimeResourcesCorrect() => IsHdrpAssetUsedCorrect() - && HDDefaultSettings.instance.AreResourcesCreated(); + && HDGlobalSettings.instance.AreResourcesCreated(); void FixHdrpAssetRuntimeResources(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDDefaultSettings.instance.EnsureResources(forceReload: true); + HDGlobalSettings.instance.EnsureResources(forceReload: true); } bool IsHdrpAssetEditorResourcesCorrect() => IsHdrpAssetUsedCorrect() - && HDDefaultSettings.instance.AreEditorResourcesCreated(); + && HDGlobalSettings.instance.AreEditorResourcesCreated(); void FixHdrpAssetEditorResources(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDDefaultSettings.instance.EnsureEditorResources(forceReload: true); + HDGlobalSettings.instance.EnsureEditorResources(forceReload: true); } bool IsSRPBatcherCorrect() @@ -463,7 +463,7 @@ bool IsDefaultVolumeProfileAssigned() if (!IsHdrpAssetUsedCorrect()) return false; - return HDDefaultSettings.instance.IsVolumeProfileFromResources(); + return HDGlobalSettings.instance.IsVolumeProfileFromResources(); } void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) @@ -475,7 +475,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) if (hdrpAsset == null) return; - VolumeProfile defaultSettingsVolumeProfileInPackage = HDDefaultSettings.instance.renderPipelineEditorResources.defaultSettingsVolumeProfile; + VolumeProfile defaultSettingsVolumeProfileInPackage = HDGlobalSettings.instance.renderPipelineEditorResources.defaultSettingsVolumeProfile; string defaultSettingsVolumeProfilePath = "Assets/" + HDProjectSettings.projectSettingsFolderPath + '/' + defaultSettingsVolumeProfileInPackage.name + ".asset"; //try load one if one already exist @@ -486,7 +486,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(defaultSettingsVolumeProfileInPackage), defaultSettingsVolumeProfilePath); defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath(defaultSettingsVolumeProfilePath); } - HDDefaultSettings.instance.volumeProfile = defaultSettingsVolumeProfile; + HDGlobalSettings.instance.volumeProfile = defaultSettingsVolumeProfile; EditorUtility.SetDirty(hdrpAsset); } @@ -616,14 +616,14 @@ void CheckPersistantNeedReboot() } bool IsDXRAssetCorrect() - => HDDefaultSettings.instance.AreRayTracingResourcesCreated() + => HDGlobalSettings.instance.AreRayTracingResourcesCreated() && SystemInfo.supportsRayTracing; void FixDXRAsset(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDDefaultSettings.instance.EnsureRayTracingResources(forceReload: true); + HDGlobalSettings.instance.EnsureRayTracingResources(forceReload: true); // IMPORTANT: We display the error only if we are D3D12 as the supportsRayTracing always return false in any other device even if OS/HW supports DXR. // The D3D12 is a separate check in the wizard, so it is fine not to display an error in case we are not D3D12. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index 2bfa2532f2a..3d855e2985e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -186,18 +186,18 @@ bool ValidatePipeline() m_AlphaSupport = AlphaChannelSupport.Rendering; } - int indx = HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); + int indx = HDGlobalSettings.instance.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); if (indx < 0) { //Debug.Log("Registering chroma keying pass for the HDRP pipeline"); - HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); + HDGlobalSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); } - indx = HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); + indx = HDGlobalSettings.instance.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); if (indx < 0) { //Debug.Log("Registering alpha injection pass for the HDRP pipeline"); - HDDefaultSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); + HDGlobalSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); } return true; } 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 a8d30824045..49fda816894 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 @@ -3485,7 +3485,7 @@ ContactShadowsParameters PrepareContactShadowsParameters(HDCamera hdCamera, floa parameters.rayTracingEnabled = RayTracedContactShadowsRequired(); if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing)) { - parameters.contactShadowsRTS = HDDefaultSettings.instance.renderPipelineRayTracingResources.contactShadowRayTracingRT; + parameters.contactShadowsRTS = HDGlobalSettings.instance.renderPipelineRayTracingResources.contactShadowRayTracingRT; parameters.accelerationStructure = RequestAccelerationStructure(); parameters.actualWidth = hdCamera.actualWidth; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs index fe0b711f90b..a16c24d2a32 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs @@ -192,9 +192,9 @@ void InitializeScreenSpaceShadows() // Fetch the shaders if (m_RayTracingSupported) { - m_ScreenSpaceShadowsCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowRaytracingCS; - m_ScreenSpaceShadowsFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; - m_ScreenSpaceShadowsRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowRaytracingRT; + m_ScreenSpaceShadowsCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowRaytracingCS; + m_ScreenSpaceShadowsFilterCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; + m_ScreenSpaceShadowsRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowRaytracingRT; // Directional shadow kernels m_ClearShadowTexture = m_ScreenSpaceShadowsCS.FindKernel("ClearShadowTexture"); @@ -370,7 +370,7 @@ SSShadowDebugParameters PrepareSSShadowDebugParameters(HDCamera hdCamera, int ta sssdParams.debugKernel = m_WriteShadowTextureDebugKernel; // TODO: move the debug kernel outside of the ray tracing resources - sssdParams.shadowFilter = HDDefaultSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; + sssdParams.shadowFilter = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; return sssdParams; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs index 1627883fb6b..fba7b370ade 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs @@ -69,7 +69,7 @@ public void RegisterVolume(DensityVolume volume) if (!SystemInfo.IsFormatSupported(densityVolumeAtlasFormat, FormatUsage.LoadStore)) return; - if (volume.parameters.volumeMask != null) + if (volume.parameters.volumeMask != null && volumeAtlas != null) { if (volumeAtlas.IsTextureValid(volume.parameters.volumeMask)) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs index 7bab8c24c26..0e2bd061db7 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs @@ -306,7 +306,7 @@ void InitMaterial() if (m_Material == null) { #if UNITY_EDITOR - m_Material = HDDefaultSettings.instance != null ? HDDefaultSettings.instance.GetDefaultDecalMaterial() : null; + m_Material = HDGlobalSettings.instance != null ? HDGlobalSettings.instance.GetDefaultDecalMaterial() : null; #else m_Material = null; #endif diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs index fbd571642c7..e083491da9c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/SubsurfaceScatteringManagerRT.cs @@ -25,8 +25,8 @@ static RTHandle SubSurfaceHistoryBufferAllocatorFunction(string viewName, int fr void InitializeSubsurfaceScatteringRT() { - ComputeShader rayTracingSubSurfaceCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; - ComputeShader deferredRayTracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + ComputeShader rayTracingSubSurfaceCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + ComputeShader deferredRayTracingCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; m_SSSClearTextureKernel = rayTracingSubSurfaceCS.FindKernel("ClearTexture"); m_RaytracingDiffuseDeferredKernel = deferredRayTracingCS.FindKernel("RaytracingDiffuseDeferred"); @@ -79,9 +79,9 @@ SSSRayTracingParameters PrepareSSSRayTracingParameters(HDCamera hdCamera, SubSur sssrtParams.rtDeferredLightingKernel = m_RaytracingDiffuseDeferredKernel; // other required parameters - sssrtParams.rayTracingSubSurfaceRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingRT; - sssrtParams.rayTracingSubSurfaceCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; - sssrtParams.deferredRayTracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + sssrtParams.rayTracingSubSurfaceRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingRT; + sssrtParams.rayTracingSubSurfaceCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + sssrtParams.deferredRayTracingCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; sssrtParams.accelerationStructure = RequestAccelerationStructure(); sssrtParams.lightCluster = RequestLightCluster(); sssrtParams.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; @@ -206,7 +206,7 @@ SSSCombineParameters PrepareSSSCombineParameters(HDCamera hdCamera) ssscParams.combineSSSKernel = ssscParams.validSSGI ? m_CombineSubSurfaceWithGIKernel : m_CombineSubSurfaceKernel; // Other parameters - ssscParams.rayTracingSubSurfaceCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + ssscParams.rayTracingSubSurfaceCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; ssscParams.combineLightingMat = m_CombineLightingPass; return ssscParams; 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 c714ff47d93..415f5d31e32 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 @@ -900,7 +900,7 @@ internal void DoUserAfterOpaqueAndSky(RenderGraph renderGraph, HDCamera hdCamera using (new RenderGraphProfilingScope(renderGraph, ProfilingSampler.Get(HDProfileId.CustomPostProcessAfterOpaqueAndSky))) { TextureHandle source = colorBuffer; - bool needBlitToColorBuffer = DoCustomPostProcess(renderGraph, hdCamera, ref source, depthBuffer, normalBuffer, HDDefaultSettings.instance.beforeTransparentCustomPostProcesses); + bool needBlitToColorBuffer = DoCustomPostProcess(renderGraph, hdCamera, ref source, depthBuffer, normalBuffer, HDGlobalSettings.instance.beforeTransparentCustomPostProcesses); if (needBlitToColorBuffer) { @@ -1002,7 +1002,7 @@ public void Render(RenderGraph renderGraph, source = DynamicExposurePass(renderGraph, hdCamera, source); - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDDefaultSettings.instance.beforeTAACustomPostProcesses, HDProfileId.CustomPostProcessBeforeTAA); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDGlobalSettings.instance.beforeTAACustomPostProcesses, HDProfileId.CustomPostProcessBeforeTAA); // Temporal anti-aliasing goes first if (m_AntialiasingFS) @@ -1017,7 +1017,7 @@ public void Render(RenderGraph renderGraph, } } - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDDefaultSettings.instance.beforePostProcessCustomPostProcesses, HDProfileId.CustomPostProcessBeforePP); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDGlobalSettings.instance.beforePostProcessCustomPostProcesses, HDProfileId.CustomPostProcessBeforePP); source = DepthOfFieldPass(renderGraph, hdCamera, depthBuffer, motionVectors, depthBufferMipChain, source); @@ -1036,7 +1036,7 @@ public void Render(RenderGraph renderGraph, source = UberPass(renderGraph, hdCamera, logLutOutput, bloomTexture, source); m_HDInstance.PushFullScreenDebugTexture(renderGraph, source, FullScreenDebugMode.ColorLog); - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDDefaultSettings.instance.afterPostProcessCustomPostProcesses, HDProfileId.CustomPostProcessAfterPP); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDGlobalSettings.instance.afterPostProcessCustomPostProcesses, HDProfileId.CustomPostProcessAfterPP); source = FXAAPass(renderGraph, hdCamera, source); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.Migration.cs similarity index 77% rename from com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs rename to com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.Migration.cs index e009cd4a39c..db990f261fe 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.Migration.cs @@ -3,11 +3,11 @@ namespace UnityEngine.Rendering.HighDefinition { - public partial class HDDefaultSettings : IVersionable + public partial class HDGlobalSettings : IVersionable { enum Version { - First + First, } [SerializeField] diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.cs similarity index 92% rename from com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs rename to com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.cs index 694a42f747e..a846230d917 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.cs @@ -21,28 +21,28 @@ enum LensAttenuationMode } /// - /// High Definition Render Pipeline Default Settings. - /// Default settings are unique per Render Pipeline type. In HD, Default Settings contain: + /// High Definition Render Pipeline's Global Settings. + /// Global settings are unique per Render Pipeline type. In HD, Global Settings contain: /// - a default Volume (Global) combined with its Default Profile (defines which components are active by default) - /// - this Volume's profile + /// - the default Volume's profile /// - the LookDev Volume Profile - /// - Frame Settings - /// - Various resources for runtime, editor-only, and raytracing + /// - Frame Settings applied by default to Camera, ReflectionProbe + /// - Various resources (such as Shaders) for runtime, editor-only, and raytracing /// - public partial class HDDefaultSettings : RenderPipelineGlobalSettings + public partial class HDGlobalSettings : RenderPipelineGlobalSettings { - private static HDDefaultSettings cachedInstance = null; - public static HDDefaultSettings instance + private static HDGlobalSettings cachedInstance = null; + public static HDGlobalSettings instance { get { if (cachedInstance == null) - cachedInstance = GraphicsSettings.GetSettingsForRenderPipeline() as HDDefaultSettings; + cachedInstance = GraphicsSettings.GetSettingsForRenderPipeline() as HDGlobalSettings; return cachedInstance; } } - static public void UpdateGraphicsSettings(HDDefaultSettings newSettings) + static public void UpdateGraphicsSettings(HDGlobalSettings newSettings) { if (newSettings == null || newSettings == cachedInstance) return; @@ -51,39 +51,39 @@ static public void UpdateGraphicsSettings(HDDefaultSettings newSettings) } #if UNITY_EDITOR - //Making sure there is at least one HDDefaultSettings instance in the project - static public HDDefaultSettings Ensure() + //Making sure there is at least one HDGlobalSettings instance in the project + static public HDGlobalSettings Ensure() { - if (HDDefaultSettings.instance) - return HDDefaultSettings.instance; + if (HDGlobalSettings.instance) + return HDGlobalSettings.instance; - HDDefaultSettings assetCreated = null; - string path = "Assets/HDRPDefaultResources/HDGraphicsSettings.asset"; - assetCreated = AssetDatabase.LoadAssetAtPath(path); + HDGlobalSettings assetCreated = null; + string path = "Assets/HDRPDefaultResources/HDGlobalSettings.asset"; + assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { - var guidHDDefaultAssets = AssetDatabase.FindAssets("t:HDDefaultSettings"); + var guidHDGlobalAssets = AssetDatabase.FindAssets("t:HDGlobalSettings"); //If we could not find the asset at the default path, find the first one - if (guidHDDefaultAssets.Length > 0) + if (guidHDGlobalAssets.Length > 0) { - var curGUID = guidHDDefaultAssets[0]; + var curGUID = guidHDGlobalAssets[0]; path = AssetDatabase.GUIDToAssetPath(curGUID); - assetCreated = AssetDatabase.LoadAssetAtPath(path); + assetCreated = AssetDatabase.LoadAssetAtPath(path); } else // or create one altogether { if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); - assetCreated = ScriptableObject.CreateInstance(); + assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); } } - Debug.Assert(assetCreated, "Could not create HD Default Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); + Debug.Assert(assetCreated, "Could not create HD Global Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); UpdateGraphicsSettings(assetCreated); - return HDDefaultSettings.instance; + return HDGlobalSettings.instance; } #endif @@ -124,23 +124,23 @@ void Init() } #if UNITY_EDITOR - internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) + internal static HDGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) { - string path = "Assets/HDRPDefaultResources/HDGraphicsSettings.asset"; + string path = "Assets/HDRPDefaultResources/HDGlobalSettings.asset"; return MigrateFromHDRPAsset(oldAsset, path, bClearObsoleteFields); } - internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) + internal static HDGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) { - HDDefaultSettings assetCreated = null; + HDGlobalSettings assetCreated = null; // 1. Load or Create the HDAsset and save it on disk - assetCreated = AssetDatabase.LoadAssetAtPath(path); + assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); - assetCreated = ScriptableObject.CreateInstance(); + assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); AssetDatabase.SaveAssets(); @@ -209,15 +209,15 @@ internal static HDDefaultSettings MigrateFromHDRPAsset(HDRenderPipelineAsset old return assetCreated; } - internal static HDDefaultSettings Create(string path, HDDefaultSettings src = null) + internal static HDGlobalSettings Create(string path, HDGlobalSettings src = null) { - HDDefaultSettings assetCreated = null; + HDGlobalSettings assetCreated = null; // make sure the asset does not already exists - assetCreated = AssetDatabase.LoadAssetAtPath(path); + assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { - assetCreated = ScriptableObject.CreateInstance(); + assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); if (assetCreated != null) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs index 99789b46096..fa1c0d1617d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs @@ -20,18 +20,15 @@ struct LookDevDataForHDRP #if UNITY_EDITOR bool UpdateVolumeProfile(Volume volume, out VisualEnvironment visualEnvironment, out HDRISky sky, ref int volumeProfileHash) { - HDDefaultSettings defaultSettings = HDDefaultSettings.instance; - if (defaultSettings.volumeProfileLookDev == null) - defaultSettings.volumeProfileLookDev = defaultSettings.renderPipelineEditorResources.lookDev.defaultLookDevVolumeProfile; - - int newHashCode = defaultSettings.volumeProfileLookDev.GetHashCode(); + var lookDevVolumeProfile = HDGlobalSettings.instance.GetOrAssignLookDevVolumeProfile(); + int newHashCode = lookDevVolumeProfile.GetHashCode(); if (newHashCode != volumeProfileHash) { VolumeProfile oldProfile = volume.sharedProfile; volumeProfileHash = newHashCode; - VolumeProfile profile = ScriptableObject.Instantiate(defaultSettings.volumeProfileLookDev); + VolumeProfile profile = ScriptableObject.Instantiate(lookDevVolumeProfile); profile.hideFlags = HideFlags.HideAndDontSave; volume.sharedProfile = profile; 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 cf42a8d91f7..62625940c99 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -23,12 +23,12 @@ namespace UnityEngine.Rendering.HighDefinition /// public partial class HDRenderPipeline : RenderPipeline { - #region Default Settings - internal static HDDefaultSettings defaultAsset - => HDDefaultSettings.instance; + #region Global Settings + internal static HDGlobalSettings defaultAsset + => HDGlobalSettings.instance; - private HDDefaultSettings m_defaultSettings; - public override RenderPipelineGlobalSettings defaultSettings => m_defaultSettings; + private HDGlobalSettings m_globalSettings; + public override RenderPipelineGlobalSettings defaultSettings => m_globalSettings; internal static HDRenderPipelineAsset currentAsset => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset : null; @@ -48,7 +48,7 @@ internal static HDRenderPipeline currentPipeline readonly HDRenderPipelineAsset m_Asset; internal HDRenderPipelineAsset asset { get { return m_Asset; } } - internal RenderPipelineResources defaultResources { get { return m_defaultSettings.renderPipelineResources; } } + internal RenderPipelineResources defaultResources { get { return HDGlobalSettings.instance.renderPipelineResources; } } internal RenderPipelineSettings currentPlatformRenderPipelineSettings { get { return m_Asset.currentPlatformRenderPipelineSettings; } } @@ -295,9 +295,9 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset obsol public HDRenderPipeline(HDRenderPipelineAsset asset) { #if UNITY_EDITOR - m_defaultSettings = HDDefaultSettings.Ensure(); + m_globalSettings = HDGlobalSettings.Ensure(); #else - m_defaultSettings = HDDefaultSettings.instance; + m_globalSettings = HDGlobalSettings.instance; #endif m_Asset = asset; HDProbeSystem.Parameters = asset.reflectionSystemParameters; @@ -310,8 +310,8 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) // Initialize lod settings with the default frame settings. This will pull LoD values from the current quality level HDRP asset if necessary. // This will make the LoD Group UI consistent with the scene view camera like it is for builtin pipeline. - QualitySettings.lodBias = m_defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedLODBias(m_Asset); - QualitySettings.maximumLODLevel = m_defaultSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedMaximumLODLevel(m_Asset); + QualitySettings.lodBias = m_globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedLODBias(m_Asset); + QualitySettings.maximumLODLevel = m_globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedMaximumLODLevel(m_Asset); // The first thing we need to do is to set the defines that depend on the render pipeline settings m_RayTracingSupported = GatherRayTracingSupport(m_Asset.currentPlatformRenderPipelineSettings); @@ -322,14 +322,14 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) //In case we are loading element in the asset pipeline (occurs when library is not fully constructed) the creation of the HDRenderPipeline is done at a time we cannot access resources. //So in this case, the reloader would fail and the resources cannot be validated. So skip validation here. //The HDRenderPipeline will be reconstructed in a few frame which will fix this issue. - if ((m_defaultSettings.AreResourcesCreated() == false) - || (m_defaultSettings.AreEditorResourcesCreated() == false) - || (m_RayTracingSupported && !m_defaultSettings.AreRayTracingResourcesCreated())) + if ((m_globalSettings.AreResourcesCreated() == false) + || (m_globalSettings.AreEditorResourcesCreated() == false) + || (m_RayTracingSupported && !m_globalSettings.AreRayTracingResourcesCreated())) return; else m_ResourcesInitialized = true; - m_defaultSettings.EnsureShadersCompiled(); + m_globalSettings.EnsureShadersCompiled(); #endif // We need to call this after the resource initialization as we attempt to use them in checking the supported API. @@ -339,11 +339,11 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) return; } - if (m_defaultSettings.lensAttenuationMode == LensAttenuationMode.ImperfectLens) + if (m_globalSettings.lensAttenuationMode == LensAttenuationMode.ImperfectLens) { ColorUtils.s_LensAttenuation = 0.65f; } - else if (m_defaultSettings.lensAttenuationMode == LensAttenuationMode.PerfectLens) + else if (m_globalSettings.lensAttenuationMode == LensAttenuationMode.PerfectLens) { ColorUtils.s_LensAttenuation = 0.78f; } @@ -480,8 +480,8 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) CameraCaptureBridge.enabled = true; InitializePrepass(m_Asset); - m_ColorResolveMaterial = CoreUtils.CreateEngineMaterial(m_defaultSettings.renderPipelineResources.shaders.colorResolvePS); - m_MotionVectorResolve = CoreUtils.CreateEngineMaterial(m_defaultSettings.renderPipelineResources.shaders.resolveMotionVecPS); + m_ColorResolveMaterial = CoreUtils.CreateEngineMaterial(m_globalSettings.renderPipelineResources.shaders.colorResolvePS); + m_MotionVectorResolve = CoreUtils.CreateEngineMaterial(m_globalSettings.renderPipelineResources.shaders.resolveMotionVecPS); CustomPassUtils.Initialize(); } @@ -493,23 +493,23 @@ void UpgradeResourcesIfNeeded() m_Asset.EvaluateSettings(); // Check that the serialized Resources are not broken - m_defaultSettings.EnsureResources(forceReload: true); - m_defaultSettings.EnsureEditorResources(forceReload: true); + m_globalSettings.EnsureResources(forceReload: true); + m_globalSettings.EnsureEditorResources(forceReload: true); if (m_RayTracingSupported) { - m_defaultSettings.EnsureRayTracingResources(forceReload: true); + m_globalSettings.EnsureRayTracingResources(forceReload: true); } else { // If ray tracing is not enabled we do not want to have ray tracing resources referenced - m_defaultSettings.ClearRayTracingResources(); + m_globalSettings.ClearRayTracingResources(); } } void ValidateResources() { - HDDefaultSettings.instance.EnsureShadersCompiled(); + HDGlobalSettings.instance.EnsureShadersCompiled(); } #endif @@ -1135,7 +1135,7 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c #endif return; - m_defaultSettings.GetOrCreateDefaultVolume(); + m_globalSettings.GetOrCreateDefaultVolume(); // This function should be called once every render (once for all camera) LightLoopNewRender(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs index f5e1981218d..51ecadc3c9b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs @@ -1,7 +1,7 @@ using System; -using UnityEngine.Serialization; -using UnityEditor; using System.Collections.Generic; //needed for list of Custom Post Processes injections +using UnityEditor; +using UnityEngine.Serialization; namespace UnityEngine.Rendering.HighDefinition { @@ -27,7 +27,7 @@ enum Version RemoveCookieCubeAtlasToOctahedral2D, RoughDistortion, VirtualTexturing, - DefaultSettingsAsAnAsset + AddedHDGlobalSettings } static readonly MigrationDescription k_Migration = MigrationDescription.New( @@ -157,7 +157,7 @@ enum Version FrameSettings.MigrateVirtualTexturing(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings); #pragma warning restore 618 }) , - MigrationStep.New(Version.DefaultSettingsAsAnAsset, (HDRenderPipelineAsset data) => + MigrationStep.New(Version.AddedHDGlobalSettings, (HDRenderPipelineAsset data) => { #if UNITY_EDITOR // 2/ it acted as the definition of the Default Settings - now migrated to its own asset @@ -165,9 +165,9 @@ enum Version if (data == GraphicsSettings.defaultRenderPipeline) #pragma warning restore 618 { - HDDefaultSettings defaultSettings = HDDefaultSettings.MigrateFromHDRPAsset(data, true); - HDDefaultSettings.UpdateGraphicsSettings(defaultSettings); - EditorUtility.SetDirty(defaultSettings); + HDGlobalSettings globalSettings = HDGlobalSettings.MigrateFromHDRPAsset(data, true); + HDGlobalSettings.UpdateGraphicsSettings(globalSettings); + EditorUtility.SetDirty(globalSettings); } #endif }) @@ -190,52 +190,52 @@ enum Version [FormerlySerializedAs("m_RealtimeReflectionFrameSettings"), Obsolete("For data migration")] ObsoleteFrameSettings m_ObsoleteRealtimeReflectionFrameSettings; - #region Settings Moved from the HDRP Asset to HDDefaultSettings + #region Settings Moved from the HDRP Asset to HDGlobalSettings [SerializeField] - [FormerlySerializedAs("m_DefaultVolumeProfile"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_DefaultVolumeProfile"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal VolumeProfile m_ObsoleteDefaultVolumeProfile; [SerializeField] - [FormerlySerializedAs("m_DefaultLookDevProfile"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_DefaultLookDevProfile"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal VolumeProfile m_ObsoleteDefaultLookDevProfile; [SerializeField] - [FormerlySerializedAs("m_RenderingPathDefaultCameraFrameSettings"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_RenderingPathDefaultCameraFrameSettings"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal FrameSettings m_ObsoleteFrameSettingsMovedToDefaultSettings; [SerializeField] - [FormerlySerializedAs("m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal FrameSettings m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings; [SerializeField] - [FormerlySerializedAs("m_RenderingPathDefaultRealtimeReflectionFrameSettings"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_RenderingPathDefaultRealtimeReflectionFrameSettings"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal FrameSettings m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings; [SerializeField] - [FormerlySerializedAs("m_RenderPipelineResources"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_RenderPipelineResources"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal RenderPipelineResources m_ObsoleteRenderPipelineResources; [SerializeField] - [FormerlySerializedAs("m_RenderPipelineRayTracingResources"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_RenderPipelineRayTracingResources"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal HDRenderPipelineRayTracingResources m_ObsoleteRenderPipelineRayTracingResources; [SerializeField] - [FormerlySerializedAs("beforeTransparentCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("beforeTransparentCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal List m_ObsoleteBeforeTransparentCustomPostProcesses; [SerializeField] - [FormerlySerializedAs("beforePostProcessCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("beforePostProcessCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal List m_ObsoleteBeforePostProcessCustomPostProcesses; [SerializeField] - [FormerlySerializedAs("afterPostProcessCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("afterPostProcessCustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal List m_ObsoleteAfterPostProcessCustomPostProcesses; [SerializeField] - [FormerlySerializedAs("beforeTAACustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("beforeTAACustomPostProcesses"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal List m_ObsoleteBeforeTAACustomPostProcesses; [SerializeField] - [FormerlySerializedAs("shaderVariantLogLevel"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("shaderVariantLogLevel"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal ShaderVariantLogLevel m_ObsoleteShaderVariantLogLevel; [SerializeField] - [FormerlySerializedAs("m_LensAttenuation"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("m_LensAttenuation"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal LensAttenuationMode m_ObsoleteLensAttenuation; [SerializeField] - [FormerlySerializedAs("diffusionProfileSettingsList"), Obsolete("Moved from HDRPAsset to HDDefault Settings")] + [FormerlySerializedAs("diffusionProfileSettingsList"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal DiffusionProfileSettings[] m_ObsoleteDiffusionProfileSettingsList; #endregion diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 62ebcd4cc90..c079924d62f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -36,7 +36,7 @@ protected override void OnValidate() { isInOnValidateCall = true; #if UNITY_EDITOR - HDDefaultSettings.Ensure(); + HDGlobalSettings.Ensure(); #endif //Do not reconstruct the pipeline if we modify other assets. //OnValidate is called once at first selection of the asset. @@ -48,11 +48,11 @@ protected override void OnValidate() isInOnValidateCall = false; } - public HDDefaultSettings defaultSettings => HDDefaultSettings.instance; + public HDGlobalSettings defaultSettings => HDGlobalSettings.instance; internal RenderPipelineResources renderPipelineResources { - get { return defaultSettings.renderPipelineResources; } + get { return HDGlobalSettings.Ensure().renderPipelineResources; } set { defaultSettings.renderPipelineResources = value; } } @@ -108,23 +108,23 @@ void UpdateRenderingLayerNames() { m_RenderingLayerNames = new string[32]; - m_RenderingLayerNames[0] = HDDefaultSettings.instance.lightLayerName0; - m_RenderingLayerNames[1] = HDDefaultSettings.instance.lightLayerName1; - m_RenderingLayerNames[2] = HDDefaultSettings.instance.lightLayerName2; - m_RenderingLayerNames[3] = HDDefaultSettings.instance.lightLayerName3; - m_RenderingLayerNames[4] = HDDefaultSettings.instance.lightLayerName4; - m_RenderingLayerNames[5] = HDDefaultSettings.instance.lightLayerName5; - m_RenderingLayerNames[6] = HDDefaultSettings.instance.lightLayerName6; - m_RenderingLayerNames[7] = HDDefaultSettings.instance.lightLayerName7; - - m_RenderingLayerNames[8] = HDDefaultSettings.instance.decalLayerName0; - m_RenderingLayerNames[9] = HDDefaultSettings.instance.decalLayerName1; - m_RenderingLayerNames[10] = HDDefaultSettings.instance.decalLayerName2; - m_RenderingLayerNames[11] = HDDefaultSettings.instance.decalLayerName3; - m_RenderingLayerNames[12] = HDDefaultSettings.instance.decalLayerName4; - m_RenderingLayerNames[13] = HDDefaultSettings.instance.decalLayerName5; - m_RenderingLayerNames[14] = HDDefaultSettings.instance.decalLayerName6; - m_RenderingLayerNames[15] = HDDefaultSettings.instance.decalLayerName7; + m_RenderingLayerNames[0] = HDGlobalSettings.instance.lightLayerName0; + m_RenderingLayerNames[1] = HDGlobalSettings.instance.lightLayerName1; + m_RenderingLayerNames[2] = HDGlobalSettings.instance.lightLayerName2; + m_RenderingLayerNames[3] = HDGlobalSettings.instance.lightLayerName3; + m_RenderingLayerNames[4] = HDGlobalSettings.instance.lightLayerName4; + m_RenderingLayerNames[5] = HDGlobalSettings.instance.lightLayerName5; + m_RenderingLayerNames[6] = HDGlobalSettings.instance.lightLayerName6; + m_RenderingLayerNames[7] = HDGlobalSettings.instance.lightLayerName7; + + m_RenderingLayerNames[8] = HDGlobalSettings.instance.decalLayerName0; + m_RenderingLayerNames[9] = HDGlobalSettings.instance.decalLayerName1; + m_RenderingLayerNames[10] = HDGlobalSettings.instance.decalLayerName2; + m_RenderingLayerNames[11] = HDGlobalSettings.instance.decalLayerName3; + m_RenderingLayerNames[12] = HDGlobalSettings.instance.decalLayerName4; + m_RenderingLayerNames[13] = HDGlobalSettings.instance.decalLayerName5; + m_RenderingLayerNames[14] = HDGlobalSettings.instance.decalLayerName6; + m_RenderingLayerNames[15] = HDGlobalSettings.instance.decalLayerName7; // Unused for (int i = 16; i < m_RenderingLayerNames.Length; ++i) @@ -157,12 +157,12 @@ public override string[] renderingLayerMaskNames /// /// Names used for display of light layers. /// - public string[] lightLayerNames => HDDefaultSettings.instance.lightLayerNames; + public string[] lightLayerNames => HDGlobalSettings.instance.lightLayerNames; /// /// Names used for display of decal layers. /// - public string[] decalLayerNames => HDDefaultSettings.instance.decalLayerNames; + public string[] decalLayerNames => HDGlobalSettings.instance.decalLayerNames; /// HDRP default shader. public override Shader defaultShader diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs index f21be6b1379..1fc15c57694 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs @@ -248,7 +248,7 @@ PathTracingParameters PreparePathTracingParameters(HDCamera hdCamera) { PathTracingParameters parameters = new PathTracingParameters(); - parameters.pathTracingShader = HDDefaultSettings.instance.renderPipelineRayTracingResources.pathTracing; + parameters.pathTracingShader = HDGlobalSettings.instance.renderPipelineRayTracingResources.pathTracing; parameters.cameraData = m_SubFrameManager.GetCameraData(hdCamera.camera.GetInstanceID()); parameters.ditheredTextureSet = GetBlueNoiseManager().DitheredTextureSet256SPP(); parameters.backgroundColor = hdCamera.backgroundColorHDR; @@ -327,7 +327,7 @@ TextureHandle RenderPathTracing(RenderGraph renderGraph, in PathTracingParameter TextureHandle RenderPathTracing(RenderGraph renderGraph, HDCamera hdCamera) { - RayTracingShader pathTracingShader = HDDefaultSettings.instance.renderPipelineRayTracingResources.pathTracing; + RayTracingShader pathTracingShader = HDGlobalSettings.instance.renderPipelineRayTracingResources.pathTracing; m_PathTracingSettings = hdCamera.volumeStack.GetComponent(); // Check the validity of the state before moving on with the computation diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs index 5b0a11b2c07..0b19dc128cc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingAmbientOcclusion.cs @@ -19,7 +19,7 @@ partial class HDRaytracingAmbientOcclusion public void Init(HDRenderPipeline renderPipeline) { // Keep track of the pipeline asset - m_PipelineRayTracingResources = HDDefaultSettings.instance.renderPipelineRayTracingResources; + m_PipelineRayTracingResources = HDGlobalSettings.instance.renderPipelineRayTracingResources; // keep track of the render pipeline m_RenderPipeline = renderPipeline; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs index f8a9dc129cf..c1bd4a5d14c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs @@ -16,7 +16,7 @@ public partial class HDRenderPipeline void InitRayTracedIndirectDiffuse() { - ComputeShader indirectDiffuseShaderCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + ComputeShader indirectDiffuseShaderCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; // Grab all the kernels we shall be using m_RaytracingIndirectDiffuseFullResKernel = indirectDiffuseShaderCS.FindKernel("RaytracingIndirectDiffuseFullRes"); @@ -68,9 +68,9 @@ DeferredLightingRTParameters PrepareIndirectDiffuseDeferredLightingRTParameters( deferredParameters.lightCluster = RequestLightCluster(); // Shaders - deferredParameters.gBufferRaytracingRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; - deferredParameters.deferredRaytracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; - deferredParameters.rayBinningCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.rayBinningCS; + deferredParameters.gBufferRaytracingRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; + deferredParameters.deferredRaytracingCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + deferredParameters.rayBinningCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.rayBinningCS; // XRTODO: add ray binning support for single-pass if (deferredParameters.viewCount > 1 && deferredParameters.rayBinning) @@ -121,7 +121,7 @@ RTIndirectDiffuseDirGenParameters PrepareRTIndirectDiffuseDirGenParameters(HDCam rtidDirGenParams.fullResolution = settings.fullResolution; // Grab the right kernel - rtidDirGenParams.directionGenCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + rtidDirGenParams.directionGenCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; rtidDirGenParams.dirGenKernel = settings.fullResolution ? m_RaytracingIndirectDiffuseFullResKernel : m_RaytracingIndirectDiffuseHalfResKernel; // Grab the additional parameters @@ -202,13 +202,13 @@ RTIndirectDiffuseUpscaleParameters PrepareRTIndirectDiffuseUpscaleParameters(HDC rtidUpscaleParams.upscaleRadius = settings.upscaleRadius; // Grab the right kernel - rtidUpscaleParams.upscaleCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + rtidUpscaleParams.upscaleCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; rtidUpscaleParams.upscaleKernel = settings.fullResolution ? m_IndirectDiffuseUpscaleFullResKernel : m_IndirectDiffuseUpscaleHalfResKernel; // Grab the additional parameters BlueNoise blueNoise = GetBlueNoiseManager(); rtidUpscaleParams.blueNoiseTexture = blueNoise.textureArray16RGB; - rtidUpscaleParams.scramblingTexture = HDDefaultSettings.instance.renderPipelineResources.textures.scramblingTex; + rtidUpscaleParams.scramblingTexture = HDGlobalSettings.instance.renderPipelineResources.textures.scramblingTex; return rtidUpscaleParams; } @@ -274,7 +274,7 @@ AdjustRTIDWeightParameters PrepareAdjustRTIDWeightParametersParameters(HDCamera parameters.viewCount = hdCamera.viewCount; // Grab the right kernel - parameters.adjustWeightCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + parameters.adjustWeightCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; parameters.adjustWeightKernel = m_AdjustIndirectDiffuseWeightKernel; return parameters; @@ -341,7 +341,7 @@ QualityRTIndirectDiffuseParameters PrepareQualityRTIndirectDiffuseParameters(HDC qrtidParams.bounceCount = settings.bounceCount.value; // Grab the additional parameters - qrtidParams.indirectDiffuseRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingRT; + qrtidParams.indirectDiffuseRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingRT; qrtidParams.accelerationStructure = RequestAccelerationStructure(); qrtidParams.lightCluster = RequestLightCluster(); qrtidParams.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs index fd3bb4f71eb..d1503481850 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs @@ -81,7 +81,7 @@ public void Initialize(HDRenderPipeline renderPipeline) { // Keep track of the external buffers m_RenderPipelineResources = renderPipeline.asset.renderPipelineResources; - m_RenderPipelineRayTracingResources = HDDefaultSettings.instance.renderPipelineRayTracingResources; + m_RenderPipelineRayTracingResources = HDGlobalSettings.instance.renderPipelineRayTracingResources; // Keep track of the render pipeline m_RenderPipeline = renderPipeline; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs index f08dbb75e25..cd029a690b0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs @@ -87,7 +87,7 @@ internal void InitRayTracingManager() { // Init the ray count manager m_RayCountManager = new RayCountManager(); - m_RayCountManager.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); + m_RayCountManager.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); // Build the light cluster m_RayTracingLightCluster = new HDRaytracingLightCluster(); @@ -651,7 +651,7 @@ internal HDTemporalFilter GetTemporalFilter() if (m_TemporalFilter == null) { m_TemporalFilter = new HDTemporalFilter(); - m_TemporalFilter.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); + m_TemporalFilter.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); } return m_TemporalFilter; } @@ -661,7 +661,7 @@ internal HDSimpleDenoiser GetSimpleDenoiser() if (m_SimpleDenoiser == null) { m_SimpleDenoiser = new HDSimpleDenoiser(); - m_SimpleDenoiser.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); + m_SimpleDenoiser.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); } return m_SimpleDenoiser; } @@ -671,7 +671,7 @@ internal SSGIDenoiser GetSSGIDenoiser() if (m_SSGIDenoiser == null) { m_SSGIDenoiser = new SSGIDenoiser(); - m_SSGIDenoiser.Init(HDDefaultSettings.instance.renderPipelineResources); + m_SSGIDenoiser.Init(HDGlobalSettings.instance.renderPipelineResources); } return m_SSGIDenoiser; } @@ -681,7 +681,7 @@ internal HDDiffuseDenoiser GetDiffuseDenoiser() if (m_DiffuseDenoiser == null) { m_DiffuseDenoiser = new HDDiffuseDenoiser(); - m_DiffuseDenoiser.Init(HDDefaultSettings.instance.renderPipelineResources, HDDefaultSettings.instance.renderPipelineRayTracingResources, this); + m_DiffuseDenoiser.Init(HDGlobalSettings.instance.renderPipelineResources, HDGlobalSettings.instance.renderPipelineRayTracingResources, this); } return m_DiffuseDenoiser; } @@ -691,7 +691,7 @@ internal HDReflectionDenoiser GetReflectionDenoiser() if (m_ReflectionDenoiser == null) { m_ReflectionDenoiser = new HDReflectionDenoiser(); - m_ReflectionDenoiser.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); + m_ReflectionDenoiser.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); } return m_ReflectionDenoiser; } @@ -701,7 +701,7 @@ internal HDDiffuseShadowDenoiser GetDiffuseShadowDenoiser() if (m_DiffuseShadowDenoiser == null) { m_DiffuseShadowDenoiser = new HDDiffuseShadowDenoiser(); - m_DiffuseShadowDenoiser.Init(HDDefaultSettings.instance.renderPipelineRayTracingResources); + m_DiffuseShadowDenoiser.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); } return m_DiffuseShadowDenoiser; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs index 305919972ae..b6248f63f31 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs @@ -72,7 +72,7 @@ RecursiveRendererParameters PrepareRecursiveRendererParameters(HDCamera hdCamera // Other data rrParams.accelerationStructure = RequestAccelerationStructure(); rrParams.lightCluster = RequestLightCluster(); - rrParams.recursiveRenderingRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.forwardRaytracing; + rrParams.recursiveRenderingRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.forwardRaytracing; rrParams.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); rrParams.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; BlueNoise blueNoise = GetBlueNoiseManager(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs index c6994993d4e..6400b67236a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingReflection.cs @@ -22,8 +22,8 @@ public partial class HDRenderPipeline void InitRayTracedReflections() { - ComputeShader reflectionShaderCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; - ComputeShader reflectionBilateralFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + ComputeShader reflectionShaderCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; + ComputeShader reflectionBilateralFilterCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; // Grab all the kernels we shall be using m_RaytracingReflectionsFullResKernel = reflectionShaderCS.FindKernel("RaytracingReflectionsFullRes"); @@ -85,7 +85,7 @@ RTReflectionDirGenParameters PrepareRTReflectionDirGenParameters(HDCamera hdCame rtrDirGenParams.minSmoothness = settings.minSmoothness; // Grab the right kernel - rtrDirGenParams.directionGenCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; + rtrDirGenParams.directionGenCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; if (settings.fullResolution) rtrDirGenParams.dirGenKernel = transparent ? m_RaytracingReflectionsTransparentFullResKernel : m_RaytracingReflectionsFullResKernel; else @@ -174,9 +174,9 @@ DeferredLightingRTParameters PrepareReflectionDeferredLightingRTParameters(HDCam deferredParameters.lightCluster = RequestLightCluster(); // Shaders - deferredParameters.gBufferRaytracingRT = HDDefaultSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; - deferredParameters.deferredRaytracingCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; - deferredParameters.rayBinningCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.rayBinningCS; + deferredParameters.gBufferRaytracingRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; + deferredParameters.deferredRaytracingCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + deferredParameters.rayBinningCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.rayBinningCS; // XRTODO: add ray binning support for single-pass if (deferredParameters.viewCount > 1 && deferredParameters.rayBinning) @@ -229,7 +229,7 @@ RTRAdjustWeightParameters PrepareRTRAdjustWeightParameters(HDCamera hdCamera, Sc parameters.smoothnessFadeStart = settings.smoothnessFadeStart; // Other parameters - parameters.reflectionFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + parameters.reflectionFilterCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; parameters.adjustWeightKernel = settings.fullResolution ? m_ReflectionAdjustWeightKernel : m_ReflectionRescaleAndAdjustWeightKernel; parameters.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; return parameters; @@ -294,7 +294,7 @@ RTRUpscaleParameters PrepareRTRUpscaleParameters(HDCamera hdCamera, ScreenSpaceR parameters.viewCount = hdCamera.viewCount; // Other parameters - parameters.reflectionFilterCS = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + parameters.reflectionFilterCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; parameters.upscaleKernel = m_ReflectionUpscaleKernel; return parameters; } @@ -376,7 +376,7 @@ RTRQualityRenderingParameters PrepareRTRQualityRenderingParameters(HDCamera hdCa rtrQualityRenderingParameters.ditheredTextureSet = blueNoise.DitheredTextureSet8SPP(); rtrQualityRenderingParameters.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; rtrQualityRenderingParameters.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); - rtrQualityRenderingParameters.reflectionShader = HDDefaultSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingRT; + rtrQualityRenderingParameters.reflectionShader = HDGlobalSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingRT; return rtrQualityRenderingParameters; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs index ecff0cc02c6..a2c5cff7f19 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs @@ -845,7 +845,7 @@ internal static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSet ref aggregatedFrameSettings, camera, additionalData, - ref HDDefaultSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera + ref HDGlobalSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera hdrpAsset.currentPlatformRenderPipelineSettings ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs index 7be579aa912..4928e6f33ff 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs @@ -62,7 +62,7 @@ string IFrameSettingsHistoryContainer.panelName => "Scene Camera"; public MinimalHistoryContainer() - => m_FrameSettingsHistory.debug = HDDefaultSettings.instance?.GetDefaultFrameSettings(FrameSettingsRenderType.Camera) ?? FrameSettings.NewDefaultCamera(); + => m_FrameSettingsHistory.debug = HDGlobalSettings.instance?.GetDefaultFrameSettings(FrameSettingsRenderType.Camera) ?? FrameSettings.NewDefaultCamera(); Action IDebugData.GetReset() //caution: we actually need to retrieve the @@ -128,7 +128,7 @@ public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSetti camera.cameraType == CameraType.SceneView ? sceneViewFrameSettingsContainer : #endif additionalData, - ref HDDefaultSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera + ref HDGlobalSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera hdrpAsset.currentPlatformRenderPipelineSettings ); @@ -195,7 +195,7 @@ static DebugUI.HistoryBoolField GenerateHistoryBoolField(IFrameSettingsHistoryCo { () => frameSettingsContainer.frameSettingsHistory.sanitazed.IsEnabled(field), () => frameSettingsContainer.frameSettingsHistory.overridden.IsEnabled(field), - () => HDDefaultSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) + () => HDGlobalSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) } }; } @@ -226,7 +226,7 @@ static DebugUI.HistoryEnumField GenerateHistoryEnumField(IFrameSettingsHistoryCo { () => frameSettingsContainer.frameSettingsHistory.sanitazed.IsEnabled(field) ? 1 : 0, () => frameSettingsContainer.frameSettingsHistory.overridden.IsEnabled(field) ? 1 : 0, - () => HDDefaultSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) ? 1 : 0 + () => HDGlobalSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) ? 1 : 0 } }; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs index d04d75639b4..b9833793a46 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs @@ -179,50 +179,50 @@ public PlanarReflectionAtlasResolutionScalableSetting(PlanarReflectionAtlasResol /// Name for light layer 0. public string lightLayerName0 { - get { return HDDefaultSettings.instance.lightLayerName0; } - set { HDDefaultSettings.instance.lightLayerName0 = value; } + get { return HDGlobalSettings.instance.lightLayerName0; } + set { HDGlobalSettings.instance.lightLayerName0 = value; } } /// Name for light layer 1. public string lightLayerName1 { - get { return HDDefaultSettings.instance.lightLayerName1; } - set { HDDefaultSettings.instance.lightLayerName1 = value; } + get { return HDGlobalSettings.instance.lightLayerName1; } + set { HDGlobalSettings.instance.lightLayerName1 = value; } } /// Name for light layer 2. public string lightLayerName2 { - get { return HDDefaultSettings.instance.lightLayerName2; } - set { HDDefaultSettings.instance.lightLayerName2 = value; } + get { return HDGlobalSettings.instance.lightLayerName2; } + set { HDGlobalSettings.instance.lightLayerName2 = value; } } /// Name for light layer 3. public string lightLayerName3 { - get { return HDDefaultSettings.instance.lightLayerName3; } - set { HDDefaultSettings.instance.lightLayerName3 = value; } + get { return HDGlobalSettings.instance.lightLayerName3; } + set { HDGlobalSettings.instance.lightLayerName3 = value; } } /// Name for light layer 4. public string lightLayerName4 { - get { return HDDefaultSettings.instance.lightLayerName4; } - set { HDDefaultSettings.instance.lightLayerName4 = value; } + get { return HDGlobalSettings.instance.lightLayerName4; } + set { HDGlobalSettings.instance.lightLayerName4 = value; } } /// Name for light layer 5. public string lightLayerName5 { - get { return HDDefaultSettings.instance.lightLayerName5; } - set { HDDefaultSettings.instance.lightLayerName5 = value; } + get { return HDGlobalSettings.instance.lightLayerName5; } + set { HDGlobalSettings.instance.lightLayerName5 = value; } } /// Name for light layer 6. public string lightLayerName6 { - get { return HDDefaultSettings.instance.lightLayerName6; } - set { HDDefaultSettings.instance.lightLayerName6 = value; } + get { return HDGlobalSettings.instance.lightLayerName6; } + set { HDGlobalSettings.instance.lightLayerName6 = value; } } /// Name for light layer 7. public string lightLayerName7 { - get { return HDDefaultSettings.instance.lightLayerName7; } - set { HDDefaultSettings.instance.lightLayerName7 = value; } + get { return HDGlobalSettings.instance.lightLayerName7; } + set { HDGlobalSettings.instance.lightLayerName7 = value; } } /// Support distortion. public bool supportDistortion; @@ -250,50 +250,50 @@ public string lightLayerName7 /// Name for decal layer 0. public string decalLayerName0 { - get { return HDDefaultSettings.instance.decalLayerName0; } - set { HDDefaultSettings.instance.decalLayerName0 = value; } + get { return HDGlobalSettings.instance.decalLayerName0; } + set { HDGlobalSettings.instance.decalLayerName0 = value; } } /// Name for decal layer 1. public string decalLayerName1 { - get { return HDDefaultSettings.instance.decalLayerName1; } - set { HDDefaultSettings.instance.decalLayerName1 = value; } + get { return HDGlobalSettings.instance.decalLayerName1; } + set { HDGlobalSettings.instance.decalLayerName1 = value; } } /// Name for decal layer 2. public string decalLayerName2 { - get { return HDDefaultSettings.instance.decalLayerName2; } - set { HDDefaultSettings.instance.decalLayerName2 = value; } + get { return HDGlobalSettings.instance.decalLayerName2; } + set { HDGlobalSettings.instance.decalLayerName2 = value; } } /// Name for decal layer 3. public string decalLayerName3 { - get { return HDDefaultSettings.instance.decalLayerName3; } - set { HDDefaultSettings.instance.decalLayerName3 = value; } + get { return HDGlobalSettings.instance.decalLayerName3; } + set { HDGlobalSettings.instance.decalLayerName3 = value; } } /// Name for decal layer 4. public string decalLayerName4 { - get { return HDDefaultSettings.instance.decalLayerName4; } - set { HDDefaultSettings.instance.decalLayerName4 = value; } + get { return HDGlobalSettings.instance.decalLayerName4; } + set { HDGlobalSettings.instance.decalLayerName4 = value; } } /// Name for decal layer 5. public string decalLayerName5 { - get { return HDDefaultSettings.instance.decalLayerName5; } - set { HDDefaultSettings.instance.decalLayerName5 = value; } + get { return HDGlobalSettings.instance.decalLayerName5; } + set { HDGlobalSettings.instance.decalLayerName5 = value; } } /// Name for decal layer 6. public string decalLayerName6 { - get { return HDDefaultSettings.instance.decalLayerName6; } - set { HDDefaultSettings.instance.decalLayerName6 = value; } + get { return HDGlobalSettings.instance.decalLayerName6; } + set { HDGlobalSettings.instance.decalLayerName6 = value; } } /// Name for decal layer 7. public string decalLayerName7 { - get { return HDDefaultSettings.instance.decalLayerName7; } - set { HDDefaultSettings.instance.decalLayerName7 = value; } + get { return HDGlobalSettings.instance.decalLayerName7; } + set { HDGlobalSettings.instance.decalLayerName7 = value; } } /// Number of samples when using MSAA. @@ -355,38 +355,38 @@ public string decalLayerName7 [Obsolete("For data migration")] internal bool m_ObsoleteincreaseSssSampleCount; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName0; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName1; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName2; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName3; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName4; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName5; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName6; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName7; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName0; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName1; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName2; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName3; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName4; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName5; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName6; - [Obsolete("Moved to HDDefault Settings")] + [Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName7; #pragma warning restore 618 } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs index 5e41c7e4d56..584dcdfee9d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs @@ -152,7 +152,7 @@ public Texture3DAtlas(GraphicsFormat format, int maxElementSize, int maxElementC m_Elements.Add(elem); } - m_Texture3DAtlasCompute = HDDefaultSettings.instance.renderPipelineResources.shaders.texture3DAtlasCS; + m_Texture3DAtlasCompute = HDGlobalSettings.instance.renderPipelineResources.shaders.texture3DAtlasCS; m_CopyKernel = m_Texture3DAtlasCompute.FindKernel("Copy"); m_GenerateMipKernel = m_Texture3DAtlasCompute.FindKernel("GenerateMipMap"); m_Texture3DAtlasCompute.GetKernelThreadGroupSizes(m_CopyKernel, out var groupThreadX, out var groupThreadY, out var groupThreadZ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs index dd84d229b4a..33152822793 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs @@ -331,7 +331,7 @@ public override int GetHashCode() /// static void Init() { - var asset = HDDefaultSettings.instance; + var asset = HDGlobalSettings.instance; if (asset != null) CloudMap.s_DefaultTexture = asset.renderPipelineResources?.textures.defaultCloudMap; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs index 6689621e521..ac6fbb15da5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs @@ -189,7 +189,7 @@ private int InitComponentFromProfile(T component, T componentFromProfile, Typ var newParameters = component.parameters; var profileParameters = componentFromProfile.parameters; - var defaultVolume = HDDefaultSettings.instance.GetOrCreateDefaultVolume(); + var defaultVolume = HDGlobalSettings.instance.GetOrCreateDefaultVolume(); T defaultComponent = null; if (defaultVolume.sharedProfile != null) // This can happen with old projects. defaultVolume.sharedProfile.TryGet(type, out defaultComponent); From 87f9927dc59500e84bd75dcf13121fde10467c03 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 16 Feb 2021 14:49:23 +0100 Subject: [PATCH 12/58] Renamed from HDGlobalSettings to HDRenderPipelineGlobalSettings --- .../CHANGELOG.md | 2 +- .../BuildProcessors/HDRPPreprocessShaders.cs | 12 +-- .../DiffusionProfileMaterialUI.cs | 2 +- .../CustomPostProcessingVolume.template | 2 +- .../Editor/RenderPipeline/HDAssetFactory.cs | 20 ++--- .../RenderPipeline/HDDefaultSettingsEditor.cs | 10 +-- .../Editor/RenderPipeline/HDEditorUtils.cs | 8 +- .../Settings/DefaultSettingsPanel.cs | 50 ++++++------- .../Settings/EditorDefaultSettings.cs | 6 +- .../Settings/FrameSettingsUI.Drawers.cs | 4 +- .../Settings/SerializedFrameSettings.cs | 26 +++---- ...rializedHDRenderPipelineGlobalSettings.cs} | 50 ++++++------- ...izedHDRenderPipelineGlobalSettings.cs.meta | 11 +++ .../Editor/Wizard/HDWizard.Configuration.cs | 69 +++++------------- .../Editor/Wizard/HDWizard.Window.cs | 8 +- .../Runtime/Compositor/CompositionManager.cs | 40 ++++------ .../Runtime/Debug/LightingDebug.cs | 4 +- .../Shadow/ScreenSpaceShadowManager.cs | 8 +- .../Runtime/Material/Decal/DecalProjector.cs | 2 +- .../PostProcessSystem.RenderGraph.cs | 8 +- .../HDRenderPipeline.LightLoop.cs | 2 +- .../HDRenderPipeline.LookDev.cs | 2 +- .../RenderPipeline/HDRenderPipeline.cs | 14 ++-- .../HDRenderPipelineAsset.Migration.cs | 10 +-- .../RenderPipeline/HDRenderPipelineAsset.cs | 44 +++++------ ...RenderPipelineGlobalSettings.Migration.cs} | 2 +- ...erPipelineGlobalSettings.Migration.cs.meta | 11 +++ ...s.cs => HDRenderPipelineGlobalSettings.cs} | 73 ++++++++++--------- .../HDRenderPipelineGlobalSettings.cs.meta | 11 +++ .../RenderPipeline/PathTracing/PathTracing.cs | 4 +- .../Raytracing/HDRaytracingIndirectDiffuse.cs | 18 ++--- .../Raytracing/HDRaytracingLightCluster.cs | 2 +- .../Raytracing/HDRaytracingManager.cs | 14 ++-- .../HDRaytracingRecursiveRenderer.cs | 2 +- ...nderPipeline.RaytracingAmbientOcclusion.cs | 6 +- .../HDRenderPipeline.RaytracingReflection.cs | 18 ++--- ...Pipeline.RaytracingSubsurfaceScattering.cs | 12 +-- .../RenderPipeline/Settings/FrameSettings.cs | 2 +- .../Settings/FrameSettingsHistory.cs | 8 +- .../Settings/RenderPipelineSettings.cs | 64 ++++++++-------- .../RenderPipeline/Utility/Texture3DAtlas.cs | 2 +- .../Sky/CloudSystem/CloudLayer/CloudLayer.cs | 2 +- .../Runtime/Sky/StaticLightingSky.cs | 2 +- 43 files changed, 331 insertions(+), 336 deletions(-) rename com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/{SerializedHDGlobalSettings.cs => SerializedHDRenderPipelineGlobalSettings.cs} (78%) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs.meta rename com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/{HDGlobalSettings.Migration.cs => HDRenderPipelineGlobalSettings.Migration.cs} (76%) create mode 100644 com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs.meta rename com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/{HDGlobalSettings.cs => HDRenderPipelineGlobalSettings.cs} (90%) create mode 100644 com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs.meta diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 5b1cbf35bee..9b78857d7a4 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -37,7 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Added new AOV APIs for overriding the internal rendering format, and for outputing the world space position. -- HDRP Global Settings are now saved into their own asset (HDGlobalSettings) and HDRenderPipeline's default asset refers to this new asset. +- HDRP Global Settings are now saved into their own asset (HDRenderPipelineGlobalSettings) and HDRenderPipeline's default asset refers to this new asset. ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index 9c6ed1b2d62..511cf828fb7 100644 --- a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -318,7 +318,7 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis return; var exportLog = ShaderBuildPreprocessor.hdrpAssets.Count > 0 - && (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + && (HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); Stopwatch shaderStripingWatch = new Stopwatch(); shaderStripingWatch.Start(); @@ -363,13 +363,13 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis inputData.RemoveAt(i); } - if (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + if (HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { foreach (var hdAsset in hdPipelineAssets) { m_TotalVariantsInputCount += preStrippingCount; m_TotalVariantsOutputCount += (uint)inputData.Count; - LogShaderVariants(shader, kernelName, HDGlobalSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + LogShaderVariants(shader, kernelName, HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); } } } @@ -473,7 +473,7 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList 0 - && (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + && (HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); Stopwatch shaderStripingWatch = new Stopwatch(); shaderStripingWatch.Start(); @@ -534,13 +534,13 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList= inputShaderVariantCount; --i) inputData.RemoveAt(i); - if (HDGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + if (HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { foreach (var hdAsset in hdPipelineAssets) { m_TotalVariantsInputCount += preStrippingCount; m_TotalVariantsOutputCount += (uint)inputData.Count; - LogShaderVariants(shader, snippet, HDGlobalSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + LogShaderVariants(shader, snippet, HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/DiffusionProfile/DiffusionProfileMaterialUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/DiffusionProfile/DiffusionProfileMaterialUI.cs index 0afea6a1e6d..bf56b3fa28a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/DiffusionProfile/DiffusionProfileMaterialUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/DiffusionProfile/DiffusionProfileMaterialUI.cs @@ -8,7 +8,7 @@ namespace UnityEditor.Rendering.HighDefinition { static class DiffusionProfileMaterialUI { - static GUIContent diffusionProfileNotInHDRPAsset = new GUIContent("Make sure this Diffusion Profile is referenced in either a Diffusion Profile Override or the HDRP Default Settings. If the Diffusion Profile is not referenced in either, HDRP cannot use it. To add a reference to the Diffusion Profile in the HDRP Default Settings, press Fix.", EditorGUIUtility.IconContent("console.infoicon").image); + static GUIContent diffusionProfileNotInHDRPAsset = new GUIContent("Make sure this Diffusion Profile is referenced in either a Diffusion Profile Override or the HDRP Global Settings. If the Diffusion Profile is not referenced in either, HDRP cannot use it. To add a reference to the Diffusion Profile in the HDRP Global Settings, press Fix.", EditorGUIUtility.IconContent("console.infoicon").image); public static bool IsSupported(MaterialEditor materialEditor) { diff --git a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingVolume.template b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingVolume.template index 33257d4e364..10de1aebf56 100644 --- a/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingVolume.template +++ b/com.unity.render-pipelines.high-definition/Editor/PostProcessing/Templates/CustomPostProcessingVolume.template @@ -13,7 +13,7 @@ public sealed class #SCRIPTNAME# : CustomPostProcessVolumeComponent, IPostProces public bool IsActive() => m_Material != null && intensity.value > 0f; - // Do not forget to add this post process in the Custom Post Process Orders list (Project Settings > HDRP Default Settings). + // Do not forget to add this post process in the Custom Post Process Orders list (Project Settings > Graphics > HDRP Settings). public override CustomPostProcessInjectionPoint injectionPoint => CustomPostProcessInjectionPoint.AfterPostProcess; const string kShaderName = "Hidden/Shader/#SCRIPTNAME#"; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index 454d78a9a70..49445193191 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -22,7 +22,7 @@ public override void Action(int instanceId, string pathName, string resourceFile newAsset.name = Path.GetFileName(pathName); // Load default renderPipelineResources / Material / Shader newAsset.renderPipelineResources = AssetDatabase.LoadAssetAtPath(s_RenderPipelineResourcesPath); - HDGlobalSettings.instance.GetOrCreateDefaultVolumeProfile(); + HDRenderPipelineGlobalSettings.instance.GetOrCreateDefaultVolumeProfile(); //as we must init the editor resources with lazy init, it is not required here @@ -111,30 +111,30 @@ static void CreateRenderPipelineEditorResources() ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDRenderPipelineEditorResources.asset", icon, null); } - internal class HDGlobalSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction + internal class HDRenderPipelineGlobalSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction { public override void Action(int instanceId, string pathName, string resourceFile) { - var newAsset = HDGlobalSettings.Create(pathName, settings); - HDGlobalSettings.UpdateGraphicsSettings(newAsset); + var newAsset = HDRenderPipelineGlobalSettings.Create(pathName, settings); + HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(newAsset); ProjectWindowUtil.ShowCreatedAsset(newAsset); } - static HDGlobalSettings settings; - public static void Clone(HDGlobalSettings src) + static HDRenderPipelineGlobalSettings settings; + public static void Clone(HDRenderPipelineGlobalSettings src) { settings = src; var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - var assetCreator = ScriptableObject.CreateInstance(); + var assetCreator = ScriptableObject.CreateInstance(); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); } } - [MenuItem("Assets/Create/Rendering/High Definition Default Settings Asset", priority = CoreUtils.assetCreateMenuPriority2)] - internal static void CreateHDGlobalSettings() + [MenuItem("Assets/Create/Rendering/HDRP Global Settings Asset", priority = CoreUtils.Sections.section1 + CoreUtils.Priorities.assetsCreateRenderingMenuPriority + 1)] + internal static void CreateHDRenderPipelineGlobalSettings() { var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDGlobalSettings.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDRenderPipelineGlobalSettings.asset", icon, null); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs index 66c6d2b106a..b8f23b2e96f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDDefaultSettingsEditor.cs @@ -3,22 +3,22 @@ namespace UnityEditor.Rendering.HighDefinition { - [CustomEditor(typeof(HDGlobalSettings))] + [CustomEditor(typeof(HDRenderPipelineGlobalSettings))] [CanEditMultipleObjects] - sealed class HDGlobalSettingsEditor : Editor + sealed class HDRenderPipelineGlobalSettingsEditor : Editor { - SerializedHDGlobalSettings m_SerializedHDGlobalSettings; + SerializedHDRenderPipelineGlobalSettings m_SerializedHDRenderPipelineGlobalSettings; internal bool largeLabelWidth = true; void OnEnable() { - m_SerializedHDGlobalSettings = new SerializedHDGlobalSettings(serializedObject); + m_SerializedHDRenderPipelineGlobalSettings = new SerializedHDRenderPipelineGlobalSettings(serializedObject); } public override void OnInspectorGUI() { - var serialized = m_SerializedHDGlobalSettings; + var serialized = m_SerializedHDRenderPipelineGlobalSettings; serialized.serializedObject.Update(); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs index 19b4318bbfd..16afcb45513 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs @@ -228,13 +228,13 @@ internal static void DrawLightLayerMask_Internal(Rect rect, GUIContent label, Se internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, SerializedProperty property) { - if (HDGlobalSettings.instance == null) + if (HDRenderPipelineGlobalSettings.instance == null) return; EditorGUI.BeginProperty(rect, label, property); EditorGUI.BeginChangeCheck(); - int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDGlobalSettings.instance.decalLayerNames); + int changedValue = EditorGUI.MaskField(rect, label ?? GUIContent.none, property.intValue, HDRenderPipelineGlobalSettings.instance.decalLayerNames); if (EditorGUI.EndChangeCheck()) property.intValue = changedValue; @@ -247,11 +247,11 @@ internal static void DrawDecalLayerMask_Internal(Rect rect, GUIContent label, Se internal static int DrawLightLayerMask(Rect rect, int value, GUIContent label = null) { int lightLayer = HDAdditionalLightData.RenderingLayerMaskToLightLayer(value); - if (HDGlobalSettings.instance == null) + if (HDRenderPipelineGlobalSettings.instance == null) return lightLayer; EditorGUI.BeginChangeCheck(); - lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDGlobalSettings.instance.lightLayerNames); + lightLayer = EditorGUI.MaskField(rect, label ?? GUIContent.none, lightLayer, HDRenderPipelineGlobalSettings.instance.lightLayerNames); if (EditorGUI.EndChangeCheck()) lightLayer = HDAdditionalLightData.LightLayerToRenderingLayerMask(lightLayer, value); return lightLayer; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 906ef8a85bc..60ca493f40a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -9,7 +9,7 @@ namespace UnityEditor.Rendering.HighDefinition { - using CED = CoreEditorDrawer; + using CED = CoreEditorDrawer; class DefaultSettingsPanelProvider { @@ -89,7 +89,7 @@ public class Styles Vector2 m_ScrollViewPosition = Vector2.zero; public static readonly CED.IDrawer Inspector; - static bool m_verboseMode = false; + static bool m_verboseMode = true; static DefaultSettingsPanelIMGUI() { @@ -113,8 +113,8 @@ static DefaultSettingsPanelIMGUI() selectedFrameSettings = SelectedFrameSettings.Camera; } - SerializedHDGlobalSettings serializedSettings; - HDGlobalSettings settingsSerialized; + SerializedHDRenderPipelineGlobalSettings serializedSettings; + HDRenderPipelineGlobalSettings settingsSerialized; DiffusionProfileSettingsListUI m_DiffusionProfileUI; public void DoGUI(string searchContext) { @@ -123,11 +123,11 @@ public void DoGUI(string searchContext) EditorGUILayout.HelpBox("No HDRP pipeline currently active (see Quality Settings active level).", MessageType.Warning); } - if ((serializedSettings == null) || (settingsSerialized != HDGlobalSettings.instance)) + if ((serializedSettings == null) || (settingsSerialized != HDRenderPipelineGlobalSettings.instance)) { - settingsSerialized = HDGlobalSettings.Ensure(); + settingsSerialized = HDRenderPipelineGlobalSettings.Ensure(); var serializedObject = new SerializedObject(settingsSerialized); - serializedSettings = new SerializedHDGlobalSettings(serializedObject); + serializedSettings = new SerializedHDRenderPipelineGlobalSettings(serializedObject); } else { @@ -154,8 +154,8 @@ public void OnActivate(string searchContext, VisualElement rootElement) m_ScrollViewPosition = Vector2.zero; } - #region Global HDGlobalSettings asset selection - void Draw_AssetSelection(ref SerializedHDGlobalSettings serialized, Editor owner) + #region Global HDRenderPipelineGlobalSettings asset selection + void Draw_AssetSelection(ref SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { var oldWidth = EditorGUIUtility.labelWidth; EditorGUIUtility.labelWidth = Styles.labelWidth; @@ -170,29 +170,29 @@ void Draw_AssetSelection(ref SerializedHDGlobalSettings serialized, Editor owner using (new EditorGUILayout.HorizontalScope()) { EditorGUI.BeginChangeCheck(); - var newAsset = (HDGlobalSettings)EditorGUILayout.ObjectField(settingsSerialized , typeof(HDGlobalSettings), false); + var newAsset = (HDRenderPipelineGlobalSettings)EditorGUILayout.ObjectField(settingsSerialized , typeof(HDRenderPipelineGlobalSettings), false); if (EditorGUI.EndChangeCheck()) { - HDGlobalSettings.UpdateGraphicsSettings(newAsset); + HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(newAsset); EditorUtility.SetDirty(settingsSerialized); } if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a HD Global Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - HDAssetFactory.CreateHDGlobalSettings(); + HDAssetFactory.CreateHDRenderPipelineGlobalSettings(); } bool guiEnabled = GUI.enabled; GUI.enabled = guiEnabled && (settingsSerialized != null); if (GUILayout.Button(EditorGUIUtility.TrTextContent("Clone", "Clone a HD Global Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - HDAssetFactory.HDGlobalSettingsCreator.Clone(settingsSerialized); + HDAssetFactory.HDRenderPipelineGlobalSettingsCreator.Clone(settingsSerialized); } GUI.enabled = guiEnabled; } EditorGUIUtility.labelWidth = oldWidth; } - #endregion // Global HDGlobalSettings asset selection + #endregion // Global HDRenderPipelineGlobalSettings asset selection #region Resources @@ -200,7 +200,7 @@ void Draw_AssetSelection(ref SerializedHDGlobalSettings serialized, Editor owner CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.resourceLabel, Styles.sectionHeaderStyle)), CED.Group(Drawer_ResourcesSection) ); - static void Drawer_ResourcesSection(SerializedHDGlobalSettings serialized, Editor owner) + static void Drawer_ResourcesSection(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { if (m_verboseMode) EditorGUILayout.LabelField(Styles.resourceIntroLabel, Styles.introStyle); @@ -267,7 +267,7 @@ public enum SelectedFrameSettings ); - static void Drawer_TitleDefaultFrameSettings(SerializedHDGlobalSettings serialized, Editor owner) + static void Drawer_TitleDefaultFrameSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { EditorGUILayout.LabelField(Styles.frameSettingsLabel, Styles.sectionHeaderStyle); @@ -291,9 +291,9 @@ enum Expandable RealtimeProbeFrameSettings = 1 << 2, //obsolete } - static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings, "HDRP"); + static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings, "HDRP"); - static public void ApplyChangedDisplayedFrameSettings(SerializedHDGlobalSettings serialized, Editor owner) + static public void ApplyChangedDisplayedFrameSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings | Expandable.BakedOrCustomProbeFrameSettings | Expandable.RealtimeProbeFrameSettings, false); switch (selectedFrameSettings) @@ -318,7 +318,7 @@ static public void ApplyChangedDisplayedFrameSettings(SerializedHDGlobalSettings CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.customPostProcessOrderLabel, Styles.sectionHeaderStyle)), CED.Group(Drawer_CustomPostProcess) ); - static void Drawer_CustomPostProcess(SerializedHDGlobalSettings serialized, Editor owner) + static void Drawer_CustomPostProcess(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { if (m_verboseMode) EditorGUILayout.LabelField(Styles.customPostProcessIntroLabel, Styles.introStyle); @@ -343,7 +343,7 @@ static void Drawer_CustomPostProcess(SerializedHDGlobalSettings serialized, Edit CED.Group(Drawer_VolumeSection) ); - static void Drawer_VolumeSection(SerializedHDGlobalSettings serialized, Editor owner) + static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { if (m_verboseMode) EditorGUILayout.LabelField(Styles.volumeComponentsIntroLabel, Styles.introStyle); @@ -352,7 +352,7 @@ static void Drawer_VolumeSection(SerializedHDGlobalSettings serialized, Editor o var oldWidth = EditorGUIUtility.labelWidth; EditorGUIUtility.labelWidth = Styles.labelWidth; - HDGlobalSettings globalSettings = serialized.serializedObject.targetObject as HDGlobalSettings; + HDRenderPipelineGlobalSettings globalSettings = serialized.serializedObject.targetObject as HDRenderPipelineGlobalSettings; VolumeProfile asset = null; using (new EditorGUILayout.HorizontalScope()) { @@ -440,7 +440,7 @@ static void Drawer_VolumeSection(SerializedHDGlobalSettings serialized, Editor o static private bool m_ShowLightLayerNames = false; static private bool m_ShowDecalLayerNames = false; - static void Drawer_LightLayerNames(SerializedHDGlobalSettings serialized, Editor owner) + static void Drawer_LightLayerNames(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { m_ShowLightLayerNames = EditorGUILayout.Foldout(m_ShowLightLayerNames, Styles.lightLayersLabel, true); if (m_ShowLightLayerNames) @@ -459,7 +459,7 @@ static void Drawer_LightLayerNames(SerializedHDGlobalSettings serialized, Editor } } - static void Drawer_DecalLayerNames(SerializedHDGlobalSettings serialized, Editor owner) + static void Drawer_DecalLayerNames(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { m_ShowDecalLayerNames = EditorGUILayout.Foldout(m_ShowDecalLayerNames, Styles.decalLayersLabel, true); if (m_ShowDecalLayerNames) @@ -529,8 +529,8 @@ static string GetDefaultName(Kind kind) return defaultName; } - static HDGlobalSettings settings; - public static void CreateAndAssign(Kind kind, HDGlobalSettings globalSettings) + static HDRenderPipelineGlobalSettings settings; + public static void CreateAndAssign(Kind kind, HDRenderPipelineGlobalSettings globalSettings) { settings = globalSettings; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs index 3cea99ebfc3..9fc310cc1f4 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/EditorDefaultSettings.cs @@ -4,14 +4,14 @@ namespace UnityEditor.Rendering.HighDefinition { - [Obsolete("Please use HDGlobalSettings.instance.* instead.", false)] + [Obsolete("Please use HDRenderPipelineGlobalSettings.instance.* instead.", false)] static class EditorDefaultSettings { /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignDefaultVolumeProfile() { - return HDGlobalSettings.instance.GetOrCreateDefaultVolumeProfile(); + return HDRenderPipelineGlobalSettings.instance.GetOrCreateDefaultVolumeProfile(); } /// Get the current default VolumeProfile asset. If it is missing, the builtin one is assigned to the current settings. @@ -34,7 +34,7 @@ internal static VolumeProfile GetOrAssignLookDevVolumeProfile() /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal static VolumeProfile GetOrAssignLookDevVolumeProfile(HDRenderPipelineAsset hdrpAsset) { - return HDGlobalSettings.instance.GetOrAssignLookDevVolumeProfile(); + return HDRenderPipelineGlobalSettings.instance.GetOrAssignLookDevVolumeProfile(); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index 62d4d54e59a..d3d3f4e7cd0 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs @@ -140,8 +140,8 @@ static HDRenderPipelineAsset GetHDRPAssetFor(Editor owner) static FrameSettings GetDefaultFrameSettingsFor(Editor owner) { return owner is IDefaultFrameSettingsType getType - ? HDGlobalSettings.instance.GetDefaultFrameSettings(getType.GetFrameSettingsType()) - : HDGlobalSettings.instance.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + ? HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(getType.GetFrameSettingsType()) + : HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); } static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs index f3ec7c0fc3f..e9d90898db8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs @@ -61,22 +61,22 @@ ref FrameSettings GetData(Object obj) case HDProbe probe: return ref probe.frameSettings; default: + { + if (obj is HDRenderPipelineGlobalSettings globalSettings) { - if (obj is HDGlobalSettings globalSettings) + switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) { - switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) - { - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: - return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: - return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: - return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); - } + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: + return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: + return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); + case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: + return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); } - - break; } + + break; + } } throw new System.ArgumentException("Unknown kind of object"); } @@ -87,7 +87,7 @@ ref FrameSettings GetData(Object obj) return (obj as HDAdditionalCameraData).renderingPathCustomFrameSettingsOverrideMask; if (obj is HDProbe) return (obj as HDProbe).frameSettingsOverrideMask; - if (obj is HDGlobalSettings) + if (obj is HDRenderPipelineGlobalSettings) return null; throw new System.ArgumentException("Unknown kind of object"); } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs similarity index 78% rename from com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDGlobalSettings.cs rename to com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 087dbe84999..7c2190a49de 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -8,7 +8,7 @@ namespace UnityEditor.Rendering.HighDefinition { - class SerializedHDGlobalSettings + class SerializedHDRenderPipelineGlobalSettings { public SerializedObject serializedObject; @@ -52,7 +52,7 @@ public bool editorResourceHasMultipleDifferentValues var initialValue = firstEditorResources; for (int index = 1; index < serializedObject.targetObjects.Length; ++index) { - if (initialValue != (serializedObject.targetObjects[index] as HDGlobalSettings)?.renderPipelineEditorResources) + if (initialValue != (serializedObject.targetObjects[index] as HDRenderPipelineGlobalSettings)?.renderPipelineEditorResources) return true; } return false; @@ -60,9 +60,9 @@ public bool editorResourceHasMultipleDifferentValues } public HDRenderPipelineEditorResources firstEditorResources - => (serializedObject.targetObjects[0] as HDGlobalSettings)?.renderPipelineEditorResources; + => (serializedObject.targetObjects[0] as HDRenderPipelineGlobalSettings)?.renderPipelineEditorResources; - public SerializedHDGlobalSettings(SerializedObject serializedObject) + public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObject) { this.serializedObject = serializedObject; @@ -78,28 +78,28 @@ public SerializedHDGlobalSettings(SerializedObject serializedObject) volumeProfileDefault = serializedObject.FindProperty("m_VolumeProfileDefault"); volumeProfileLookDev = serializedObject.FindProperty("m_VolumeProfileLookDev"); - lightLayerName0 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName0); - lightLayerName1 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName1); - lightLayerName2 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName2); - lightLayerName3 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName3); - lightLayerName4 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName4); - lightLayerName5 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName5); - lightLayerName6 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName6); - lightLayerName7 = serializedObject.Find((HDGlobalSettings s) => s.lightLayerName7); - - decalLayerName0 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName0); - decalLayerName1 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName1); - decalLayerName2 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName2); - decalLayerName3 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName3); - decalLayerName4 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName4); - decalLayerName5 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName5); - decalLayerName6 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName6); - decalLayerName7 = serializedObject.Find((HDGlobalSettings s) => s.decalLayerName7); - - shaderVariantLogLevel = serializedObject.Find((HDGlobalSettings s) => s.shaderVariantLogLevel); + lightLayerName0 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName0); + lightLayerName1 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName1); + lightLayerName2 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName2); + lightLayerName3 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName3); + lightLayerName4 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName4); + lightLayerName5 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName5); + lightLayerName6 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName6); + lightLayerName7 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.lightLayerName7); + + decalLayerName0 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName0); + decalLayerName1 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName1); + decalLayerName2 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName2); + decalLayerName3 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName3); + decalLayerName4 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName4); + decalLayerName5 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName5); + decalLayerName6 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName6); + decalLayerName7 = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.decalLayerName7); + + shaderVariantLogLevel = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.shaderVariantLogLevel); lensAttenuation = serializedObject.FindProperty("m_LensAttenuation"); - diffusionProfileSettingsList = serializedObject.Find((HDGlobalSettings s) => s.diffusionProfileSettingsList); + diffusionProfileSettingsList = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.diffusionProfileSettingsList); } internal ReorderableList uiBeforeTransparentCustomPostProcesses; @@ -124,7 +124,7 @@ void InitializeCustomPostProcessesLists() ppVolumeTypeInjectionPoints[ppVolumeType] = comp.injectionPoint; CoreUtils.Destroy(comp); } - var globalSettings = serializedObject.targetObject as HDGlobalSettings; + var globalSettings = serializedObject.targetObject as HDRenderPipelineGlobalSettings; InitList(ref uiBeforeTransparentCustomPostProcesses, globalSettings.beforeTransparentCustomPostProcesses, "After Opaque And Sky", CustomPostProcessInjectionPoint.AfterOpaqueAndSky); InitList(ref uiBeforePostProcessCustomPostProcesses, globalSettings.beforePostProcessCustomPostProcesses, "Before Post Process", CustomPostProcessInjectionPoint.BeforePostProcess); InitList(ref uiAfterPostProcessCustomPostProcesses, globalSettings.afterPostProcessCustomPostProcesses, "After Post Process", CustomPostProcessInjectionPoint.AfterPostProcess); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs.meta new file mode 100644 index 00000000000..f9d098ac323 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4a04feb02f033a44b83e98286dd6eaa9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index 7c0baea328e..56e92d4691c 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -391,45 +391,23 @@ void FixHdrpAssetUsed(bool fromAsync) } bool IsHdrpAssetRuntimeResourcesCorrect() - => IsHdrpAssetUsedCorrect() - && HDRenderPipeline.defaultAsset.renderPipelineResources != null; + => IsHdrpAssetUsedCorrect() && HDRenderPipelineGlobalSettings.instance.AreResourcesCreated(); void FixHdrpAssetRuntimeResources(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; - - var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; - var objs = InternalEditorUtility.LoadSerializedFileAndForget(runtimeResourcesPath); - hdrpAsset.renderPipelineResources = objs != null && objs.Length > 0 ? objs.First() as RenderPipelineResources : null; - if (ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineResources, - HDUtils.GetHDRenderPipelinePath())) - { - InternalEditorUtility.SaveToSerializedFileAndForget( - new UnityEngine.Object[] { HDRenderPipeline.defaultAsset.renderPipelineResources }, - runtimeResourcesPath, - true); - } + HDRenderPipelineGlobalSettings.instance.EnsureResources(forceReload: true); } bool IsHdrpAssetEditorResourcesCorrect() - => IsHdrpAssetUsedCorrect() - && HDRenderPipeline.defaultAsset.renderPipelineEditorResources != null; + => IsHdrpAssetUsedCorrect() && HDRenderPipelineGlobalSettings.instance.AreEditorResourcesCreated(); void FixHdrpAssetEditorResources(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.defaultAsset; - if (hdrpAsset == null) - return; - - hdrpAsset.renderPipelineEditorResources - = AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"); - ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineEditorResources, HDUtils.GetHDRenderPipelinePath()); + HDRenderPipelineGlobalSettings.instance.EnsureEditorResources(forceReload: true); } bool IsSRPBatcherCorrect() @@ -439,7 +417,7 @@ void FixSRPBatcher(bool fromAsyncUnused) if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.defaultAsset; + var hdrpAsset = HDRenderPipeline.currentAsset; if (hdrpAsset == null) return; @@ -463,7 +441,7 @@ void FixHdrpAssetDiffusionProfile(bool fromAsyncUnused) return; var defaultAssetList = hdrpAsset.renderPipelineEditorResources.defaultDiffusionProfileSettingsList; - hdrpAsset.diffusionProfileSettingsList = new DiffusionProfileSettings[0]; // clear the diffusion profile list + HDRenderPipeline.defaultAsset.diffusionProfileSettingsList = new DiffusionProfileSettings[0]; // clear the diffusion profile list foreach (var diffusionProfileAsset in defaultAssetList) { @@ -471,22 +449,14 @@ void FixHdrpAssetDiffusionProfile(bool fromAsyncUnused) AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(diffusionProfileAsset), defaultDiffusionProfileSettingsPath); var userAsset = AssetDatabase.LoadAssetAtPath(defaultDiffusionProfileSettingsPath); - hdrpAsset.AddDiffusionProfile(userAsset); + HDRenderPipeline.defaultAsset.AddDiffusionProfile(userAsset); } EditorUtility.SetDirty(hdrpAsset); } bool IsDefaultVolumeProfileAssigned() - { - if (!IsHdrpAssetUsedCorrect()) - return false; - - var hdAsset = HDRenderPipeline.currentAsset; - return hdAsset.defaultVolumeProfile != null - && !hdAsset.defaultVolumeProfile.Equals(null) - && hdAsset.defaultVolumeProfile != hdAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile; - } + => IsHdrpAssetUsedCorrect() && HDRenderPipelineGlobalSettings.instance.IsVolumeProfileFromResources(); void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) { @@ -497,7 +467,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) if (hdrpAsset == null) return; - VolumeProfile defaultSettingsVolumeProfileInPackage = hdrpAsset.renderPipelineEditorResources.defaultSettingsVolumeProfile; + VolumeProfile defaultSettingsVolumeProfileInPackage = HDRenderPipelineGlobalSettings.instance.renderPipelineEditorResources.defaultSettingsVolumeProfile; string defaultSettingsVolumeProfilePath = "Assets/" + HDProjectSettings.projectSettingsFolderPath + '/' + defaultSettingsVolumeProfileInPackage.name + ".asset"; //try load one if one already exist @@ -508,7 +478,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) AssetDatabase.CopyAsset(AssetDatabase.GetAssetPath(defaultSettingsVolumeProfileInPackage), defaultSettingsVolumeProfilePath); defaultSettingsVolumeProfile = AssetDatabase.LoadAssetAtPath(defaultSettingsVolumeProfilePath); } - hdrpAsset.defaultVolumeProfile = defaultSettingsVolumeProfile; + HDRenderPipelineGlobalSettings.instance.volumeProfile = defaultSettingsVolumeProfile; EditorUtility.SetDirty(hdrpAsset); } @@ -637,16 +607,15 @@ void CheckPersistantNeedReboot() } bool IsDXRAssetCorrect() - => HDRenderPipeline.defaultAsset != null - && HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources != null + => HDRenderPipelineGlobalSettings.instance.AreRayTracingResourcesCreated() && SystemInfo.supportsRayTracing; void FixDXRAsset(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources - = AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"); - ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); + + HDRenderPipelineGlobalSettings.instance.EnsureRayTracingResources(forceReload: true); + // IMPORTANT: We display the error only if we are D3D12 as the supportsRayTracing always return false in any other device even if OS/HW supports DXR. // The D3D12 is a separate check in the wizard, so it is fine not to display an error in case we are not D3D12. if (!SystemInfo.supportsRayTracing && IsDXRDirect3D12Correct()) @@ -663,7 +632,7 @@ bool IsDXRScreenSpaceShadowCorrect() bool IsDXRScreenSpaceShadowFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -679,7 +648,7 @@ bool IsDXRReflectionsCorrect() bool IsDXRReflectionsFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -695,7 +664,7 @@ bool IsDXRTransparentReflectionsCorrect() bool IsDXRTransparentReflectionsFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -711,7 +680,7 @@ bool IsDXRGICorrect() bool IsDXRGIFSCorrect() { - HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) { FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); @@ -944,7 +913,7 @@ void Start(string packageName, Action action) void Progress() { - //Can occures on Wizard close or if scripts reloads + //Can occur on Wizard close or if scripts reloads if (m_CurrentRequest == null || m_CurrentRequest.Equals(null)) { EditorApplication.update -= Progress; diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs index e9e600b6d59..2ee80677ff0 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs @@ -140,25 +140,25 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT error: "Screen Space Shadows are disabled in the current HDRP Asset which means you cannot enable ray-traced shadows for lights in your scene. To enable this feature, open your HDRP Asset, go to Lighting > Shadows, and enable Screen Space Shadows", messageType: MessageType.Warning); public static readonly ConfigStyle dxrScreenSpaceShadowFS = new ConfigStyle( label: "Screen Space Shadows (Default Camera Frame Setting)", - error: "Screen Space Shadows are disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced shadows. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Shadows", messageType: MessageType.Info); + error: "Screen Space Shadows are disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced shadows. To enable this feature, go to Project Settings > Graphics > HDRP Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Shadows", messageType: MessageType.Info); public static readonly ConfigStyle dxrReflections = new ConfigStyle( label: "Reflection (Asset)", error: "Screen Space Reflection is disabled in the current HDRP Asset which means you cannot enable ray-traced reflections in Volume components. To enable this feature, open your HDRP Asset, go to Lighting > Reflections, and enable Screen Space Reflections", messageType: MessageType.Warning); public static readonly ConfigStyle dxrReflectionsFS = new ConfigStyle( label: "Reflection (Default Camera Frame Setting)", - error: "Screen Space Reflection is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced reflections. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Reflections", messageType: MessageType.Info); + error: "Screen Space Reflection is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced reflections. To enable this feature, go to Project Settings > Graphics > HDRP Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Reflections", messageType: MessageType.Info); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( label: "Screen Space Reflection - Transparent (Asset)", error: "Screen Space Reflection - Transparent is disabled in the current HDRP Asset which means you cannot enable ray-traced reflections for transparent GameObjects from Volume components. To enable this feature, open your HDRP Asset, go to Lighting > Reflections, and enable Transparents receive SSR", messageType: MessageType.Warning); public static readonly ConfigStyle dxrTransparentReflectionsFS = new ConfigStyle( label: "Screen Space Reflection - Transparent (Default Camera Frame Setting)", - error: "Screen Space Reflection - Transparent is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced reflections for transparent GameObjects. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable On Transparent", messageType: MessageType.Info); + error: "Screen Space Reflection - Transparent is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced reflections for transparent GameObjects. To enable this feature, go to Project Settings > Graphics > HDRP Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable On Transparent", messageType: MessageType.Info); public static readonly ConfigStyle dxrGI = new ConfigStyle( label: "Global Illumination (Asset)", error: "Screen Space Global Illumination is disabled in the current HDRP asset which means you cannot enable ray-traced global illumination in Volume components. To enable this feature, open your HDRP Asset, go to Lighting and enable Screen Space Global Illumination", messageType: MessageType.Warning); public static readonly ConfigStyle dxrGIFS = new ConfigStyle( label: "Global Illumination (Default Camera Frame Setting)", - error: "Screen Space Global Illumination is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced global illumination. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Global Illumination", messageType: MessageType.Info); + error: "Screen Space Global Illumination is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced global illumination. To enable this feature, go to Project Settings > Graphics > HDRP Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Global Illumination", messageType: MessageType.Info); public static readonly ConfigStyle dxr64bits = new ConfigStyle( label: "Architecture 64 bits", error: "To build your Project to a Unity Player, ray tracing requires that the build uses 64 bit architecture."); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index 4ebc91559a6..1f4311f6c20 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -79,14 +79,13 @@ public bool enableOutput } // Toggle the compositor-related custom passes - var hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline; if (value) { - RegisterCustomPasses(hdPipeline); + RegisterCustomPasses(); } else { - UnRegisterCustomPasses(hdPipeline); + UnRegisterCustomPasses(); } } } @@ -197,7 +196,7 @@ bool ValidatePipeline() m_AlphaSupport = AlphaChannelSupport.Rendering; } - RegisterCustomPasses(hdPipeline); + RegisterCustomPasses(); return true; } return false; @@ -553,8 +552,7 @@ void OnDestroy() } // We don't need the custom passes anymore - var hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline; - UnRegisterCustomPasses(hdPipeline); + UnRegisterCustomPasses(); // By now the s_CompositorManagedCameras should be empty, but clear it just to be safe CompositorCameraRegistry.GetInstance().CleanUpCameraOrphans(); @@ -928,41 +926,31 @@ static internal RenderTexture GetClearDepthForStackedCamera(HDCamera hdCamera) } // Register the custom pp passes used by the compositor - static internal void RegisterCustomPasses(HDRenderPipeline hdPipeline) + static internal void RegisterCustomPasses() { - if (hdPipeline == null) - { - return; - } - // If custom post processes are not registered in the HDRP asset, they are never executed so we have to add them manually - if (!hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) + if (!HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { - hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); + HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); } - if (!hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) + if (!HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) { - hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); + HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); } } // Unregister the custom pp passes used by the compositor - static internal void UnRegisterCustomPasses(HDRenderPipeline hdPipeline) + static internal void UnRegisterCustomPasses() { - if (hdPipeline == null) - { - return; - } - - if (hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) + if (HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { - hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(ChromaKeying).AssemblyQualifiedName); + HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Remove(typeof(ChromaKeying).AssemblyQualifiedName); } - if (hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) + if (HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) { - hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName); + HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName); } } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs b/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs index 751c20237d0..243e70f804d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs @@ -313,8 +313,8 @@ public bool IsDebugDisplayEnabled() public ExposureDebugMode exposureDebugMode = ExposureDebugMode.None; /// Exposure compensation to apply on current scene exposure. public float debugExposure = 0.0f; - /// Obsolete, please use the lens attenuation mode in HDRP Default Settings. - [Obsolete("Please use the lens attenuation mode in HDRP Default Settings", true)] + /// Obsolete, please use the lens attenuation mode in HDRP Global Settings. + [Obsolete("Please use the lens attenuation mode in HDRP Global Settings", true)] public float debugLensAttenuation = 0.65f; /// Whether to show tonemap curve in the histogram debug view or not. public bool showTonemapCurveAlongHistogramView = true; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs index a16c24d2a32..952ac7da188 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadowManager.cs @@ -192,9 +192,9 @@ void InitializeScreenSpaceShadows() // Fetch the shaders if (m_RayTracingSupported) { - m_ScreenSpaceShadowsCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowRaytracingCS; - m_ScreenSpaceShadowsFilterCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; - m_ScreenSpaceShadowsRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowRaytracingRT; + m_ScreenSpaceShadowsCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.shadowRaytracingCS; + m_ScreenSpaceShadowsFilterCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; + m_ScreenSpaceShadowsRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.shadowRaytracingRT; // Directional shadow kernels m_ClearShadowTexture = m_ScreenSpaceShadowsCS.FindKernel("ClearShadowTexture"); @@ -370,7 +370,7 @@ SSShadowDebugParameters PrepareSSShadowDebugParameters(HDCamera hdCamera, int ta sssdParams.debugKernel = m_WriteShadowTextureDebugKernel; // TODO: move the debug kernel outside of the ray tracing resources - sssdParams.shadowFilter = HDGlobalSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; + sssdParams.shadowFilter = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.shadowFilterCS; return sssdParams; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs index d679171ab67..68456704aad 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs @@ -316,7 +316,7 @@ void InitMaterial() if (m_Material == null) { #if UNITY_EDITOR - m_Material = HDGlobalSettings.instance != null ? HDGlobalSettings.instance.GetDefaultDecalMaterial() : null; + m_Material = HDRenderPipelineGlobalSettings.instance != null ? HDRenderPipelineGlobalSettings.instance.GetDefaultDecalMaterial() : null; #else m_Material = null; #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 026dfd2033d..1d3fce5ec66 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 @@ -906,7 +906,7 @@ internal void DoUserAfterOpaqueAndSky(RenderGraph renderGraph, HDCamera hdCamera using (new RenderGraphProfilingScope(renderGraph, ProfilingSampler.Get(HDProfileId.CustomPostProcessAfterOpaqueAndSky))) { TextureHandle source = colorBuffer; - bool needBlitToColorBuffer = DoCustomPostProcess(renderGraph, hdCamera, ref source, depthBuffer, normalBuffer, HDGlobalSettings.instance.beforeTransparentCustomPostProcesses); + bool needBlitToColorBuffer = DoCustomPostProcess(renderGraph, hdCamera, ref source, depthBuffer, normalBuffer, HDRenderPipelineGlobalSettings.instance.beforeTransparentCustomPostProcesses); if (needBlitToColorBuffer) { @@ -1008,7 +1008,7 @@ public void Render(RenderGraph renderGraph, source = DynamicExposurePass(renderGraph, hdCamera, source); - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDGlobalSettings.instance.beforeTAACustomPostProcesses, HDProfileId.CustomPostProcessBeforeTAA); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDRenderPipelineGlobalSettings.instance.beforeTAACustomPostProcesses, HDProfileId.CustomPostProcessBeforeTAA); // Temporal anti-aliasing goes first if (m_AntialiasingFS) @@ -1023,7 +1023,7 @@ public void Render(RenderGraph renderGraph, } } - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDGlobalSettings.instance.beforePostProcessCustomPostProcesses, HDProfileId.CustomPostProcessBeforePP); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses, HDProfileId.CustomPostProcessBeforePP); source = DepthOfFieldPass(renderGraph, hdCamera, depthBuffer, motionVectors, depthBufferMipChain, source); @@ -1042,7 +1042,7 @@ public void Render(RenderGraph renderGraph, source = UberPass(renderGraph, hdCamera, logLutOutput, bloomTexture, source); m_HDInstance.PushFullScreenDebugTexture(renderGraph, source, FullScreenDebugMode.ColorLog); - source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDGlobalSettings.instance.afterPostProcessCustomPostProcesses, HDProfileId.CustomPostProcessAfterPP); + source = CustomPostProcessPass(renderGraph, hdCamera, source, depthBuffer, normalBuffer, HDRenderPipelineGlobalSettings.instance.afterPostProcessCustomPostProcesses, HDProfileId.CustomPostProcessAfterPP); source = FXAAPass(renderGraph, hdCamera, source); 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 ccbd1e54e6b..76c9b1b36b8 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 @@ -695,7 +695,7 @@ TextureHandle RenderContactShadows(RenderGraph renderGraph, HDCamera hdCamera, T passData.rayTracingEnabled = RayTracedContactShadowsRequired(); if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing)) { - passData.contactShadowsRTS = m_Asset.renderPipelineRayTracingResources.contactShadowRayTracingRT; + passData.contactShadowsRTS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.contactShadowRayTracingRT; passData.accelerationStructure = RequestAccelerationStructure(); passData.actualWidth = hdCamera.actualWidth; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs index fa1c0d1617d..f47f920a1ee 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LookDev.cs @@ -20,7 +20,7 @@ struct LookDevDataForHDRP #if UNITY_EDITOR bool UpdateVolumeProfile(Volume volume, out VisualEnvironment visualEnvironment, out HDRISky sky, ref int volumeProfileHash) { - var lookDevVolumeProfile = HDGlobalSettings.instance.GetOrAssignLookDevVolumeProfile(); + var lookDevVolumeProfile = HDRenderPipelineGlobalSettings.instance.GetOrAssignLookDevVolumeProfile(); int newHashCode = lookDevVolumeProfile.GetHashCode(); if (newHashCode != volumeProfileHash) { 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 58f352d8059..55bdf952f17 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -24,10 +24,10 @@ namespace UnityEngine.Rendering.HighDefinition public partial class HDRenderPipeline : RenderPipeline { #region Global Settings - internal static HDGlobalSettings defaultAsset - => HDGlobalSettings.instance; + internal static HDRenderPipelineGlobalSettings defaultAsset + => HDRenderPipelineGlobalSettings.instance; - private HDGlobalSettings m_globalSettings; + private HDRenderPipelineGlobalSettings m_globalSettings; public override RenderPipelineGlobalSettings defaultSettings => m_globalSettings; internal static HDRenderPipelineAsset currentAsset @@ -48,7 +48,7 @@ internal static HDRenderPipeline currentPipeline readonly HDRenderPipelineAsset m_Asset; internal HDRenderPipelineAsset asset { get { return m_Asset; } } - internal RenderPipelineResources defaultResources { get { return HDGlobalSettings.instance.renderPipelineResources; } } + internal RenderPipelineResources defaultResources { get { return HDRenderPipelineGlobalSettings.instance.renderPipelineResources; } } internal RenderPipelineSettings currentPlatformRenderPipelineSettings { get { return m_Asset.currentPlatformRenderPipelineSettings; } } @@ -250,9 +250,9 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset obsol public HDRenderPipeline(HDRenderPipelineAsset asset) { #if UNITY_EDITOR - m_globalSettings = HDGlobalSettings.Ensure(); + m_globalSettings = HDRenderPipelineGlobalSettings.Ensure(); #else - m_globalSettings = HDGlobalSettings.instance; + m_globalSettings = HDRenderPipelineGlobalSettings.instance; #endif m_Asset = asset; HDProbeSystem.Parameters = asset.reflectionSystemParameters; @@ -468,7 +468,7 @@ void UpgradeResourcesIfNeeded() void ValidateResources() { - HDGlobalSettings.instance.EnsureShadersCompiled(); + HDRenderPipelineGlobalSettings.instance.EnsureShadersCompiled(); } #endif diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs index 51ecadc3c9b..a8162fae1bb 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs @@ -27,7 +27,7 @@ enum Version RemoveCookieCubeAtlasToOctahedral2D, RoughDistortion, VirtualTexturing, - AddedHDGlobalSettings + AddedHDRenderPipelineGlobalSettings } static readonly MigrationDescription k_Migration = MigrationDescription.New( @@ -157,7 +157,7 @@ enum Version FrameSettings.MigrateVirtualTexturing(ref data.m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings); #pragma warning restore 618 }) , - MigrationStep.New(Version.AddedHDGlobalSettings, (HDRenderPipelineAsset data) => + MigrationStep.New(Version.AddedHDRenderPipelineGlobalSettings, (HDRenderPipelineAsset data) => { #if UNITY_EDITOR // 2/ it acted as the definition of the Default Settings - now migrated to its own asset @@ -165,8 +165,8 @@ enum Version if (data == GraphicsSettings.defaultRenderPipeline) #pragma warning restore 618 { - HDGlobalSettings globalSettings = HDGlobalSettings.MigrateFromHDRPAsset(data, true); - HDGlobalSettings.UpdateGraphicsSettings(globalSettings); + HDRenderPipelineGlobalSettings globalSettings = HDRenderPipelineGlobalSettings.MigrateFromHDRPAsset(data, true); + HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(globalSettings); EditorUtility.SetDirty(globalSettings); } #endif @@ -190,7 +190,7 @@ enum Version [FormerlySerializedAs("m_RealtimeReflectionFrameSettings"), Obsolete("For data migration")] ObsoleteFrameSettings m_ObsoleteRealtimeReflectionFrameSettings; - #region Settings Moved from the HDRP Asset to HDGlobalSettings + #region Settings Moved from the HDRP Asset to HDRenderPipelineGlobalSettings [SerializeField] [FormerlySerializedAs("m_DefaultVolumeProfile"), Obsolete("Moved from HDRPAsset to HDGlobal Settings")] internal VolumeProfile m_ObsoleteDefaultVolumeProfile; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index c079924d62f..2a5f1d787b6 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -36,7 +36,7 @@ protected override void OnValidate() { isInOnValidateCall = true; #if UNITY_EDITOR - HDGlobalSettings.Ensure(); + HDRenderPipelineGlobalSettings.Ensure(); #endif //Do not reconstruct the pipeline if we modify other assets. //OnValidate is called once at first selection of the asset. @@ -48,11 +48,11 @@ protected override void OnValidate() isInOnValidateCall = false; } - public HDGlobalSettings defaultSettings => HDGlobalSettings.instance; + public HDRenderPipelineGlobalSettings defaultSettings => HDRenderPipelineGlobalSettings.instance; internal RenderPipelineResources renderPipelineResources { - get { return HDGlobalSettings.Ensure().renderPipelineResources; } + get { return HDRenderPipelineGlobalSettings.Ensure().renderPipelineResources; } set { defaultSettings.renderPipelineResources = value; } } @@ -108,23 +108,23 @@ void UpdateRenderingLayerNames() { m_RenderingLayerNames = new string[32]; - m_RenderingLayerNames[0] = HDGlobalSettings.instance.lightLayerName0; - m_RenderingLayerNames[1] = HDGlobalSettings.instance.lightLayerName1; - m_RenderingLayerNames[2] = HDGlobalSettings.instance.lightLayerName2; - m_RenderingLayerNames[3] = HDGlobalSettings.instance.lightLayerName3; - m_RenderingLayerNames[4] = HDGlobalSettings.instance.lightLayerName4; - m_RenderingLayerNames[5] = HDGlobalSettings.instance.lightLayerName5; - m_RenderingLayerNames[6] = HDGlobalSettings.instance.lightLayerName6; - m_RenderingLayerNames[7] = HDGlobalSettings.instance.lightLayerName7; - - m_RenderingLayerNames[8] = HDGlobalSettings.instance.decalLayerName0; - m_RenderingLayerNames[9] = HDGlobalSettings.instance.decalLayerName1; - m_RenderingLayerNames[10] = HDGlobalSettings.instance.decalLayerName2; - m_RenderingLayerNames[11] = HDGlobalSettings.instance.decalLayerName3; - m_RenderingLayerNames[12] = HDGlobalSettings.instance.decalLayerName4; - m_RenderingLayerNames[13] = HDGlobalSettings.instance.decalLayerName5; - m_RenderingLayerNames[14] = HDGlobalSettings.instance.decalLayerName6; - m_RenderingLayerNames[15] = HDGlobalSettings.instance.decalLayerName7; + m_RenderingLayerNames[0] = HDRenderPipelineGlobalSettings.instance.lightLayerName0; + m_RenderingLayerNames[1] = HDRenderPipelineGlobalSettings.instance.lightLayerName1; + m_RenderingLayerNames[2] = HDRenderPipelineGlobalSettings.instance.lightLayerName2; + m_RenderingLayerNames[3] = HDRenderPipelineGlobalSettings.instance.lightLayerName3; + m_RenderingLayerNames[4] = HDRenderPipelineGlobalSettings.instance.lightLayerName4; + m_RenderingLayerNames[5] = HDRenderPipelineGlobalSettings.instance.lightLayerName5; + m_RenderingLayerNames[6] = HDRenderPipelineGlobalSettings.instance.lightLayerName6; + m_RenderingLayerNames[7] = HDRenderPipelineGlobalSettings.instance.lightLayerName7; + + m_RenderingLayerNames[8] = HDRenderPipelineGlobalSettings.instance.decalLayerName0; + m_RenderingLayerNames[9] = HDRenderPipelineGlobalSettings.instance.decalLayerName1; + m_RenderingLayerNames[10] = HDRenderPipelineGlobalSettings.instance.decalLayerName2; + m_RenderingLayerNames[11] = HDRenderPipelineGlobalSettings.instance.decalLayerName3; + m_RenderingLayerNames[12] = HDRenderPipelineGlobalSettings.instance.decalLayerName4; + m_RenderingLayerNames[13] = HDRenderPipelineGlobalSettings.instance.decalLayerName5; + m_RenderingLayerNames[14] = HDRenderPipelineGlobalSettings.instance.decalLayerName6; + m_RenderingLayerNames[15] = HDRenderPipelineGlobalSettings.instance.decalLayerName7; // Unused for (int i = 16; i < m_RenderingLayerNames.Length; ++i) @@ -157,12 +157,12 @@ public override string[] renderingLayerMaskNames /// /// Names used for display of light layers. /// - public string[] lightLayerNames => HDGlobalSettings.instance.lightLayerNames; + public string[] lightLayerNames => HDRenderPipelineGlobalSettings.instance.lightLayerNames; /// /// Names used for display of decal layers. /// - public string[] decalLayerNames => HDGlobalSettings.instance.decalLayerNames; + public string[] decalLayerNames => HDRenderPipelineGlobalSettings.instance.decalLayerNames; /// HDRP default shader. public override Shader defaultShader diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs similarity index 76% rename from com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.Migration.cs rename to com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs index db990f261fe..1152c8e0fc9 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs @@ -3,7 +3,7 @@ namespace UnityEngine.Rendering.HighDefinition { - public partial class HDGlobalSettings : IVersionable + public partial class HDRenderPipelineGlobalSettings : IVersionable { enum Version { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs.meta b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs.meta new file mode 100644 index 00000000000..be5d83dfada --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 05293bf3b3b463b40afcd3474b0141f7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs similarity index 90% rename from com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.cs rename to com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index a846230d917..ccaaa4704b5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; //needed for list of Custom Post Processes injections using System.IO; +using System.Linq; #if UNITY_EDITOR using UnityEditorInternal; using UnityEditor; @@ -29,20 +30,20 @@ enum LensAttenuationMode /// - Frame Settings applied by default to Camera, ReflectionProbe /// - Various resources (such as Shaders) for runtime, editor-only, and raytracing /// - public partial class HDGlobalSettings : RenderPipelineGlobalSettings + public partial class HDRenderPipelineGlobalSettings : RenderPipelineGlobalSettings { - private static HDGlobalSettings cachedInstance = null; - public static HDGlobalSettings instance + private static HDRenderPipelineGlobalSettings cachedInstance = null; + public static HDRenderPipelineGlobalSettings instance { get { if (cachedInstance == null) - cachedInstance = GraphicsSettings.GetSettingsForRenderPipeline() as HDGlobalSettings; + cachedInstance = GraphicsSettings.GetSettingsForRenderPipeline() as HDRenderPipelineGlobalSettings; return cachedInstance; } } - static public void UpdateGraphicsSettings(HDGlobalSettings newSettings) + static public void UpdateGraphicsSettings(HDRenderPipelineGlobalSettings newSettings) { if (newSettings == null || newSettings == cachedInstance) return; @@ -51,39 +52,39 @@ static public void UpdateGraphicsSettings(HDGlobalSettings newSettings) } #if UNITY_EDITOR - //Making sure there is at least one HDGlobalSettings instance in the project - static public HDGlobalSettings Ensure() + //Making sure there is at least one HDRenderPipelineGlobalSettings instance in the project + static public HDRenderPipelineGlobalSettings Ensure() { - if (HDGlobalSettings.instance) - return HDGlobalSettings.instance; + if (HDRenderPipelineGlobalSettings.instance) + return HDRenderPipelineGlobalSettings.instance; - HDGlobalSettings assetCreated = null; - string path = "Assets/HDRPDefaultResources/HDGlobalSettings.asset"; - assetCreated = AssetDatabase.LoadAssetAtPath(path); + HDRenderPipelineGlobalSettings assetCreated = null; + string path = "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"; + assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { - var guidHDGlobalAssets = AssetDatabase.FindAssets("t:HDGlobalSettings"); + var guidHDGlobalAssets = AssetDatabase.FindAssets("t:HDRenderPipelineGlobalSettings"); //If we could not find the asset at the default path, find the first one if (guidHDGlobalAssets.Length > 0) { var curGUID = guidHDGlobalAssets[0]; path = AssetDatabase.GUIDToAssetPath(curGUID); - assetCreated = AssetDatabase.LoadAssetAtPath(path); + assetCreated = AssetDatabase.LoadAssetAtPath(path); } else // or create one altogether { if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); - assetCreated = ScriptableObject.CreateInstance(); + assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); } } - Debug.Assert(assetCreated, "Could not create HD Global Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); + Debug.Assert(assetCreated, "Could not create HDRP's Global Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); UpdateGraphicsSettings(assetCreated); - return HDGlobalSettings.instance; + return HDRenderPipelineGlobalSettings.instance; } #endif @@ -124,23 +125,23 @@ void Init() } #if UNITY_EDITOR - internal static HDGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) + internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) { - string path = "Assets/HDRPDefaultResources/HDGlobalSettings.asset"; + string path = "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"; return MigrateFromHDRPAsset(oldAsset, path, bClearObsoleteFields); } - internal static HDGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) + internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) { - HDGlobalSettings assetCreated = null; + HDRenderPipelineGlobalSettings assetCreated = null; // 1. Load or Create the HDAsset and save it on disk - assetCreated = AssetDatabase.LoadAssetAtPath(path); + assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); - assetCreated = ScriptableObject.CreateInstance(); + assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); AssetDatabase.SaveAssets(); @@ -209,15 +210,15 @@ internal static HDGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldA return assetCreated; } - internal static HDGlobalSettings Create(string path, HDGlobalSettings src = null) + internal static HDRenderPipelineGlobalSettings Create(string path, HDRenderPipelineGlobalSettings src = null) { - HDGlobalSettings assetCreated = null; + HDRenderPipelineGlobalSettings assetCreated = null; // make sure the asset does not already exists - assetCreated = AssetDatabase.LoadAssetAtPath(path); + assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { - assetCreated = ScriptableObject.CreateInstance(); + assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); if (assetCreated != null) @@ -454,15 +455,19 @@ internal void EnsureResources(bool forceReload) if (AreResourcesCreated()) return; - m_RenderPipelineResources = AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"); + var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; + var objs = InternalEditorUtility.LoadSerializedFileAndForget(runtimeResourcesPath); + m_RenderPipelineResources = objs != null && objs.Length > 0 ? objs.First() as RenderPipelineResources : null; if (forceReload) { -#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify - ResourceReloader.TryReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath()); -#else - ResourceReloader.ReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath()); -#endif + if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath())) + { + InternalEditorUtility.SaveToSerializedFileAndForget( + new UnityEngine.Object[] { m_RenderPipelineResources }, + runtimeResourcesPath, + true); + } } } @@ -732,7 +737,7 @@ internal bool AddDiffusionProfile(DiffusionProfileSettings profile) } else { - Debug.LogErrorFormat("We cannot add the diffusion profile {0} to the HDRP default settings as we only allow 14 custom profiles. Please remove one before adding a new one.", profile.name); + Debug.LogErrorFormat("We cannot add the diffusion profile {0} to the HDRP's Global Settings as we only allow 14 custom profiles. Please remove one before adding a new one.", profile.name); return false; } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs.meta b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs.meta new file mode 100644 index 00000000000..a74a3ee122e --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 781cc897cf8675041a751163b51f97dd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs index b015d4ee6d2..041c322a0f2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs @@ -248,7 +248,7 @@ PathTracingParameters PreparePathTracingParameters(HDCamera hdCamera) { PathTracingParameters parameters = new PathTracingParameters(); - parameters.pathTracingShader = HDGlobalSettings.instance.renderPipelineRayTracingResources.pathTracing; + parameters.pathTracingShader = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.pathTracing; parameters.cameraData = m_SubFrameManager.GetCameraData(hdCamera.camera.GetInstanceID()); parameters.ditheredTextureSet = GetBlueNoiseManager().DitheredTextureSet256SPP(); parameters.backgroundColor = hdCamera.backgroundColorHDR; @@ -327,7 +327,7 @@ TextureHandle RenderPathTracing(RenderGraph renderGraph, in PathTracingParameter TextureHandle RenderPathTracing(RenderGraph renderGraph, HDCamera hdCamera) { - RayTracingShader pathTracingShader = HDGlobalSettings.instance.renderPipelineRayTracingResources.pathTracing; + RayTracingShader pathTracingShader = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.pathTracing; m_PathTracingSettings = hdCamera.volumeStack.GetComponent(); // Check the validity of the state before moving on with the computation diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs index 4eba3eca940..a6b8eb2c92e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingIndirectDiffuse.cs @@ -16,7 +16,7 @@ public partial class HDRenderPipeline void InitRayTracedIndirectDiffuse() { - ComputeShader indirectDiffuseShaderCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + ComputeShader indirectDiffuseShaderCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; // Grab all the kernels we shall be using m_RaytracingIndirectDiffuseFullResKernel = indirectDiffuseShaderCS.FindKernel("RaytracingIndirectDiffuseFullRes"); @@ -67,9 +67,9 @@ DeferredLightingRTParameters PrepareIndirectDiffuseDeferredLightingRTParameters( deferredParameters.lightCluster = RequestLightCluster(); // Shaders - deferredParameters.gBufferRaytracingRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; - deferredParameters.deferredRaytracingCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; - deferredParameters.rayBinningCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.rayBinningCS; + deferredParameters.gBufferRaytracingRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; + deferredParameters.deferredRaytracingCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + deferredParameters.rayBinningCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.rayBinningCS; // XRTODO: add ray binning support for single-pass if (deferredParameters.viewCount > 1 && deferredParameters.rayBinning) @@ -119,7 +119,7 @@ RTIndirectDiffuseDirGenParameters PrepareRTIndirectDiffuseDirGenParameters(HDCam rtidDirGenParams.fullResolution = settings.fullResolution; // Grab the right kernel - rtidDirGenParams.directionGenCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + rtidDirGenParams.directionGenCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; rtidDirGenParams.dirGenKernel = settings.fullResolution ? m_RaytracingIndirectDiffuseFullResKernel : m_RaytracingIndirectDiffuseHalfResKernel; // Grab the additional parameters @@ -200,13 +200,13 @@ RTIndirectDiffuseUpscaleParameters PrepareRTIndirectDiffuseUpscaleParameters(HDC rtidUpscaleParams.upscaleRadius = settings.upscaleRadius; // Grab the right kernel - rtidUpscaleParams.upscaleCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + rtidUpscaleParams.upscaleCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; rtidUpscaleParams.upscaleKernel = settings.fullResolution ? m_IndirectDiffuseUpscaleFullResKernel : m_IndirectDiffuseUpscaleHalfResKernel; // Grab the additional parameters BlueNoise blueNoise = GetBlueNoiseManager(); rtidUpscaleParams.blueNoiseTexture = blueNoise.textureArray16RGB; - rtidUpscaleParams.scramblingTexture = HDGlobalSettings.instance.renderPipelineResources.textures.scramblingTex; + rtidUpscaleParams.scramblingTexture = HDRenderPipelineGlobalSettings.instance.renderPipelineResources.textures.scramblingTex; return rtidUpscaleParams; } @@ -272,7 +272,7 @@ AdjustRTIDWeightParameters PrepareAdjustRTIDWeightParametersParameters(HDCamera parameters.viewCount = hdCamera.viewCount; // Grab the right kernel - parameters.adjustWeightCS = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; + parameters.adjustWeightCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingCS; parameters.adjustWeightKernel = m_AdjustIndirectDiffuseWeightKernel; return parameters; @@ -339,7 +339,7 @@ QualityRTIndirectDiffuseParameters PrepareQualityRTIndirectDiffuseParameters(HDC qrtidParams.bounceCount = settings.bounceCount.value; // Grab the additional parameters - qrtidParams.indirectDiffuseRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingRT; + qrtidParams.indirectDiffuseRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.indirectDiffuseRaytracingRT; qrtidParams.accelerationStructure = RequestAccelerationStructure(); qrtidParams.lightCluster = RequestLightCluster(); qrtidParams.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs index 7c9e178e192..32d385f1211 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs @@ -81,7 +81,7 @@ public void Initialize(HDRenderPipeline renderPipeline) { // Keep track of the external buffers m_RenderPipelineResources = renderPipeline.asset.renderPipelineResources; - m_RenderPipelineRayTracingResources = HDGlobalSettings.instance.renderPipelineRayTracingResources; + m_RenderPipelineRayTracingResources = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources; // Keep track of the render pipeline m_RenderPipeline = renderPipeline; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs index 14240719c3b..64a0cee8dc9 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs @@ -88,7 +88,7 @@ internal void InitRayTracingManager() { // Init the ray count manager m_RayCountManager = new RayCountManager(); - m_RayCountManager.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); + m_RayCountManager.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources); // Build the light cluster m_RayTracingLightCluster = new HDRaytracingLightCluster(); @@ -652,7 +652,7 @@ internal HDTemporalFilter GetTemporalFilter() if (m_TemporalFilter == null && m_RayTracingSupported) { m_TemporalFilter = new HDTemporalFilter(); - m_TemporalFilter.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); + m_TemporalFilter.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources); } return m_TemporalFilter; } @@ -662,7 +662,7 @@ internal HDSimpleDenoiser GetSimpleDenoiser() if (m_SimpleDenoiser == null) { m_SimpleDenoiser = new HDSimpleDenoiser(); - m_SimpleDenoiser.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); + m_SimpleDenoiser.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources); } return m_SimpleDenoiser; } @@ -672,7 +672,7 @@ internal SSGIDenoiser GetSSGIDenoiser() if (m_SSGIDenoiser == null) { m_SSGIDenoiser = new SSGIDenoiser(); - m_SSGIDenoiser.Init(HDGlobalSettings.instance.renderPipelineResources); + m_SSGIDenoiser.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineResources); } return m_SSGIDenoiser; } @@ -682,7 +682,7 @@ internal HDDiffuseDenoiser GetDiffuseDenoiser() if (m_DiffuseDenoiser == null) { m_DiffuseDenoiser = new HDDiffuseDenoiser(); - m_DiffuseDenoiser.Init(HDGlobalSettings.instance.renderPipelineResources, HDGlobalSettings.instance.renderPipelineRayTracingResources, this); + m_DiffuseDenoiser.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineResources, HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources, this); } return m_DiffuseDenoiser; } @@ -692,7 +692,7 @@ internal HDReflectionDenoiser GetReflectionDenoiser() if (m_ReflectionDenoiser == null) { m_ReflectionDenoiser = new HDReflectionDenoiser(); - m_ReflectionDenoiser.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); + m_ReflectionDenoiser.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources); } return m_ReflectionDenoiser; } @@ -702,7 +702,7 @@ internal HDDiffuseShadowDenoiser GetDiffuseShadowDenoiser() if (m_DiffuseShadowDenoiser == null) { m_DiffuseShadowDenoiser = new HDDiffuseShadowDenoiser(); - m_DiffuseShadowDenoiser.Init(HDGlobalSettings.instance.renderPipelineRayTracingResources); + m_DiffuseShadowDenoiser.Init(HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources); } return m_DiffuseShadowDenoiser; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs index eb0131cfdf1..173ddc0e745 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingRecursiveRenderer.cs @@ -74,7 +74,7 @@ RecursiveRendererParameters PrepareRecursiveRendererParameters(HDCamera hdCamera // Other data rrParams.accelerationStructure = RequestAccelerationStructure(); rrParams.lightCluster = RequestLightCluster(); - rrParams.recursiveRenderingRT = HDGlobalSettings.instance.renderPipelineRayTracingResources.forwardRaytracing; + rrParams.recursiveRenderingRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.forwardRaytracing; rrParams.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); rrParams.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; BlueNoise blueNoise = GetBlueNoiseManager(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingAmbientOcclusion.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingAmbientOcclusion.cs index 9fb71e0b85e..dc82700361b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingAmbientOcclusion.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingAmbientOcclusion.cs @@ -14,7 +14,7 @@ partial class HDRenderPipeline void InitRayTracingAmbientOcclusion() { // Grab the kernels we need - m_RTAOApplyIntensityKernel = asset.renderPipelineRayTracingResources.aoRaytracingCS.FindKernel("RTAOApplyIntensity"); + m_RTAOApplyIntensityKernel = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.aoRaytracingCS.FindKernel("RTAOApplyIntensity"); } float EvaluateRTSpecularOcclusionFlag(HDCamera hdCamera, AmbientOcclusion ssoSettings) @@ -109,7 +109,7 @@ TraceAmbientOcclusionResult TraceAO(RenderGraph renderGraph, HDCamera hdCamera, // Other parameters passData.raytracingCB = shaderVariablesRaytracing; - passData.aoShaderRT = asset.renderPipelineRayTracingResources.aoRaytracingRT; + passData.aoShaderRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.aoRaytracingRT; passData.rayTracingAccelerationStructure = RequestAccelerationStructure(); passData.ditheredTextureSet = GetBlueNoiseManager().DitheredTextureSet8SPP(); @@ -212,7 +212,7 @@ TextureHandle ComposeAO(RenderGraph renderGraph, HDCamera hdCamera, TextureHandl passData.actualWidth = hdCamera.actualWidth; passData.actualHeight = hdCamera.actualHeight; passData.viewCount = hdCamera.viewCount; - passData.aoShaderCS = asset.renderPipelineRayTracingResources.aoRaytracingCS; + passData.aoShaderCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.aoRaytracingCS; passData.intensityKernel = m_RTAOApplyIntensityKernel; passData.outputTexture = builder.ReadWriteTexture(aoTexture); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingReflection.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingReflection.cs index cc1bd05e136..ee897ae9d76 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingReflection.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingReflection.cs @@ -23,8 +23,8 @@ public partial class HDRenderPipeline void InitRayTracedReflections() { - ComputeShader reflectionShaderCS = m_Asset.renderPipelineRayTracingResources.reflectionRaytracingCS; - ComputeShader reflectionBilateralFilterCS = m_Asset.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + ComputeShader reflectionShaderCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; + ComputeShader reflectionBilateralFilterCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; // Grab all the kernels we shall be using m_RaytracingReflectionsFullResKernel = reflectionShaderCS.FindKernel("RaytracingReflectionsFullRes"); @@ -93,7 +93,7 @@ TextureHandle DirGenRTR(RenderGraph renderGraph, HDCamera hdCamera, ScreenSpaceR passData.minSmoothness = settings.minSmoothness; // Grab the right kernel - passData.directionGenCS = m_Asset.renderPipelineRayTracingResources.reflectionRaytracingCS; + passData.directionGenCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingCS; if (settings.fullResolution) passData.dirGenKernel = transparent ? m_RaytracingReflectionsTransparentFullResKernel : m_RaytracingReflectionsFullResKernel; else @@ -187,7 +187,7 @@ TextureHandle AdjustWeightRTR(RenderGraph renderGraph, HDCamera hdCamera, Screen passData.smoothnessFadeStart = settings.smoothnessFadeStart; // Other parameters - passData.reflectionFilterCS = m_Asset.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + passData.reflectionFilterCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; passData.adjustWeightKernel = settings.fullResolution ? m_ReflectionAdjustWeightKernel : m_ReflectionRescaleAndAdjustWeightKernel; passData.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; @@ -258,7 +258,7 @@ TextureHandle UpscaleRTR(RenderGraph renderGraph, HDCamera hdCamera, TextureHand passData.texWidth = hdCamera.actualWidth; passData.texHeight = hdCamera.actualHeight; passData.viewCount = hdCamera.viewCount; - passData.reflectionFilterCS = m_Asset.renderPipelineRayTracingResources.reflectionBilateralFilterCS; + passData.reflectionFilterCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.reflectionBilateralFilterCS; passData.upscaleKernel = m_ReflectionUpscaleKernel; passData.depthStencilBuffer = builder.ReadTexture(depthPyramid); @@ -325,9 +325,9 @@ DeferredLightingRTParameters PrepareReflectionDeferredLightingRTParameters(HDCam deferredParameters.lightCluster = RequestLightCluster(); // Shaders - deferredParameters.gBufferRaytracingRT = m_Asset.renderPipelineRayTracingResources.gBufferRaytracingRT; - deferredParameters.deferredRaytracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; - deferredParameters.rayBinningCS = m_Asset.renderPipelineRayTracingResources.rayBinningCS; + deferredParameters.gBufferRaytracingRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.gBufferRaytracingRT; + deferredParameters.deferredRaytracingCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; + deferredParameters.rayBinningCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.rayBinningCS; // XRTODO: add ray binning support for single-pass if (deferredParameters.viewCount > 1 && deferredParameters.rayBinning) @@ -442,7 +442,7 @@ TextureHandle QualityRTR(RenderGraph renderGraph, HDCamera hdCamera, ScreenSpace passData.ditheredTextureSet = GetBlueNoiseManager().DitheredTextureSet8SPP(); passData.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; passData.skyTexture = m_SkyManager.GetSkyReflection(hdCamera); - passData.reflectionShader = m_Asset.renderPipelineRayTracingResources.reflectionRaytracingRT; + passData.reflectionShader = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.reflectionRaytracingRT; passData.depthBuffer = builder.ReadTexture(depthPyramid); passData.stencilBuffer = builder.ReadTexture(stencilBuffer); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingSubsurfaceScattering.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingSubsurfaceScattering.cs index 5d5693e9a26..d2731330412 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingSubsurfaceScattering.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRenderPipeline.RaytracingSubsurfaceScattering.cs @@ -25,8 +25,8 @@ static RTHandle SubSurfaceHistoryBufferAllocatorFunction(string viewName, int fr void InitializeSubsurfaceScatteringRT() { - ComputeShader rayTracingSubSurfaceCS = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingCS; - ComputeShader deferredRayTracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; + ComputeShader rayTracingSubSurfaceCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + ComputeShader deferredRayTracingCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; m_SSSClearTextureKernel = rayTracingSubSurfaceCS.FindKernel("ClearTexture"); m_RaytracingDiffuseDeferredKernel = deferredRayTracingCS.FindKernel("RaytracingDiffuseDeferred"); @@ -99,9 +99,9 @@ TextureHandle TraceRTSSS(RenderGraph renderGraph, HDCamera hdCamera, TextureHand passData.rtDeferredLightingKernel = m_RaytracingDiffuseDeferredKernel; // other required parameters - passData.rayTracingSubSurfaceRT = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingRT; - passData.rayTracingSubSurfaceCS = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingCS; - passData.deferredRayTracingCS = m_Asset.renderPipelineRayTracingResources.deferredRaytracingCS; + passData.rayTracingSubSurfaceRT = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingRT; + passData.rayTracingSubSurfaceCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + passData.deferredRayTracingCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.deferredRaytracingCS; passData.accelerationStructure = RequestAccelerationStructure(); passData.lightCluster = RequestLightCluster(); passData.shaderVariablesRayTracingCB = m_ShaderVariablesRayTracingCB; @@ -246,7 +246,7 @@ TextureHandle CombineRTSSS(RenderGraph renderGraph, HDCamera hdCamera, TextureHa passData.combineSSSKernel = passData.validSSGI ? m_CombineSubSurfaceWithGIKernel : m_CombineSubSurfaceKernel; // Other parameters - passData.rayTracingSubSurfaceCS = m_Asset.renderPipelineRayTracingResources.subSurfaceRayTracingCS; + passData.rayTracingSubSurfaceCS = HDRenderPipelineGlobalSettings.instance.renderPipelineRayTracingResources.subSurfaceRayTracingCS; passData.combineLightingMat = m_CombineLightingPass; passData.depthStencilBuffer = builder.UseDepthBuffer(depthStencilBuffer, DepthAccess.Read); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs index 5db3f7c017d..4142f982c75 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs @@ -845,7 +845,7 @@ internal static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSet ref aggregatedFrameSettings, camera, additionalData, - ref HDGlobalSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera + ref HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera hdrpAsset.currentPlatformRenderPipelineSettings ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs index 4928e6f33ff..997ae5abf76 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs @@ -62,7 +62,7 @@ string IFrameSettingsHistoryContainer.panelName => "Scene Camera"; public MinimalHistoryContainer() - => m_FrameSettingsHistory.debug = HDGlobalSettings.instance?.GetDefaultFrameSettings(FrameSettingsRenderType.Camera) ?? FrameSettings.NewDefaultCamera(); + => m_FrameSettingsHistory.debug = HDRenderPipelineGlobalSettings.instance?.GetDefaultFrameSettings(FrameSettingsRenderType.Camera) ?? FrameSettings.NewDefaultCamera(); Action IDebugData.GetReset() //caution: we actually need to retrieve the @@ -128,7 +128,7 @@ public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSetti camera.cameraType == CameraType.SceneView ? sceneViewFrameSettingsContainer : #endif additionalData, - ref HDGlobalSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera + ref HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(additionalData?.defaultFrameSettings ?? FrameSettingsRenderType.Camera), //fallback on Camera for SceneCamera and PreviewCamera hdrpAsset.currentPlatformRenderPipelineSettings ); @@ -195,7 +195,7 @@ static DebugUI.HistoryBoolField GenerateHistoryBoolField(IFrameSettingsHistoryCo { () => frameSettingsContainer.frameSettingsHistory.sanitazed.IsEnabled(field), () => frameSettingsContainer.frameSettingsHistory.overridden.IsEnabled(field), - () => HDGlobalSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) + () => HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) } }; } @@ -226,7 +226,7 @@ static DebugUI.HistoryEnumField GenerateHistoryEnumField(IFrameSettingsHistoryCo { () => frameSettingsContainer.frameSettingsHistory.sanitazed.IsEnabled(field) ? 1 : 0, () => frameSettingsContainer.frameSettingsHistory.overridden.IsEnabled(field) ? 1 : 0, - () => HDGlobalSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) ? 1 : 0 + () => HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(frameSettingsContainer.frameSettingsHistory.defaultType).IsEnabled(field) ? 1 : 0 } }; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs index 1b2ec91fff6..f66d8d0c567 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs @@ -180,50 +180,50 @@ public PlanarReflectionAtlasResolutionScalableSetting(PlanarReflectionAtlasResol /// Name for light layer 0. public string lightLayerName0 { - get { return HDGlobalSettings.instance.lightLayerName0; } - set { HDGlobalSettings.instance.lightLayerName0 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName0; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName0 = value; } } /// Name for light layer 1. public string lightLayerName1 { - get { return HDGlobalSettings.instance.lightLayerName1; } - set { HDGlobalSettings.instance.lightLayerName1 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName1; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName1 = value; } } /// Name for light layer 2. public string lightLayerName2 { - get { return HDGlobalSettings.instance.lightLayerName2; } - set { HDGlobalSettings.instance.lightLayerName2 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName2; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName2 = value; } } /// Name for light layer 3. public string lightLayerName3 { - get { return HDGlobalSettings.instance.lightLayerName3; } - set { HDGlobalSettings.instance.lightLayerName3 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName3; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName3 = value; } } /// Name for light layer 4. public string lightLayerName4 { - get { return HDGlobalSettings.instance.lightLayerName4; } - set { HDGlobalSettings.instance.lightLayerName4 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName4; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName4 = value; } } /// Name for light layer 5. public string lightLayerName5 { - get { return HDGlobalSettings.instance.lightLayerName5; } - set { HDGlobalSettings.instance.lightLayerName5 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName5; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName5 = value; } } /// Name for light layer 6. public string lightLayerName6 { - get { return HDGlobalSettings.instance.lightLayerName6; } - set { HDGlobalSettings.instance.lightLayerName6 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName6; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName6 = value; } } /// Name for light layer 7. public string lightLayerName7 { - get { return HDGlobalSettings.instance.lightLayerName7; } - set { HDGlobalSettings.instance.lightLayerName7 = value; } + get { return HDRenderPipelineGlobalSettings.instance.lightLayerName7; } + set { HDRenderPipelineGlobalSettings.instance.lightLayerName7 = value; } } /// Support distortion. public bool supportDistortion; @@ -251,50 +251,50 @@ public string lightLayerName7 /// Name for decal layer 0. public string decalLayerName0 { - get { return HDGlobalSettings.instance.decalLayerName0; } - set { HDGlobalSettings.instance.decalLayerName0 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName0; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName0 = value; } } /// Name for decal layer 1. public string decalLayerName1 { - get { return HDGlobalSettings.instance.decalLayerName1; } - set { HDGlobalSettings.instance.decalLayerName1 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName1; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName1 = value; } } /// Name for decal layer 2. public string decalLayerName2 { - get { return HDGlobalSettings.instance.decalLayerName2; } - set { HDGlobalSettings.instance.decalLayerName2 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName2; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName2 = value; } } /// Name for decal layer 3. public string decalLayerName3 { - get { return HDGlobalSettings.instance.decalLayerName3; } - set { HDGlobalSettings.instance.decalLayerName3 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName3; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName3 = value; } } /// Name for decal layer 4. public string decalLayerName4 { - get { return HDGlobalSettings.instance.decalLayerName4; } - set { HDGlobalSettings.instance.decalLayerName4 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName4; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName4 = value; } } /// Name for decal layer 5. public string decalLayerName5 { - get { return HDGlobalSettings.instance.decalLayerName5; } - set { HDGlobalSettings.instance.decalLayerName5 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName5; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName5 = value; } } /// Name for decal layer 6. public string decalLayerName6 { - get { return HDGlobalSettings.instance.decalLayerName6; } - set { HDGlobalSettings.instance.decalLayerName6 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName6; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName6 = value; } } /// Name for decal layer 7. public string decalLayerName7 { - get { return HDGlobalSettings.instance.decalLayerName7; } - set { HDGlobalSettings.instance.decalLayerName7 = value; } + get { return HDRenderPipelineGlobalSettings.instance.decalLayerName7; } + set { HDRenderPipelineGlobalSettings.instance.decalLayerName7 = value; } } /// Number of samples when using MSAA. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs index 8cbf3a4b77b..1e0a70b1ef9 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs @@ -152,7 +152,7 @@ public Texture3DAtlas(GraphicsFormat format, int maxElementSize, int maxElementC m_Elements.Add(elem); } - m_Texture3DAtlasCompute = HDGlobalSettings.instance.renderPipelineResources.shaders.texture3DAtlasCS; + m_Texture3DAtlasCompute = HDRenderPipelineGlobalSettings.instance.renderPipelineResources.shaders.texture3DAtlasCS; m_CopyKernel = m_Texture3DAtlasCompute.FindKernel("Copy"); m_GenerateMipKernel = m_Texture3DAtlasCompute.FindKernel("GenerateMipMap"); m_Texture3DAtlasCompute.GetKernelThreadGroupSizes(m_CopyKernel, out var groupThreadX, out var groupThreadY, out var groupThreadZ); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs index c770119d903..a986c363442 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.cs @@ -331,7 +331,7 @@ public override int GetHashCode() /// static void Init() { - var asset = HDGlobalSettings.instance; + var asset = HDRenderPipelineGlobalSettings.instance; if (asset != null) CloudMap.s_DefaultTexture = asset.renderPipelineResources?.textures.defaultCloudMap; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs index ac6fbb15da5..90684892d85 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/StaticLightingSky.cs @@ -189,7 +189,7 @@ private int InitComponentFromProfile(T component, T componentFromProfile, Typ var newParameters = component.parameters; var profileParameters = componentFromProfile.parameters; - var defaultVolume = HDGlobalSettings.instance.GetOrCreateDefaultVolume(); + var defaultVolume = HDRenderPipelineGlobalSettings.instance.GetOrCreateDefaultVolume(); T defaultComponent = null; if (defaultVolume.sharedProfile != null) // This can happen with old projects. defaultVolume.sharedProfile.TryGet(type, out defaultComponent); From f0f489aebf88f967277fa14009674c5403f51887 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 16 Feb 2021 15:09:54 +0100 Subject: [PATCH 13/58] Moved HDRenderPipelineGlobalSettingsCreator to its own file --- .../Editor/RenderPipeline/HDAssetFactory.cs | 28 +-------------- .../HDRenderPipelineGlobalSettingsCreator.cs | 36 +++++++++++++++++++ ...enderPipelineGlobalSettingsCreator.cs.meta | 11 ++++++ 3 files changed, 48 insertions(+), 27 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs.meta diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index 49445193191..698dbcadcc9 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -7,7 +7,7 @@ namespace UnityEditor.Rendering.HighDefinition { using UnityObject = UnityEngine.Object; - static class HDAssetFactory + static partial class HDAssetFactory { static string s_RenderPipelineResourcesPath { @@ -110,31 +110,5 @@ static void CreateRenderPipelineEditorResources() var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDRenderPipelineEditorResources.asset", icon, null); } - - internal class HDRenderPipelineGlobalSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction - { - public override void Action(int instanceId, string pathName, string resourceFile) - { - var newAsset = HDRenderPipelineGlobalSettings.Create(pathName, settings); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(newAsset); - ProjectWindowUtil.ShowCreatedAsset(newAsset); - } - - static HDRenderPipelineGlobalSettings settings; - public static void Clone(HDRenderPipelineGlobalSettings src) - { - settings = src; - var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - var assetCreator = ScriptableObject.CreateInstance(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); - } - } - - [MenuItem("Assets/Create/Rendering/HDRP Global Settings Asset", priority = CoreUtils.Sections.section1 + CoreUtils.Priorities.assetsCreateRenderingMenuPriority + 1)] - internal static void CreateHDRenderPipelineGlobalSettings() - { - var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDRenderPipelineGlobalSettings.asset", icon, null); - } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs new file mode 100644 index 00000000000..b8e9f8c1c29 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs @@ -0,0 +1,36 @@ +using System.IO; +using UnityEngine; +using UnityEngine.Rendering.HighDefinition; +using UnityEngine.Rendering; + +namespace UnityEditor.Rendering.HighDefinition +{ + static partial class HDAssetFactory + { + internal class HDRenderPipelineGlobalSettingsCreator : UnityEditor.ProjectWindowCallback.EndNameEditAction + { + public override void Action(int instanceId, string pathName, string resourceFile) + { + var newAsset = HDRenderPipelineGlobalSettings.Create(pathName, settings); + HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(newAsset); + ProjectWindowUtil.ShowCreatedAsset(newAsset); + } + + static HDRenderPipelineGlobalSettings settings; + public static void Clone(HDRenderPipelineGlobalSettings src) + { + settings = src; + var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); + var assetCreator = ScriptableObject.CreateInstance(); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); + } + } + + [MenuItem("Assets/Create/Rendering/HDRP Global Settings Asset", priority = CoreUtils.Sections.section1 + CoreUtils.Priorities.assetsCreateRenderingMenuPriority + 1)] + internal static void CreateHDRenderPipelineGlobalSettings() + { + var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDRenderPipelineGlobalSettings.asset", icon, null); + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs.meta new file mode 100644 index 00000000000..9c5cfe7b5e1 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6aeec6dd71b38b2449702eb43417a3fa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 0ab2144bc487e7bc0812c22b80faf491542067cf Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 16 Feb 2021 15:19:17 +0100 Subject: [PATCH 14/58] Added a central place to change RPGlobalSettings's icon (CoreEditorStyles.globalSettingsIcon) --- com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs | 5 +++++ .../RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs b/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs index 4b1bfab6f2d..bb9644dd311 100644 --- a/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs +++ b/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs @@ -44,6 +44,9 @@ public static class CoreEditorStyles /// Hightlited background color. public static Color backgroundHighlightColor { get { return EditorGUIUtility.isProSkin ? m_DarkThemeBackgroundHighlightColor : m_LightThemeBackgroundHighlightColor; } } + /// RenderPipeline Global Settings icon + public static readonly Texture2D globalSettingsIcon; + static CoreEditorStyles() { smallTickbox = new GUIStyle("ShurikenToggle"); @@ -84,6 +87,8 @@ static CoreEditorStyles() var contextTooltip = ""; // To be defined (see with UX) contextMenuIcon = new GUIContent(paneOptionsIcon, contextTooltip); contextMenuStyle = new GUIStyle("IconButton"); + + globalSettingsIcon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs index b8e9f8c1c29..4be55a7e24c 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs @@ -20,7 +20,7 @@ public override void Action(int instanceId, string pathName, string resourceFile public static void Clone(HDRenderPipelineGlobalSettings src) { settings = src; - var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); + var icon = CoreEditorStyles.globalSettingsIcon; var assetCreator = ScriptableObject.CreateInstance(); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); } @@ -29,7 +29,7 @@ public static void Clone(HDRenderPipelineGlobalSettings src) [MenuItem("Assets/Create/Rendering/HDRP Global Settings Asset", priority = CoreUtils.Sections.section1 + CoreUtils.Priorities.assetsCreateRenderingMenuPriority + 1)] internal static void CreateHDRenderPipelineGlobalSettings() { - var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); + var icon = CoreEditorStyles.globalSettingsIcon; ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDRenderPipelineGlobalSettings.asset", icon, null); } } From de1c55b96edc3cd0c7f0d62cf5a543f0411f050a Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 16 Feb 2021 17:57:58 +0100 Subject: [PATCH 15/58] Refactored SerializedHDRenderPipelineGlobalSettings per Alex's PR review suggestions --- ...erializedHDRenderPipelineGlobalSettings.cs | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 7c2190a49de..625e2bc3440 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using UnityEditor.Rendering; using UnityEngine.Rendering.HighDefinition; using UnityEditorInternal; //ReorderableList @@ -45,27 +46,45 @@ class SerializedHDRenderPipelineGlobalSettings public SerializedProperty diffusionProfileSettingsList; //RenderPipelineResources not always exist and thus cannot be serialized normally. + bool? m_hasEditorResourceHasMultipleDifferentValues; public bool editorResourceHasMultipleDifferentValues { get { - var initialValue = firstEditorResources; - for (int index = 1; index < serializedObject.targetObjects.Length; ++index) + if (m_hasEditorResourceHasMultipleDifferentValues.HasValue) + return m_hasEditorResourceHasMultipleDifferentValues.Value; + + if (serializedObject.targetObjects.Length < 2) + { + m_hasEditorResourceHasMultipleDifferentValues = false; + } + else { - if (initialValue != (serializedObject.targetObjects[index] as HDRenderPipelineGlobalSettings)?.renderPipelineEditorResources) - return true; + m_hasEditorResourceHasMultipleDifferentValues = serializedSettings.Skip(1).Any(t => t.renderPipelineEditorResources != firstEditorResources); } - return false; + + return m_hasEditorResourceHasMultipleDifferentValues.Value; } } public HDRenderPipelineEditorResources firstEditorResources - => (serializedObject.targetObjects[0] as HDRenderPipelineGlobalSettings)?.renderPipelineEditorResources; + => serializedSettings[0]?.renderPipelineEditorResources; + + private List serializedSettings = new List(); public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObject) { this.serializedObject = serializedObject; + // do the cast only once + foreach (var currentSetting in serializedObject.targetObjects) + { + if (currentSetting is HDRenderPipelineGlobalSettings) + serializedSettings.Add(currentSetting as HDRenderPipelineGlobalSettings); + else + throw new Exception($"Target object has an invalid object, objects must be of type {typeof(HDRenderPipelineGlobalSettings)}"); + } + renderPipelineResources = serializedObject.FindProperty("m_RenderPipelineResources"); renderPipelineRayTracingResources = serializedObject.FindProperty("m_RenderPipelineRayTracingResources"); defaultFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultCameraFrameSettings"), null); //no overrides in HDRPAsset @@ -115,11 +134,8 @@ void InitializeCustomPostProcessesLists() var ppVolumeTypeInjectionPoints = new Dictionary(); var ppVolumeTypes = TypeCache.GetTypesDerivedFrom(); - foreach (var ppVolumeType in ppVolumeTypes) + foreach (var ppVolumeType in ppVolumeTypes.Where(t => !t.IsAbstract)) { - if (ppVolumeType.IsAbstract) - continue; - var comp = ScriptableObject.CreateInstance(ppVolumeType) as CustomPostProcessVolumeComponent; ppVolumeTypeInjectionPoints[ppVolumeType] = comp.injectionPoint; CoreUtils.Destroy(comp); From 801c1d7b86508e8986193b4c514e1ea8627d1086 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Wed, 17 Feb 2021 10:06:09 +0100 Subject: [PATCH 16/58] Small tweaks on SerializedHDRPGlobalSettings asset --- .../SerializedHDRenderPipelineGlobalSettings.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 625e2bc3440..d6718724f2d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -46,24 +46,24 @@ class SerializedHDRenderPipelineGlobalSettings public SerializedProperty diffusionProfileSettingsList; //RenderPipelineResources not always exist and thus cannot be serialized normally. - bool? m_hasEditorResourceHasMultipleDifferentValues; + bool? m_HasEditorResourceHasMultipleDifferentValues; public bool editorResourceHasMultipleDifferentValues { get { - if (m_hasEditorResourceHasMultipleDifferentValues.HasValue) - return m_hasEditorResourceHasMultipleDifferentValues.Value; + if (m_HasEditorResourceHasMultipleDifferentValues.HasValue) + return m_HasEditorResourceHasMultipleDifferentValues.Value; if (serializedObject.targetObjects.Length < 2) { - m_hasEditorResourceHasMultipleDifferentValues = false; + m_HasEditorResourceHasMultipleDifferentValues = false; } else { - m_hasEditorResourceHasMultipleDifferentValues = serializedSettings.Skip(1).Any(t => t.renderPipelineEditorResources != firstEditorResources); + m_HasEditorResourceHasMultipleDifferentValues = serializedSettings.Skip(1).Any(t => t.renderPipelineEditorResources != firstEditorResources); } - return m_hasEditorResourceHasMultipleDifferentValues.Value; + return m_HasEditorResourceHasMultipleDifferentValues.Value; } } @@ -79,8 +79,8 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec // do the cast only once foreach (var currentSetting in serializedObject.targetObjects) { - if (currentSetting is HDRenderPipelineGlobalSettings) - serializedSettings.Add(currentSetting as HDRenderPipelineGlobalSettings); + if (currentSetting is HDRenderPipelineGlobalSettings hdrpSettings) + serializedSettings.Add(hdrpSettings); else throw new Exception($"Target object has an invalid object, objects must be of type {typeof(HDRenderPipelineGlobalSettings)}"); } From c57ccc4a2b25007a9e5c1f14f5c7a5d803c425db Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 18 Feb 2021 12:13:03 +0100 Subject: [PATCH 17/58] Added Lens Attenuation Mode UI in Global Settings window --- .../Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs | 4 ++-- .../Settings/SerializedHDRenderPipelineGlobalSettings.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 60ca493f40a..ec4167c5141 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -433,9 +433,9 @@ static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serial static readonly CED.IDrawer LayerNamesSection = CED.Group( CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.generalSettingsLabel, Styles.sectionHeaderStyle)), CED.Group((serialized, owner) => EditorGUILayout.PropertyField(serialized.shaderVariantLogLevel, Styles.shaderVariantLogLevel)), + CED.Group((serialized, owner) => EditorGUILayout.PropertyField(serialized.lensAttenuation, Styles.lensAttenuationModeContent)), CED.Group(Drawer_LightLayerNames), - CED.Group(Drawer_DecalLayerNames)/*, - CED.Group((serialized,owner) => EditorGUILayout.PropertyField(serialized.lensAttenuation,Styles.lensAttenuationModeContent))*/ + CED.Group(Drawer_DecalLayerNames) ); static private bool m_ShowLightLayerNames = false; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index d6718724f2d..450f74cb346 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -117,7 +117,7 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec shaderVariantLogLevel = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.shaderVariantLogLevel); - lensAttenuation = serializedObject.FindProperty("m_LensAttenuation"); + lensAttenuation = serializedObject.FindProperty("lensAttenuationMode"); diffusionProfileSettingsList = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.diffusionProfileSettingsList); } From 2b2ddce21316fe58eb9b3d21b7a0b6d50b74f1e2 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 18 Feb 2021 13:07:39 +0100 Subject: [PATCH 18/58] Added doc and diffusion profile list UI in global settings panel --- .../Documentation~/Default-Settings-Window.md | 52 ++++++++++----- .../Documentation~/HDRP-Asset.md | 4 +- .../Settings/DefaultSettingsPanel.cs | 24 ++++++- ...erializedHDRenderPipelineGlobalSettings.cs | 12 ++++ .../RenderPipeline/HDRenderPipelineAsset.cs | 52 +-------------- ...DRenderPipelineGlobalSettings.Migration.cs | 2 +- .../HDRenderPipelineGlobalSettings.cs | 63 ++++++++++++++++--- 7 files changed, 134 insertions(+), 75 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md index 0e9979d1d8b..99a1151e372 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md @@ -1,32 +1,37 @@ # Default Settings tab -The High Definition Render Pipeline (HDRP) adds the HDRP Default Settings tab to Unity's Project Settings window. You can use this tab to set up default settings for certain features in your Project. You can: +The High Definition Render Pipeline (HDRP) adds the HDRP Default Settings tab to Unity's Graphics Settings window. You can use this tab to set up default settings for certain features in your Project. You can: -- Assign Render Pipeline resource Assets for your HDRP Project. +- Assign Render Pipeline Resources Assets for your HDRP Project. - Set the verboseness of Shader variant information that Unity writes to the Console window when you build your Project. - Set up default [Frame Settings](Frame-Settings.md) for [Cameras](HDRP-Camera.md) to use. - Assign and edit a default [Volume Profile](Volume-Profile.md). -The HDRP Default Settings tab is part of the Project Settings window. To get to this tab, select **Edit > Project Settings** and then, in the sidebar, click **HDRP Default Settings**. +The HDRP Default Settings tab is part of the Graphics Settings window. To get to this tab, select **Edit > Project Settings > Graphics** and then, in the sidebar, click **HDRP Settings**. -## General Settings + +## Resources + +Resources assets list the Shaders, Materials, Textures, and other Assets needed to operate the High Definition Render Pipeline. + +| **Property** | **Description** | +| --------------------------| ------------------------------------------------------------ | +| **Player Resources** | Stores references to Shaders and Materials that HDRP uses. When you build your Unity Project, HDRP embeds all of the resources that this Asset references. It allows you to set up multiple render pipelines in a Unity Project and, when you build the Project, Unity only embeds Shaders and Materials relevant for that pipeline. This is the Scriptable Render Pipeline equivalent of Unity’s Resources folder mechanism. When you create a new HDRP Global Settings Asset, Unity also creates one of these and references it in the new HDRP Global Settings Asset automatically.| +| **Ray Tracing Resources** | Stores references to Shaders and Materials that HDRP uses for Ray Tracing. Having these resources in a seperate asset file then the main pipeline resources allows HDRP to use less memory for applciations that don't support ray tracing. | +| **Editor Resources** | Stores reference resources for the Editor only. Unity does not include these when you build your Unity Project. When you create an HDRP Asset, Unity creates an HDRP Resources Asset, and the new HDRP Asset references it automatically. | | Property | Description | -| ------------------------------------- | ------------------------------------------------------------ | -| Render Pipeline Resources | Stores references to Shaders and Materials that HDRP uses. When you build your Unity Project, HDRP embeds all of the resources that this Asset references. It allows you to set up multiple render pipelines in a Unity Project and, when you build the Project, Unity only embeds Shaders and Materials relevant for that pipeline. This is the Scriptable Render Pipeline equivalent of Unity’s Resources folder mechanism. When you create a new HDRP Asset, Unity also creates one of these and references it in the new HDRP Asset automatically. | -| Render Pipeline Ray Tracing Resources | Stores references to Shaders and Materials that HDRP uses for Ray Tracing. Having these resources in a seperate asset file then the main pipeline resources allows HDRP to use less memory for applciations that don't support ray tracing. | -| Render Pipeline Editor Resources | Stores reference resources for the Editor only. Unity does not include these when you build your Unity Project. When you create an HDRP Asset, Unity creates an HDRP Resources Asset, and the new HDRP Asset references it automatically. | -| Shader Variant Log Level | Use the drop-down to select what information HDRP logs about Shader variants when you build your Unity Project. • Disabled: HDRP doesn’t log any Shader variant information.• Only HDRP Shaders: Only log Shader variant information for HDRP Shaders.• All Shaders: Log Shader variant information for every Shader type. | -| Lens Attenuation Mode | Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier, while a perfect lens has no attenuation and no energy is lost. | -| Light Layer Names | The name displayed on Lights and Meshes when using [Light Layers](Light-Layers.md). | -| Decal Layer Names | The name displayed on decals and Meshes when using [Decal Layers](Decal.md). | +| ------------------------------------- | ------------------------------------------------------------ || + ## Frame Settings [Frame Settings](Frame-Settings.md) control the rendering passes that Cameras make at runtime. This section allows you to set default Frame Settings that all Cameras use if you do not enable their Custom Frame Settings checkbox. For information about what each property does, see [Frame Settings](Frame-Settings.md). -## Volume Components + + +### Volume Profiles You can use this section to assign and edit a [Volume Profile](Volume-Profile.md) that [Volumes](Volumes.md) use by default in your Scenes. You do not need to create a Volume for this specific Volume Profile to be active, because HDRP always processes it as if it is assigned to a global Volume in the Scene, but with the lowest priority. This means that any Volume that you add to a Scene takes priority. @@ -34,7 +39,26 @@ The Default Volume Profile Asset references a Volume Profile in the HDRP Package The LookDev Volume Profile Asset references the Volume Profile that will be used in the [LookDev window](Look-Dev.md). It works the same way than the Default Volume profile except that in this asset you can't put a [Visual Environment Component](Override-Visual-Environment.md) or skies component because they are overwritten by the LookDev. -## Custom Post Process Orders + + +### Custom Post Processes Order Use this section to select which custom post processing effect will be used in the project and in which order they will be executed. You have one list per post processing injection point: `After Opaque And Sky`, `Before Post Process` and `After Post Process`. See the [Custom Post Process](Custom-Post-Process.md) documentation for more details. + + + +### Diffusion Profile List + +Use this section to select which custom Diffusion Profiles in view at the same time. To use more than 15 custom Diffusion Profiles in a Scene, you can use the Diffusion Profile Override inside a Volume. This allows you to specify which Diffusion Profiles to use in a certain area (or in the Scene if the Volume is global). + + + +### Miscellaneous + +| **Property** | **Description** | +| --------------------------| ------------------------------------------------------------ | +| Shader Variant Log Level | Use the drop-down to select what information HDRP logs about Shader variants when you build your Unity Project. • Disabled: HDRP doesn’t log any Shader variant information.• Only HDRP Shaders: Only log Shader variant information for HDRP Shaders.• All Shaders: Log Shader variant information for every Shader type. | +| Lens Attenuation Mode | Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier, while a perfect lens has no attenuation and no energy is lost. | +| Light Layer Names | The name displayed on Lights and Meshes when using [Light Layers](Light-Layers.md). | +| Decal Layer Names | The name displayed on decals and Meshes when using [Decal Layers](Decal.md). diff --git a/com.unity.render-pipelines.high-definition/Documentation~/HDRP-Asset.md b/com.unity.render-pipelines.high-definition/Documentation~/HDRP-Asset.md index bd13c0e981d..3c623f8f8ba 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/HDRP-Asset.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/HDRP-Asset.md @@ -28,7 +28,9 @@ Unity now uses the High Definition Render Pipeline (HDRP) in your Unity Project. You can create multiple HDRP Assets containing different settings. This is useful for Project that support multiple platforms, such as PC, Xbox One and PlayStation 4. In each HDRP Asset, you can change settings to suite the hardware of each platform and then assign the relevant one when building your Project for each platform. For more information on using creating HDRP Assets to target different platforms, see [Scalability in HDRP](Scalability-Manual.md). -To change which HDRP Asset your render pipeline uses, either manually select an HDRP Asset in the Graphics Settings window (as shown above), or use the GraphicsSettings.renderPipelineAsset property via script. +To change which HDRP Asset your render pipeline uses, either manually select an HDRP Asset in the active Quality Level of the Quality Settings window (as shown above), or use the QualitySettings.renderPipeline property via script. + +To change which HDRP Asset your render pipeline uses by default, either manually select an HDRP Asset in the Graphics Settings window (as shown above), or use the GraphicsSettings.renderPipelineAsset property via script. When you create an HDRP Asset, open it in the Inspector to edit its properties. diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index ec4167c5141..7430186a64d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -82,6 +82,9 @@ public class Styles internal static readonly GUIContent lensAttenuationModeContent = EditorGUIUtility.TrTextContent("Lens Attenuation Mode", "Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier."); + internal static readonly GUIContent diffusionProfileSettingsIntro = EditorGUIUtility.TrTextContent("The High Definition Render Pipeline(HDRP) allows you to use up to 15 custom Diffusion Profiles in view at the same time.To use more than 15 custom Diffusion Profiles in a Scene,you can use the Diffusion Profile Override inside a Volume.This allows you to specify which Diffusion Profiles to use in a certain area(or in the Scene if the Volume is global"); + internal static readonly GUIContent diffusionProfileSettingsLabel = EditorGUIUtility.TrTextContent("Diffusion Profile Assets"); + internal static GUIStyle sectionHeaderStyle = new GUIStyle(EditorStyles.boldLabel) { richText = true }; internal static GUIStyle introStyle = new GUIStyle(EditorStyles.largeLabel) { wordWrap = true }; } @@ -102,6 +105,8 @@ static DefaultSettingsPanelIMGUI() CED.Group((serialized, owner) => EditorGUILayout.Space()), CustomPostProcessesSection, CED.Group((serialized, owner) => EditorGUILayout.Space()), + DiffusionProfileSettingsSection, + CED.Group((serialized, owner) => EditorGUILayout.Space()), LayerNamesSection ); // fix init of selection along what is serialized @@ -115,7 +120,6 @@ static DefaultSettingsPanelIMGUI() SerializedHDRenderPipelineGlobalSettings serializedSettings; HDRenderPipelineGlobalSettings settingsSerialized; - DiffusionProfileSettingsListUI m_DiffusionProfileUI; public void DoGUI(string searchContext) { if (HDRenderPipeline.currentPipeline == null) @@ -333,6 +337,24 @@ static void Drawer_CustomPostProcess(SerializedHDRenderPipelineGlobalSettings se #endregion // Custom Post Processes + #region Diffusion Profile Settings List + + static readonly CED.IDrawer DiffusionProfileSettingsSection = CED.Group( + CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.diffusionProfileSettingsLabel, Styles.sectionHeaderStyle)), + CED.Group(Drawer_DiffusionProfileSettings) + ); + static void Drawer_DiffusionProfileSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) + { + if (m_verboseMode) + EditorGUILayout.LabelField(Styles.diffusionProfileSettingsIntro, Styles.introStyle); + using (new EditorGUI.IndentLevelScope()) + { + serialized.m_DiffusionProfileUI.OnGUI(serialized.diffusionProfileSettingsList); + } + } + + #endregion //Diffusion Profile Settings List + #region Volume Profiles static Editor m_CachedDefaultVolumeProfileEditor; static Editor m_CachedLookDevVolumeProfileEditor; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 450f74cb346..643ddcece30 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -119,6 +119,10 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec lensAttenuation = serializedObject.FindProperty("lensAttenuationMode"); diffusionProfileSettingsList = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.diffusionProfileSettingsList); + m_DiffusionProfileUI = new DiffusionProfileSettingsListUI() + { + drawElement = DrawDiffusionProfileElement + }; } internal ReorderableList uiBeforeTransparentCustomPostProcesses; @@ -193,5 +197,13 @@ void InitList(ref ReorderableList reorderableList, List customPostProces }; } } + + public DiffusionProfileSettingsListUI m_DiffusionProfileUI; + + void DrawDiffusionProfileElement(SerializedProperty element, Rect rect, int index) + { + EditorGUI.BeginChangeCheck(); + EditorGUI.ObjectField(rect, element, EditorGUIUtility.TrTextContent("Profile " + index)); + } } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 2a5f1d787b6..ed2c5b63be5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -43,12 +43,10 @@ protected override void OnValidate() if (GraphicsSettings.currentRenderPipeline == this) base.OnValidate(); - UpdateRenderingLayerNames(); - isInOnValidateCall = false; } - public HDRenderPipelineGlobalSettings defaultSettings => HDRenderPipelineGlobalSettings.instance; + HDRenderPipelineGlobalSettings defaultSettings => HDRenderPipelineGlobalSettings.instance; internal RenderPipelineResources renderPipelineResources { @@ -104,55 +102,9 @@ internal ReflectionSystemParameters reflectionSystemParameters [Obsolete("Use diffusionProfileSettingsList instead")] internal DiffusionProfileSettings diffusionProfileSettings; - void UpdateRenderingLayerNames() - { - m_RenderingLayerNames = new string[32]; - - m_RenderingLayerNames[0] = HDRenderPipelineGlobalSettings.instance.lightLayerName0; - m_RenderingLayerNames[1] = HDRenderPipelineGlobalSettings.instance.lightLayerName1; - m_RenderingLayerNames[2] = HDRenderPipelineGlobalSettings.instance.lightLayerName2; - m_RenderingLayerNames[3] = HDRenderPipelineGlobalSettings.instance.lightLayerName3; - m_RenderingLayerNames[4] = HDRenderPipelineGlobalSettings.instance.lightLayerName4; - m_RenderingLayerNames[5] = HDRenderPipelineGlobalSettings.instance.lightLayerName5; - m_RenderingLayerNames[6] = HDRenderPipelineGlobalSettings.instance.lightLayerName6; - m_RenderingLayerNames[7] = HDRenderPipelineGlobalSettings.instance.lightLayerName7; - - m_RenderingLayerNames[8] = HDRenderPipelineGlobalSettings.instance.decalLayerName0; - m_RenderingLayerNames[9] = HDRenderPipelineGlobalSettings.instance.decalLayerName1; - m_RenderingLayerNames[10] = HDRenderPipelineGlobalSettings.instance.decalLayerName2; - m_RenderingLayerNames[11] = HDRenderPipelineGlobalSettings.instance.decalLayerName3; - m_RenderingLayerNames[12] = HDRenderPipelineGlobalSettings.instance.decalLayerName4; - m_RenderingLayerNames[13] = HDRenderPipelineGlobalSettings.instance.decalLayerName5; - m_RenderingLayerNames[14] = HDRenderPipelineGlobalSettings.instance.decalLayerName6; - m_RenderingLayerNames[15] = HDRenderPipelineGlobalSettings.instance.decalLayerName7; - - // Unused - for (int i = 16; i < m_RenderingLayerNames.Length; ++i) - { - m_RenderingLayerNames[i] = string.Format("Unused {0}", i); - } - } - - // HDRP use GetRenderingLayerMaskNames to create its light linking system - // Mean here we define our name for light linking. - [System.NonSerialized] - string[] m_RenderingLayerNames; - string[] renderingLayerNames - { - get - { - if (m_RenderingLayerNames == null) - { - UpdateRenderingLayerNames(); - } - - return m_RenderingLayerNames; - } - } - /// Names used for display of rendering layer masks. public override string[] renderingLayerMaskNames - => renderingLayerNames; + => HDRenderPipelineGlobalSettings.instance.renderingLayerMaskNames; /// /// Names used for display of light layers. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs index 1152c8e0fc9..822bfa2a161 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.Migration.cs @@ -3,7 +3,7 @@ namespace UnityEngine.Rendering.HighDefinition { - public partial class HDRenderPipelineGlobalSettings : IVersionable + partial class HDRenderPipelineGlobalSettings : IVersionable { enum Version { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index ccaaa4704b5..4c5211e9aaa 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -30,7 +30,7 @@ enum LensAttenuationMode /// - Frame Settings applied by default to Camera, ReflectionProbe /// - Various resources (such as Shaders) for runtime, editor-only, and raytracing /// - public partial class HDRenderPipelineGlobalSettings : RenderPipelineGlobalSettings + partial class HDRenderPipelineGlobalSettings : RenderPipelineGlobalSettings { private static HDRenderPipelineGlobalSettings cachedInstance = null; public static HDRenderPipelineGlobalSettings instance @@ -43,7 +43,7 @@ public static HDRenderPipelineGlobalSettings instance } } - static public void UpdateGraphicsSettings(HDRenderPipelineGlobalSettings newSettings) + static internal void UpdateGraphicsSettings(HDRenderPipelineGlobalSettings newSettings) { if (newSettings == null || newSettings == cachedInstance) return; @@ -53,7 +53,7 @@ static public void UpdateGraphicsSettings(HDRenderPipelineGlobalSettings newSett #if UNITY_EDITOR //Making sure there is at least one HDRenderPipelineGlobalSettings instance in the project - static public HDRenderPipelineGlobalSettings Ensure() + static internal HDRenderPipelineGlobalSettings Ensure() { if (HDRenderPipelineGlobalSettings.instance) return HDRenderPipelineGlobalSettings.instance; @@ -117,6 +117,8 @@ void Init() decalLayerName6 = "Decal Layer 6"; decalLayerName7 = "Decal Layer 7"; + UpdateRenderingLayerNames(); + shaderVariantLogLevel = ShaderVariantLogLevel.Disabled; #if UNITY_EDITOR @@ -618,7 +620,7 @@ internal bool AreRayTracingResourcesCreated() #endregion - #region Layer Names [LIGHT] + #region Rendering Layer Names [Light + Decal] /// Name for light layer 0. public string lightLayerName0; @@ -665,10 +667,6 @@ public string[] lightLayerNames } } - #endregion - - #region Layer Names [DECAL] - /// Name for decal layer 0. public string decalLayerName0; /// Name for decal layer 1. @@ -712,6 +710,55 @@ public string[] decalLayerNames return m_DecalLayerNames; } } + + + // HDRP use GetRenderingLayerMaskNames to create its light linking system + // Mean here we define our name for light linking. + [System.NonSerialized] + string[] m_RenderingLayerNames; + string[] renderingLayerNames + { + get + { + if (m_RenderingLayerNames == null) + { + UpdateRenderingLayerNames(); + } + + return m_RenderingLayerNames; + } + } + public string[] renderingLayerMaskNames => renderingLayerNames; + + void UpdateRenderingLayerNames() + { + m_RenderingLayerNames = new string[32]; + + m_RenderingLayerNames[0] = HDRenderPipelineGlobalSettings.instance.lightLayerName0; + m_RenderingLayerNames[1] = HDRenderPipelineGlobalSettings.instance.lightLayerName1; + m_RenderingLayerNames[2] = HDRenderPipelineGlobalSettings.instance.lightLayerName2; + m_RenderingLayerNames[3] = HDRenderPipelineGlobalSettings.instance.lightLayerName3; + m_RenderingLayerNames[4] = HDRenderPipelineGlobalSettings.instance.lightLayerName4; + m_RenderingLayerNames[5] = HDRenderPipelineGlobalSettings.instance.lightLayerName5; + m_RenderingLayerNames[6] = HDRenderPipelineGlobalSettings.instance.lightLayerName6; + m_RenderingLayerNames[7] = HDRenderPipelineGlobalSettings.instance.lightLayerName7; + + m_RenderingLayerNames[8] = HDRenderPipelineGlobalSettings.instance.decalLayerName0; + m_RenderingLayerNames[9] = HDRenderPipelineGlobalSettings.instance.decalLayerName1; + m_RenderingLayerNames[10] = HDRenderPipelineGlobalSettings.instance.decalLayerName2; + m_RenderingLayerNames[11] = HDRenderPipelineGlobalSettings.instance.decalLayerName3; + m_RenderingLayerNames[12] = HDRenderPipelineGlobalSettings.instance.decalLayerName4; + m_RenderingLayerNames[13] = HDRenderPipelineGlobalSettings.instance.decalLayerName5; + m_RenderingLayerNames[14] = HDRenderPipelineGlobalSettings.instance.decalLayerName6; + m_RenderingLayerNames[15] = HDRenderPipelineGlobalSettings.instance.decalLayerName7; + + // Unused + for (int i = 16; i < m_RenderingLayerNames.Length; ++i) + { + m_RenderingLayerNames[i] = string.Format("Unused {0}", i); + } + } + #endregion #region Misc. From a4b523d7fa92b193633767b9cb7b1c189ca91437 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 18 Feb 2021 13:08:30 +0100 Subject: [PATCH 19/58] [Doc] Renamed Default Settings page to Global Settings window --- .../Documentation~/Default-Settings-Window.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md index 99a1151e372..6c1ca66a742 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md @@ -1,4 +1,4 @@ -# Default Settings tab +# HDRP Global Settings Window The High Definition Render Pipeline (HDRP) adds the HDRP Default Settings tab to Unity's Graphics Settings window. You can use this tab to set up default settings for certain features in your Project. You can: From f952d179d2bf00cee916b688bbabaad6eebc5b81 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 18 Feb 2021 13:25:41 +0100 Subject: [PATCH 20/58] Added comment to the Upgrade guide --- .../Documentation~/Upgrading-from-2021.1-to-2021.2.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md index 864d13eca8c..5370af1f820 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md @@ -3,3 +3,7 @@ ## Shader code From 2021.2, if material ambient occlusion needs to be applied to probe volume GI and the material is deferred, the material needs to define `HAS_PAYLOAD_WITH_UNINIT_GI` constant and a function `float GetUninitializedGIPayload(SurfaceData surfaceData)` that returns the AO factor that is desired to be applied. No action is needed for forward only materials or if no material AO needs to be applied to probe volume GI. + +## HDRP Global Settings + +From 2021.2, the GraphicsSettings's assigned HDRP Asset no longer acts as the defaultAsset for HDRP. A new Asset called HDRP Global Settings has been added to save settings unrelated to which HDRP Asset is active. From 2d00ff5997cbd61b7b7a6bc4dd3afb450b4ef36d Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 18 Feb 2021 16:37:16 +0100 Subject: [PATCH 21/58] Fixed Composition manager registration of CustomPP on global settings --- ...erializedHDRenderPipelineGlobalSettings.cs | 18 +++++----- .../Runtime/Compositor/CompositionManager.cs | 36 ++++++++++++++----- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 643ddcece30..80bdf7bb733 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -45,6 +45,11 @@ class SerializedHDRenderPipelineGlobalSettings public SerializedProperty lensAttenuation; public SerializedProperty diffusionProfileSettingsList; + internal ReorderableList uiBeforeTransparentCustomPostProcesses; + internal ReorderableList uiBeforeTAACustomPostProcesses; + internal ReorderableList uiBeforePostProcessCustomPostProcesses; + internal ReorderableList uiAfterPostProcessCustomPostProcesses; + //RenderPipelineResources not always exist and thus cannot be serialized normally. bool? m_HasEditorResourceHasMultipleDifferentValues; public bool editorResourceHasMultipleDifferentValues @@ -91,7 +96,6 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec defaultBakedOrCustomReflectionFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings"), null); //no overrides in HDRPAsset defaultRealtimeReflectionFrameSettings = new SerializedFrameSettings(serializedObject.FindProperty("m_RenderingPathDefaultRealtimeReflectionFrameSettings"), null); //no overrides in HDRPAsset - // We are using ReorderableList for the UI. Since the integration with SerializedProperty is still WIP, in the meantime we will not use one InitializeCustomPostProcessesLists(); volumeProfileDefault = serializedObject.FindProperty("m_VolumeProfileDefault"); @@ -125,16 +129,8 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec }; } - internal ReorderableList uiBeforeTransparentCustomPostProcesses; - internal ReorderableList uiBeforeTAACustomPostProcesses; - internal ReorderableList uiBeforePostProcessCustomPostProcesses; - internal ReorderableList uiAfterPostProcessCustomPostProcesses; - void InitializeCustomPostProcessesLists() { - if (uiBeforeTransparentCustomPostProcesses != null) - return; - var ppVolumeTypeInjectionPoints = new Dictionary(); var ppVolumeTypes = TypeCache.GetTypesDerivedFrom(); @@ -144,6 +140,7 @@ void InitializeCustomPostProcessesLists() ppVolumeTypeInjectionPoints[ppVolumeType] = comp.injectionPoint; CoreUtils.Destroy(comp); } + var globalSettings = serializedObject.targetObject as HDRenderPipelineGlobalSettings; InitList(ref uiBeforeTransparentCustomPostProcesses, globalSettings.beforeTransparentCustomPostProcesses, "After Opaque And Sky", CustomPostProcessInjectionPoint.AfterOpaqueAndSky); InitList(ref uiBeforePostProcessCustomPostProcesses, globalSettings.beforePostProcessCustomPostProcesses, "Before Post Process", CustomPostProcessInjectionPoint.BeforePostProcess); @@ -174,6 +171,8 @@ void InitList(ref ReorderableList reorderableList, List customPostProces menu.AddItem(new GUIContent(kp.Key.ToString()), false, () => { Undo.RegisterCompleteObjectUndo(serializedObject.targetObject, $"Added {kp.Key.ToString()} Custom Post Process"); + + Debug.Log("Added {kp.Key.ToString()} Custom Post Process"); customPostProcessTypes.Add(kp.Key.AssemblyQualifiedName); }); } @@ -187,6 +186,7 @@ void InitList(ref ReorderableList reorderableList, List customPostProces reorderableList.onRemoveCallback = (list) => { Undo.RegisterCompleteObjectUndo(serializedObject.targetObject, $"Removed {list.list[list.index].ToString()} Custom Post Process"); + Debug.Log("Removed {list.list[list.index].ToString()} Custom Post Process"); customPostProcessTypes.RemoveAt(list.index); EditorUtility.SetDirty(serializedObject.targetObject); }; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index 1f4311f6c20..59dd32c2c11 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -491,6 +491,8 @@ public void UpdateLayerSetup() SetupLayerPriorities(); } + static HDRenderPipelineGlobalSettings m_globalSettings; + // Update is called once per frame void Update() { @@ -928,29 +930,47 @@ static internal RenderTexture GetClearDepthForStackedCamera(HDCamera hdCamera) // Register the custom pp passes used by the compositor static internal void RegisterCustomPasses() { + if (m_globalSettings != HDRenderPipelineGlobalSettings.instance) + { + UnRegisterCustomPasses(); + m_globalSettings = null; + } + + if (m_globalSettings == null) + m_globalSettings = HDRenderPipelineGlobalSettings.instance; + if (m_globalSettings == null) // if the global settings are not ready let us early out for this frame + return; + + if (m_globalSettings.beforePostProcessCustomPostProcesses == null) // global settings may not be ready yet + return; + // If custom post processes are not registered in the HDRP asset, they are never executed so we have to add them manually - if (!HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) + if (!m_globalSettings.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { - HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); + m_globalSettings.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); + Debug.Log("Adding ChromaKeying to beforePostProcessCustomPostProcesses"); } - if (!HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) + if (!m_globalSettings.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) { - HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); + m_globalSettings.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); } } // Unregister the custom pp passes used by the compositor static internal void UnRegisterCustomPasses() { - if (HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) + if (m_globalSettings == null || m_globalSettings.beforePostProcessCustomPostProcesses == null) // global settings may not be ready yet + return; + + if (m_globalSettings.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { - HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Remove(typeof(ChromaKeying).AssemblyQualifiedName); + m_globalSettings.beforePostProcessCustomPostProcesses.Remove(typeof(ChromaKeying).AssemblyQualifiedName); } - if (HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) + if (m_globalSettings.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) { - HDRenderPipelineGlobalSettings.instance.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName); + m_globalSettings.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName); } } } From cbba986a37d7f1eae239e5508422a7cbcd5cda22 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 18 Feb 2021 17:50:52 +0100 Subject: [PATCH 22/58] Removing log --- .../Runtime/Compositor/CompositionManager.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index 59dd32c2c11..2ac2b4376f3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -948,7 +948,6 @@ static internal void RegisterCustomPasses() if (!m_globalSettings.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { m_globalSettings.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); - Debug.Log("Adding ChromaKeying to beforePostProcessCustomPostProcesses"); } if (!m_globalSettings.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) From 6e9137edfe37e99681e415cf63f08edf67588a93 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 19 Feb 2021 13:43:48 +0100 Subject: [PATCH 23/58] Removed log --- .../Settings/SerializedHDRenderPipelineGlobalSettings.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 80bdf7bb733..449b6acef9d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -171,8 +171,6 @@ void InitList(ref ReorderableList reorderableList, List customPostProces menu.AddItem(new GUIContent(kp.Key.ToString()), false, () => { Undo.RegisterCompleteObjectUndo(serializedObject.targetObject, $"Added {kp.Key.ToString()} Custom Post Process"); - - Debug.Log("Added {kp.Key.ToString()} Custom Post Process"); customPostProcessTypes.Add(kp.Key.AssemblyQualifiedName); }); } @@ -186,7 +184,6 @@ void InitList(ref ReorderableList reorderableList, List customPostProces reorderableList.onRemoveCallback = (list) => { Undo.RegisterCompleteObjectUndo(serializedObject.targetObject, $"Removed {list.list[list.index].ToString()} Custom Post Process"); - Debug.Log("Removed {list.list[list.index].ToString()} Custom Post Process"); customPostProcessTypes.RemoveAt(list.index); EditorUtility.SetDirty(serializedObject.targetObject); }; From cb0d12c2ad009313127289deec5d802e87426966 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 19 Feb 2021 17:22:59 +0100 Subject: [PATCH 24/58] Fixed rendering layers migration --- .../HDRenderPipelineGlobalSettings.cs | 102 +++++++++--------- .../Settings/RenderPipelineSettings.cs | 49 ++++++--- 2 files changed, 84 insertions(+), 67 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 4c5211e9aaa..f105ff1406f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -167,23 +167,23 @@ internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipe assetCreated.afterPostProcessCustomPostProcesses.AddRange(oldAsset.m_ObsoleteAfterPostProcessCustomPostProcesses); assetCreated.beforeTAACustomPostProcesses.AddRange(oldAsset.m_ObsoleteBeforeTAACustomPostProcesses); - assetCreated.lightLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0; - assetCreated.lightLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1; - assetCreated.lightLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2; - assetCreated.lightLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3; - assetCreated.lightLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4; - assetCreated.lightLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5; - assetCreated.lightLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6; - assetCreated.lightLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7; - - assetCreated.decalLayerName0 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0; - assetCreated.decalLayerName1 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1; - assetCreated.decalLayerName2 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2; - assetCreated.decalLayerName3 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3; - assetCreated.decalLayerName4 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4; - assetCreated.decalLayerName5 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5; - assetCreated.decalLayerName6 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6; - assetCreated.decalLayerName7 = oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7; + assetCreated.lightLayerName0 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0); + assetCreated.lightLayerName1 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1); + assetCreated.lightLayerName2 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2); + assetCreated.lightLayerName3 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3); + assetCreated.lightLayerName4 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4); + assetCreated.lightLayerName5 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5); + assetCreated.lightLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6); + assetCreated.lightLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7); + + assetCreated.decalLayerName0 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0); + assetCreated.decalLayerName1 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1); + assetCreated.decalLayerName2 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2); + assetCreated.decalLayerName3 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3); + assetCreated.decalLayerName4 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4); + assetCreated.decalLayerName5 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5); + assetCreated.decalLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6); + assetCreated.decalLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7); assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; @@ -248,23 +248,23 @@ internal static HDRenderPipelineGlobalSettings Create(string path, HDRenderPipel assetCreated.afterPostProcessCustomPostProcesses.AddRange(src.afterPostProcessCustomPostProcesses); assetCreated.beforeTAACustomPostProcesses.AddRange(src.beforeTAACustomPostProcesses); - assetCreated.lightLayerName0 = src.lightLayerName0; - assetCreated.lightLayerName1 = src.lightLayerName1; - assetCreated.lightLayerName2 = src.lightLayerName2; - assetCreated.lightLayerName3 = src.lightLayerName3; - assetCreated.lightLayerName4 = src.lightLayerName4; - assetCreated.lightLayerName5 = src.lightLayerName5; - assetCreated.lightLayerName6 = src.lightLayerName6; - assetCreated.lightLayerName7 = src.lightLayerName7; - - assetCreated.decalLayerName0 = src.decalLayerName0; - assetCreated.decalLayerName1 = src.decalLayerName1; - assetCreated.decalLayerName2 = src.decalLayerName2; - assetCreated.decalLayerName3 = src.decalLayerName3; - assetCreated.decalLayerName4 = src.decalLayerName4; - assetCreated.decalLayerName5 = src.decalLayerName5; - assetCreated.decalLayerName6 = src.decalLayerName6; - assetCreated.decalLayerName7 = src.decalLayerName7; + assetCreated.lightLayerName0 = System.String.Copy(src.lightLayerName0); + assetCreated.lightLayerName1 = System.String.Copy(src.lightLayerName1); + assetCreated.lightLayerName2 = System.String.Copy(src.lightLayerName2); + assetCreated.lightLayerName3 = System.String.Copy(src.lightLayerName3); + assetCreated.lightLayerName4 = System.String.Copy(src.lightLayerName4); + assetCreated.lightLayerName5 = System.String.Copy(src.lightLayerName5); + assetCreated.lightLayerName6 = System.String.Copy(src.lightLayerName6); + assetCreated.lightLayerName7 = System.String.Copy(src.lightLayerName7); + + assetCreated.decalLayerName0 = System.String.Copy(src.decalLayerName0); + assetCreated.decalLayerName1 = System.String.Copy(src.decalLayerName1); + assetCreated.decalLayerName2 = System.String.Copy(src.decalLayerName2); + assetCreated.decalLayerName3 = System.String.Copy(src.decalLayerName3); + assetCreated.decalLayerName4 = System.String.Copy(src.decalLayerName4); + assetCreated.decalLayerName5 = System.String.Copy(src.decalLayerName5); + assetCreated.decalLayerName6 = System.String.Copy(src.decalLayerName6); + assetCreated.decalLayerName7 = System.String.Copy(src.decalLayerName7); assetCreated.shaderVariantLogLevel = src.shaderVariantLogLevel; assetCreated.lensAttenuationMode = src.lensAttenuationMode; @@ -734,23 +734,23 @@ void UpdateRenderingLayerNames() { m_RenderingLayerNames = new string[32]; - m_RenderingLayerNames[0] = HDRenderPipelineGlobalSettings.instance.lightLayerName0; - m_RenderingLayerNames[1] = HDRenderPipelineGlobalSettings.instance.lightLayerName1; - m_RenderingLayerNames[2] = HDRenderPipelineGlobalSettings.instance.lightLayerName2; - m_RenderingLayerNames[3] = HDRenderPipelineGlobalSettings.instance.lightLayerName3; - m_RenderingLayerNames[4] = HDRenderPipelineGlobalSettings.instance.lightLayerName4; - m_RenderingLayerNames[5] = HDRenderPipelineGlobalSettings.instance.lightLayerName5; - m_RenderingLayerNames[6] = HDRenderPipelineGlobalSettings.instance.lightLayerName6; - m_RenderingLayerNames[7] = HDRenderPipelineGlobalSettings.instance.lightLayerName7; - - m_RenderingLayerNames[8] = HDRenderPipelineGlobalSettings.instance.decalLayerName0; - m_RenderingLayerNames[9] = HDRenderPipelineGlobalSettings.instance.decalLayerName1; - m_RenderingLayerNames[10] = HDRenderPipelineGlobalSettings.instance.decalLayerName2; - m_RenderingLayerNames[11] = HDRenderPipelineGlobalSettings.instance.decalLayerName3; - m_RenderingLayerNames[12] = HDRenderPipelineGlobalSettings.instance.decalLayerName4; - m_RenderingLayerNames[13] = HDRenderPipelineGlobalSettings.instance.decalLayerName5; - m_RenderingLayerNames[14] = HDRenderPipelineGlobalSettings.instance.decalLayerName6; - m_RenderingLayerNames[15] = HDRenderPipelineGlobalSettings.instance.decalLayerName7; + m_RenderingLayerNames[0] = lightLayerName0; + m_RenderingLayerNames[1] = lightLayerName1; + m_RenderingLayerNames[2] = lightLayerName2; + m_RenderingLayerNames[3] = lightLayerName3; + m_RenderingLayerNames[4] = lightLayerName4; + m_RenderingLayerNames[5] = lightLayerName5; + m_RenderingLayerNames[6] = lightLayerName6; + m_RenderingLayerNames[7] = lightLayerName7; + + m_RenderingLayerNames[8] = decalLayerName0; + m_RenderingLayerNames[9] = decalLayerName1; + m_RenderingLayerNames[10] = decalLayerName2; + m_RenderingLayerNames[11] = decalLayerName3; + m_RenderingLayerNames[12] = decalLayerName4; + m_RenderingLayerNames[13] = decalLayerName5; + m_RenderingLayerNames[14] = decalLayerName6; + m_RenderingLayerNames[15] = decalLayerName7; // Unused for (int i = 16; i < m_RenderingLayerNames.Length; ++i) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs index f66d8d0c567..b67b7efb83d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/RenderPipelineSettings.cs @@ -1,5 +1,6 @@ using System; using UnityEngine.Experimental.Rendering; +using UnityEngine.Serialization; namespace UnityEngine.Rendering.HighDefinition { @@ -358,38 +359,54 @@ public string decalLayerName7 [Obsolete("For data migration")] internal bool m_ObsoleteincreaseSssSampleCount; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName0"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName0; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName1"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName1; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName2"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName2; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName3"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName3; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName4"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName4; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName5"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName5; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName6"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName6; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("lightLayerName7"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteLightLayerName7; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName0"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName0; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName1"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName1; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName2"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName2; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName3"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName3; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName4"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName4; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName5"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName5; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName6"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName6; - [Obsolete("Moved to HDGlobal Settings")] + [SerializeField] + [FormerlySerializedAs("decalLayerName7"), Obsolete("Moved to HDGlobal Settings")] internal string m_ObsoleteDecalLayerName7; #pragma warning restore 618 } From 31e1db79148abe193fe9c67ab64fdff20c3efabe Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 09:50:36 +0100 Subject: [PATCH 25/58] Added a bool flag on the HDRenderPipeline to know when it is ready to be used --- .../Lighting/VolumetricLighting/DensityVolumeManager.cs | 2 +- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 2 ++ .../RenderPipeline/HDRenderPipelineAsset.Migration.cs | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs index 862bc20c59c..1207ec43fd9 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/DensityVolumeManager.cs @@ -23,7 +23,7 @@ public Texture3DAtlas volumeAtlas { get { - if (m_VolumeAtlas == null && HDRenderPipeline.currentAsset != null) + if (m_VolumeAtlas == null && HDRenderPipeline.isReady) { var settings = HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.lightLoopSettings; 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 55bdf952f17..24da118908d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -36,6 +36,8 @@ internal static HDRenderPipelineAsset currentAsset internal static HDRenderPipeline currentPipeline => RenderPipelineManager.currentPipeline is HDRenderPipeline hdrp ? hdrp : null; + internal static bool isReady => HDRenderPipeline.currentAsset != null && HDRenderPipelineGlobalSettings.instance != null; + internal static bool pipelineSupportsRayTracing => HDRenderPipeline.currentPipeline != null && HDRenderPipeline.currentPipeline.rayTracingSupported; internal static bool pipelineSupportsScreenSpaceShadows => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.supportScreenSpaceShadows : false; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs index a8162fae1bb..d2cf11b3e56 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs @@ -177,7 +177,13 @@ enum Version Version m_Version = MigrationDescription.LastVersion(); Version IVersionable.version { get => m_Version; set => m_Version = value; } - void OnEnable() => k_Migration.Migrate(this); + void OnEnable() + { +#if UNITY_EDITOR + HDRenderPipelineGlobalSettings.Ensure(); +#endif + k_Migration.Migrate(this); + } #pragma warning disable 618 // Type or member is obsolete [SerializeField] From 46b65e036517edf89eda0135a3b2a2e3ffb6982d Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 09:52:53 +0100 Subject: [PATCH 26/58] Removed HDRPGlobalSettings.Ensure() call from resources getter --- .../Runtime/RenderPipeline/HDRenderPipelineAsset.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index ed2c5b63be5..1b9b0b9f1b7 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -50,7 +50,7 @@ protected override void OnValidate() internal RenderPipelineResources renderPipelineResources { - get { return HDRenderPipelineGlobalSettings.Ensure().renderPipelineResources; } + get { return defaultSettings.renderPipelineResources; } set { defaultSettings.renderPipelineResources = value; } } From e44143d3c4d4f2cf971658117ed6ce10fff5bfe5 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 11:30:10 +0100 Subject: [PATCH 27/58] Fixed HDRP's Wizard volume profile --- .../Editor/Wizard/HDWizard.Configuration.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index 56e92d4691c..9b013504961 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -456,18 +456,18 @@ void FixHdrpAssetDiffusionProfile(bool fromAsyncUnused) } bool IsDefaultVolumeProfileAssigned() - => IsHdrpAssetUsedCorrect() && HDRenderPipelineGlobalSettings.instance.IsVolumeProfileFromResources(); + => IsHdrpAssetUsedCorrect() && HDRenderPipelineGlobalSettings.instance.volumeProfile != null; void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) { if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - var hdrpAsset = HDRenderPipeline.currentAsset; - if (hdrpAsset == null) + var hdrpSettings = HDRenderPipelineGlobalSettings.instance; + if (hdrpSettings == null) return; - VolumeProfile defaultSettingsVolumeProfileInPackage = HDRenderPipelineGlobalSettings.instance.renderPipelineEditorResources.defaultSettingsVolumeProfile; + VolumeProfile defaultSettingsVolumeProfileInPackage = hdrpSettings.renderPipelineEditorResources.defaultSettingsVolumeProfile; string defaultSettingsVolumeProfilePath = "Assets/" + HDProjectSettings.projectSettingsFolderPath + '/' + defaultSettingsVolumeProfileInPackage.name + ".asset"; //try load one if one already exist @@ -480,7 +480,7 @@ void FixDefaultVolumeProfileAssigned(bool fromAsyncUnused) } HDRenderPipelineGlobalSettings.instance.volumeProfile = defaultSettingsVolumeProfile; - EditorUtility.SetDirty(hdrpAsset); + EditorUtility.SetDirty(hdrpSettings); } #endregion From 2ab435361a46e8b37f54514dfe08dee006fb31f3 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 12:37:51 +0100 Subject: [PATCH 28/58] [Fix] Runtime Resources now properly loaded on HDRP Global Settings asset creation + if globalsettings is removed from build one is automatically created --- .../Editor/Wizard/HDWizard.Configuration.cs | 2 +- .../RenderPipeline/HDRenderPipeline.cs | 11 +++++++++- .../HDRenderPipelineGlobalSettings.cs | 22 +++++++------------ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index 9b013504961..e4410b3d19f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -397,7 +397,7 @@ void FixHdrpAssetRuntimeResources(bool fromAsyncUnused) if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDRenderPipelineGlobalSettings.instance.EnsureResources(forceReload: true); + HDRenderPipelineGlobalSettings.instance.EnsureRuntimeResources(forceReload: true); } bool IsHdrpAssetEditorResourcesCorrect() 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 24da118908d..6fede1764a5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -454,7 +454,7 @@ void UpgradeResourcesIfNeeded() m_Asset.EvaluateSettings(); // Check that the serialized Resources are not broken - m_globalSettings.EnsureResources(forceReload: true); + m_globalSettings.EnsureRuntimeResources(forceReload: true); m_globalSettings.EnsureEditorResources(forceReload: true); if (m_RayTracingSupported) @@ -1014,6 +1014,15 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c #endif return; +#if UNITY_EDITOR + if (m_globalSettings == null) + { + Debug.LogError("No HDRP Global Settings Asset is assigned. One will be created for you. If you want to modify it, go to Project Settings > Graphics > HDRP Settings."); + m_globalSettings = HDRenderPipelineGlobalSettings.Ensure(); + m_globalSettings.EnsureShadersCompiled(); + return; + } +#endif m_globalSettings.GetOrCreateDefaultVolume(); // This function should be called once every render (once for all camera) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index f105ff1406f..00ba2e9b64b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -75,11 +75,7 @@ static internal HDRenderPipelineGlobalSettings Ensure() { if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); - assetCreated = ScriptableObject.CreateInstance(); - AssetDatabase.CreateAsset(assetCreated, path); - assetCreated.Init(); - AssetDatabase.SaveAssets(); - AssetDatabase.Refresh(); + assetCreated = Create(path); } } Debug.Assert(assetCreated, "Could not create HDRP's Global Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); @@ -275,7 +271,7 @@ internal static HDRenderPipelineGlobalSettings Create(string path, HDRenderPipel } else { - assetCreated.EnsureResources(forceReload: false); + assetCreated.EnsureRuntimeResources(forceReload: false); assetCreated.EnsureRayTracingResources(forceReload: false); assetCreated.GetOrCreateDefaultVolumeProfile(); assetCreated.GetOrAssignLookDevVolumeProfile(); @@ -441,18 +437,12 @@ internal ref FrameSettings GetDefaultFrameSettings(FrameSettingsRenderType type) internal RenderPipelineResources renderPipelineResources { - get - { -#if UNITY_EDITOR - EnsureResources(forceReload: false); -#endif - return m_RenderPipelineResources; - } + get => m_RenderPipelineResources; set { m_RenderPipelineResources = value; } } #if UNITY_EDITOR - internal void EnsureResources(bool forceReload) + internal void EnsureRuntimeResources(bool forceReload) { if (AreResourcesCreated()) return; @@ -471,6 +461,10 @@ internal void EnsureResources(bool forceReload) true); } } + else if (!EditorUtility.IsPersistent(m_RenderPipelineResources)) + { + m_RenderPipelineResources = AssetDatabase.LoadAssetAtPath(runtimeResourcesPath); + } } #endif From 40faa7c54d115587c4f8a4d2bab831e86ae14616 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 13:38:40 +0100 Subject: [PATCH 29/58] [Fix] Making sure folder exists before creating HDRP Global Settings asset --- .../HDRenderPipelineGlobalSettingsCreator.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs index 4be55a7e24c..7665b9d9b67 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs @@ -22,7 +22,12 @@ public static void Clone(HDRenderPipelineGlobalSettings src) settings = src; var icon = CoreEditorStyles.globalSettingsIcon; var assetCreator = ScriptableObject.CreateInstance(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{src.name}.asset", icon, null); + + if (!AssetDatabase.IsValidFolder("Assets/" + HDProjectSettings.projectSettingsFolderPath)) + AssetDatabase.CreateFolder("Assets", HDProjectSettings.projectSettingsFolderPath); + var path = "Assets/" + HDProjectSettings.projectSettingsFolderPath + "/" + src.name + ".asset"; + + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, path, icon, null); } } @@ -30,7 +35,12 @@ public static void Clone(HDRenderPipelineGlobalSettings src) internal static void CreateHDRenderPipelineGlobalSettings() { var icon = CoreEditorStyles.globalSettingsIcon; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), $"Assets/{HDProjectSettings.projectSettingsFolderPath}/HDRenderPipelineGlobalSettings.asset", icon, null); + + if (!AssetDatabase.IsValidFolder("Assets/" + HDProjectSettings.projectSettingsFolderPath)) + AssetDatabase.CreateFolder("Assets", HDProjectSettings.projectSettingsFolderPath); + var path = "Assets/" + HDProjectSettings.projectSettingsFolderPath + "/HDRenderPipelineGlobalSettings.asset"; + + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), path, icon, null); } } } From c4ead1e2300517ec6915679ef58e615b5cad2b56 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 14:18:47 +0100 Subject: [PATCH 30/58] [Fix] Fixed doc typo --- .../Documentation~/Default-Settings-Window.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md index 6c1ca66a742..34b8c80ce2c 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md @@ -1,13 +1,13 @@ # HDRP Global Settings Window -The High Definition Render Pipeline (HDRP) adds the HDRP Default Settings tab to Unity's Graphics Settings window. You can use this tab to set up default settings for certain features in your Project. You can: +The High Definition Render Pipeline (HDRP) adds the HDRP Settings tab to Unity's Graphics Settings window. You can use this tab to set up default settings for certain features in your Project. You can: - Assign Render Pipeline Resources Assets for your HDRP Project. - Set the verboseness of Shader variant information that Unity writes to the Console window when you build your Project. - Set up default [Frame Settings](Frame-Settings.md) for [Cameras](HDRP-Camera.md) to use. - Assign and edit a default [Volume Profile](Volume-Profile.md). -The HDRP Default Settings tab is part of the Graphics Settings window. To get to this tab, select **Edit > Project Settings > Graphics** and then, in the sidebar, click **HDRP Settings**. +The HDRP Settings tab is part of the Graphics Settings window. To get to this tab, select **Edit > Project Settings > Graphics** and then, in the sidebar, click **HDRP Settings**. ## Resources From 3b345b1ec441bebd1bd56ca41b9db4711b372a9b Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 14:24:49 +0100 Subject: [PATCH 31/58] Revived public API that was removed inadvertently --- .../Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs index 997ae5abf76..e61599a3b34 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettingsHistory.cs @@ -120,7 +120,8 @@ static FrameSettingsHistory() /// The aggregated FrameSettings result. /// The camera rendering. /// Additional data of the camera rendering. - public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSettings, Camera camera, HDAdditionalCameraData additionalData, HDRenderPipelineAsset hdrpAsset) + /// HDRenderPipelineAsset contening supported features. + public static void AggregateFrameSettings(ref FrameSettings aggregatedFrameSettings, Camera camera, HDAdditionalCameraData additionalData, HDRenderPipelineAsset hdrpAsset, HDRenderPipelineAsset defaultHdrpAsset) => AggregateFrameSettings( ref aggregatedFrameSettings, camera, From b42ed4e171631ec1b7d939bbeb0dd3421c4ee459 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 22 Feb 2021 14:45:29 +0100 Subject: [PATCH 32/58] [Fix] Errors when building a player on Windows --- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 2 +- .../Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs | 3 +++ 2 files changed, 4 insertions(+), 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 6fede1764a5..ae4f4f0d41e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -2034,7 +2034,7 @@ out ScriptableCullingParameters cullingParams // Compute the FrameSettings actually used to draw the frame // FrameSettingsHistory do the same while keeping all step of FrameSettings aggregation in memory for DebugMenu if (m_FrameSettingsHistoryEnabled && camera.cameraType != CameraType.Preview && camera.cameraType != CameraType.Reflection) - FrameSettingsHistory.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset); + FrameSettingsHistory.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset, null); else FrameSettings.AggregateFrameSettings(ref currentFrameSettings, camera, additionalCameraData, m_Asset); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 00ba2e9b64b..1ff9e4e06af 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -766,6 +766,7 @@ void UpdateRenderingLayerNames() [SerializeField] internal DiffusionProfileSettings[] diffusionProfileSettingsList = new DiffusionProfileSettings[0]; +#if UNITY_EDITOR internal bool AddDiffusionProfile(DiffusionProfileSettings profile) { if (diffusionProfileSettingsList.Length < 15) @@ -783,6 +784,8 @@ internal bool AddDiffusionProfile(DiffusionProfileSettings profile) } } +#endif + #endregion } } From e2a4efe961fb212021b593c1e3c8da48c9529b71 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 23 Feb 2021 12:23:17 +0100 Subject: [PATCH 33/58] [Fix] Global Asset Creation workflow - set it as active if created from the HDRP Settings window only --- .../HDRenderPipelineGlobalSettingsCreator.cs | 33 ++++++++++++------- .../Settings/DefaultSettingsPanel.cs | 4 +-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs index 7665b9d9b67..a9c269f9a2a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineGlobalSettingsCreator.cs @@ -12,35 +12,46 @@ internal class HDRenderPipelineGlobalSettingsCreator : UnityEditor.ProjectWindow public override void Action(int instanceId, string pathName, string resourceFile) { var newAsset = HDRenderPipelineGlobalSettings.Create(pathName, settings); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(newAsset); + if (updateGraphicsSettings) + HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(newAsset); ProjectWindowUtil.ShowCreatedAsset(newAsset); } static HDRenderPipelineGlobalSettings settings; - public static void Clone(HDRenderPipelineGlobalSettings src) + static bool updateGraphicsSettings = false; + public static void Clone(HDRenderPipelineGlobalSettings src, bool activateAsset) { settings = src; - var icon = CoreEditorStyles.globalSettingsIcon; + updateGraphicsSettings = activateAsset; var assetCreator = ScriptableObject.CreateInstance(); if (!AssetDatabase.IsValidFolder("Assets/" + HDProjectSettings.projectSettingsFolderPath)) AssetDatabase.CreateFolder("Assets", HDProjectSettings.projectSettingsFolderPath); var path = "Assets/" + HDProjectSettings.projectSettingsFolderPath + "/" + src.name + ".asset"; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, path, icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, path, CoreEditorStyles.globalSettingsIcon, null); + } + + public static void Create(bool useProjectSettingsFolder, bool activateAsset) + { + settings = null; + updateGraphicsSettings = activateAsset; + + var path = "HDRenderPipelineGlobalSettings.asset"; + if (useProjectSettingsFolder) + { + if (!AssetDatabase.IsValidFolder("Assets/" + HDProjectSettings.projectSettingsFolderPath)) + AssetDatabase.CreateFolder("Assets", HDProjectSettings.projectSettingsFolderPath); + path = "Assets/" + HDProjectSettings.projectSettingsFolderPath + "/HDRenderPipelineGlobalSettings.asset"; + } + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), path, CoreEditorStyles.globalSettingsIcon, null); } } [MenuItem("Assets/Create/Rendering/HDRP Global Settings Asset", priority = CoreUtils.Sections.section1 + CoreUtils.Priorities.assetsCreateRenderingMenuPriority + 1)] internal static void CreateHDRenderPipelineGlobalSettings() { - var icon = CoreEditorStyles.globalSettingsIcon; - - if (!AssetDatabase.IsValidFolder("Assets/" + HDProjectSettings.projectSettingsFolderPath)) - AssetDatabase.CreateFolder("Assets", HDProjectSettings.projectSettingsFolderPath); - var path = "Assets/" + HDProjectSettings.projectSettingsFolderPath + "/HDRenderPipelineGlobalSettings.asset"; - - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), path, icon, null); + HDRenderPipelineGlobalSettingsCreator.Create(useProjectSettingsFolder: false, activateAsset: false); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 7430186a64d..7ff86e7b96a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -183,13 +183,13 @@ void Draw_AssetSelection(ref SerializedHDRenderPipelineGlobalSettings serialized if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a HD Global Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - HDAssetFactory.CreateHDRenderPipelineGlobalSettings(); + HDAssetFactory.HDRenderPipelineGlobalSettingsCreator.Create(useProjectSettingsFolder: true, activateAsset: true); } bool guiEnabled = GUI.enabled; GUI.enabled = guiEnabled && (settingsSerialized != null); if (GUILayout.Button(EditorGUIUtility.TrTextContent("Clone", "Clone a HD Global Settings Asset in your default resource folder (defined in Wizard)"), GUILayout.Width(45), GUILayout.Height(18))) { - HDAssetFactory.HDRenderPipelineGlobalSettingsCreator.Clone(settingsSerialized); + HDAssetFactory.HDRenderPipelineGlobalSettingsCreator.Clone(settingsSerialized, activateAsset: true); } GUI.enabled = guiEnabled; } From 8d4d88f93897b4f4ca3ef0eabfc90ef2a09382d8 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 23 Feb 2021 12:23:51 +0100 Subject: [PATCH 34/58] [Fix] Asset deletion workflow - missing use case --- .../Runtime/RenderPipeline/HDRenderPipeline.cs | 4 +++- 1 file changed, 3 insertions(+), 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 ae4f4f0d41e..50266cf480b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -1015,7 +1015,9 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c return; #if UNITY_EDITOR - if (m_globalSettings == null) + // We do not want to start rendering if HDRP global settings are not ready (m_globalSettings is null) + // or been deleted/moved (m_globalSettings is not ncessarily null) + if (m_globalSettings == null || HDRenderPipelineGlobalSettings.instance == null) { Debug.LogError("No HDRP Global Settings Asset is assigned. One will be created for you. If you want to modify it, go to Project Settings > Graphics > HDRP Settings."); m_globalSettings = HDRenderPipelineGlobalSettings.Ensure(); From 8d006526810288d317f02d5701f349452987aac1 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Wed, 24 Feb 2021 09:53:01 +0100 Subject: [PATCH 35/58] Renamed internal variable to code convention --- .../RenderPipeline/HDRenderPipeline.cs | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) 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 50266cf480b..e0291035886 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -27,8 +27,8 @@ public partial class HDRenderPipeline : RenderPipeline internal static HDRenderPipelineGlobalSettings defaultAsset => HDRenderPipelineGlobalSettings.instance; - private HDRenderPipelineGlobalSettings m_globalSettings; - public override RenderPipelineGlobalSettings defaultSettings => m_globalSettings; + private HDRenderPipelineGlobalSettings m_GlobalSettings; + public override RenderPipelineGlobalSettings defaultSettings => m_GlobalSettings; internal static HDRenderPipelineAsset currentAsset => GraphicsSettings.currentRenderPipeline is HDRenderPipelineAsset hdrpAsset ? hdrpAsset : null; @@ -252,9 +252,9 @@ public HDRenderPipeline(HDRenderPipelineAsset asset, HDRenderPipelineAsset obsol public HDRenderPipeline(HDRenderPipelineAsset asset) { #if UNITY_EDITOR - m_globalSettings = HDRenderPipelineGlobalSettings.Ensure(); + m_GlobalSettings = HDRenderPipelineGlobalSettings.Ensure(); #else - m_globalSettings = HDRenderPipelineGlobalSettings.instance; + m_GlobalSettings = HDRenderPipelineGlobalSettings.instance; #endif m_Asset = asset; HDProbeSystem.Parameters = asset.reflectionSystemParameters; @@ -267,8 +267,8 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) // Initialize lod settings with the default frame settings. This will pull LoD values from the current quality level HDRP asset if necessary. // This will make the LoD Group UI consistent with the scene view camera like it is for builtin pipeline. - QualitySettings.lodBias = m_globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedLODBias(m_Asset); - QualitySettings.maximumLODLevel = m_globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedMaximumLODLevel(m_Asset); + QualitySettings.lodBias = m_GlobalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedLODBias(m_Asset); + QualitySettings.maximumLODLevel = m_GlobalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera).GetResolvedMaximumLODLevel(m_Asset); // The first thing we need to do is to set the defines that depend on the render pipeline settings m_RayTracingSupported = GatherRayTracingSupport(m_Asset.currentPlatformRenderPipelineSettings); @@ -279,14 +279,14 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) //In case we are loading element in the asset pipeline (occurs when library is not fully constructed) the creation of the HDRenderPipeline is done at a time we cannot access resources. //So in this case, the reloader would fail and the resources cannot be validated. So skip validation here. //The HDRenderPipeline will be reconstructed in a few frame which will fix this issue. - if ((m_globalSettings.AreResourcesCreated() == false) - || (m_globalSettings.AreEditorResourcesCreated() == false) - || (m_RayTracingSupported && !m_globalSettings.AreRayTracingResourcesCreated())) + if ((m_GlobalSettings.AreResourcesCreated() == false) + || (m_GlobalSettings.AreEditorResourcesCreated() == false) + || (m_RayTracingSupported && !m_GlobalSettings.AreRayTracingResourcesCreated())) return; else m_ResourcesInitialized = true; - m_globalSettings.EnsureShadersCompiled(); + m_GlobalSettings.EnsureShadersCompiled(); #endif // We need to call this after the resource initialization as we attempt to use them in checking the supported API. @@ -296,11 +296,11 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) return; } - if (m_globalSettings.lensAttenuationMode == LensAttenuationMode.ImperfectLens) + if (m_GlobalSettings.lensAttenuationMode == LensAttenuationMode.ImperfectLens) { ColorUtils.s_LensAttenuation = 0.65f; } - else if (m_globalSettings.lensAttenuationMode == LensAttenuationMode.PerfectLens) + else if (m_GlobalSettings.lensAttenuationMode == LensAttenuationMode.PerfectLens) { ColorUtils.s_LensAttenuation = 0.78f; } @@ -441,8 +441,8 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) CameraCaptureBridge.enabled = true; InitializePrepass(m_Asset); - m_ColorResolveMaterial = CoreUtils.CreateEngineMaterial(m_globalSettings.renderPipelineResources.shaders.colorResolvePS); - m_MotionVectorResolve = CoreUtils.CreateEngineMaterial(m_globalSettings.renderPipelineResources.shaders.resolveMotionVecPS); + m_ColorResolveMaterial = CoreUtils.CreateEngineMaterial(m_GlobalSettings.renderPipelineResources.shaders.colorResolvePS); + m_MotionVectorResolve = CoreUtils.CreateEngineMaterial(m_GlobalSettings.renderPipelineResources.shaders.resolveMotionVecPS); CustomPassUtils.Initialize(); } @@ -454,17 +454,17 @@ void UpgradeResourcesIfNeeded() m_Asset.EvaluateSettings(); // Check that the serialized Resources are not broken - m_globalSettings.EnsureRuntimeResources(forceReload: true); - m_globalSettings.EnsureEditorResources(forceReload: true); + m_GlobalSettings.EnsureRuntimeResources(forceReload: true); + m_GlobalSettings.EnsureEditorResources(forceReload: true); if (m_RayTracingSupported) { - m_globalSettings.EnsureRayTracingResources(forceReload: true); + m_GlobalSettings.EnsureRayTracingResources(forceReload: true); } else { // If ray tracing is not enabled we do not want to have ray tracing resources referenced - m_globalSettings.ClearRayTracingResources(); + m_GlobalSettings.ClearRayTracingResources(); } } @@ -1017,15 +1017,15 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c #if UNITY_EDITOR // We do not want to start rendering if HDRP global settings are not ready (m_globalSettings is null) // or been deleted/moved (m_globalSettings is not ncessarily null) - if (m_globalSettings == null || HDRenderPipelineGlobalSettings.instance == null) + if (m_GlobalSettings == null || HDRenderPipelineGlobalSettings.instance == null) { Debug.LogError("No HDRP Global Settings Asset is assigned. One will be created for you. If you want to modify it, go to Project Settings > Graphics > HDRP Settings."); - m_globalSettings = HDRenderPipelineGlobalSettings.Ensure(); - m_globalSettings.EnsureShadersCompiled(); + m_GlobalSettings = HDRenderPipelineGlobalSettings.Ensure(); + m_GlobalSettings.EnsureShadersCompiled(); return; } #endif - m_globalSettings.GetOrCreateDefaultVolume(); + m_GlobalSettings.GetOrCreateDefaultVolume(); // This function should be called once every render (once for all camera) LightLoopNewRender(); From c041477f92ef6865f35172e0824d26dd4f04bd7a Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Wed, 24 Feb 2021 11:23:25 +0100 Subject: [PATCH 36/58] Small clean-up --- .../Editor/RenderPipeline/HDRenderPipelineUI.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs index dbaf2cb0ef1..62230df9b94 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs @@ -16,7 +16,7 @@ enum Expandable // CameraFrameSettings = 1 << 0, //obsolete // BakedOrCustomProbeFrameSettings = 1 << 1, //obsolete // RealtimeProbeFrameSettings = 1 << 2, //obsolete - General = 1 << 3, + // General = 1 << 3, // empty - settings moved to HD Global Settings Rendering = 1 << 4, Lighting = 1 << 5, Material = 1 << 6, @@ -49,7 +49,7 @@ enum Expandable RTGIQuality = 1 << 33 } - static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.VirtualTexturing | Expandable.General, "HDRP"); + static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.Rendering, "HDRP"); enum ShadowResolutionValue { @@ -108,12 +108,6 @@ static HDRenderPipelineUI() public static readonly CED.IDrawer Inspector; - public static readonly CED.IDrawer GeneralSection = CED.Group(Drawer_SectionGeneral); - - static void Drawer_SectionGeneral(SerializedHDRenderPipelineAsset serialized, Editor owner) - { - } - static void Drawer_Volumetric(SerializedHDRenderPipelineAsset serialized, Editor owner) { EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportVolumetrics, Styles.supportVolumetricContent); From 9504df913e28cd4d26eb0dffa52c3847d3ba7b1c Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 25 Feb 2021 09:33:13 +0100 Subject: [PATCH 37/58] Small fixed and cleanup --- .../RenderPipeline/Settings/DefaultSettingsPanel.cs | 11 +++++++---- .../RenderPipeline/HDRenderPipelineGlobalSettings.cs | 12 ++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 7ff86e7b96a..84533c15b17 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -522,12 +522,10 @@ void Assign(VolumeProfile profile) switch (m_Kind) { case Kind.Default: - if (settings != null) - settings.volumeProfile = profile; + settings.volumeProfile = profile; break; case Kind.LookDev: - if (settings != null) - settings.volumeProfileLookDev = profile; + settings.volumeProfileLookDev = profile; break; } EditorUtility.SetDirty(settings); @@ -556,6 +554,11 @@ public static void CreateAndAssign(Kind kind, HDRenderPipelineGlobalSettings glo { settings = globalSettings; + if (settings == null) + { + Debug.LogError("Trying to create a Volume Profile for a null HDRP Global Settings. Operation aborted."); + return; + } var assetCreator = ScriptableObject.CreateInstance(); assetCreator.SetKind(kind); ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{globalSettings.name}_{GetDefaultName(kind)}.asset", null, null); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 1ff9e4e06af..24959ccb05b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -122,7 +122,7 @@ void Init() #endif } - #if UNITY_EDITOR +#if UNITY_EDITOR internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) { string path = "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"; @@ -283,7 +283,7 @@ internal static HDRenderPipelineGlobalSettings Create(string path, HDRenderPipel return assetCreated; } - #endif // UNITY_EDITOR +#endif // UNITY_EDITOR #region Volume private Volume s_DefaultVolume = null; @@ -358,22 +358,22 @@ internal VolumeProfile volumeProfile /// The default VolumeProfile if an HDRenderPipelineAsset is the base SRP asset, null otherwise. internal VolumeProfile GetOrCreateDefaultVolumeProfile() { - #if UNITY_EDITOR +#if UNITY_EDITOR if (volumeProfile == null || volumeProfile.Equals(null)) { volumeProfile = renderPipelineEditorResources.defaultSettingsVolumeProfile; } - #endif +#endif return volumeProfile; } - #if UNITY_EDITOR +#if UNITY_EDITOR internal bool IsVolumeProfileFromResources() { return volumeProfile != null && renderPipelineEditorResources != null && volumeProfile.Equals(renderPipelineEditorResources.defaultSettingsVolumeProfile); } - #endif +#endif #endregion From 7571d03bbf3caf694e3aea465191925f1019f408 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Thu, 25 Feb 2021 12:37:52 +0100 Subject: [PATCH 38/58] Moved VolumeProfileCreator to its own file --- .../Settings/DefaultSettingsPanel.cs | 66 +---------------- .../RenderPipeline/VolumeProfileCreator.cs | 72 +++++++++++++++++++ .../VolumeProfileCreator.cs.meta | 11 +++ 3 files changed, 85 insertions(+), 64 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs.meta diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index 84533c15b17..f67f2b1d826 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -389,7 +389,7 @@ static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serial if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) { - VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.Default, globalSettings); + HDAssetFactory.VolumeProfileCreator.CreateAndAssign(HDAssetFactory.VolumeProfileCreator.Kind.Default, globalSettings); } } @@ -427,7 +427,7 @@ static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serial if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18))) { - VolumeProfileCreator.CreateAndAssign(VolumeProfileCreator.Kind.LookDev, globalSettings); + HDAssetFactory.VolumeProfileCreator.CreateAndAssign(HDAssetFactory.VolumeProfileCreator.Kind.LookDev, globalSettings); } } if (lookDevAsset != null) @@ -502,66 +502,4 @@ static void Drawer_DecalLayerNames(SerializedHDRenderPipelineGlobalSettings seri #endregion } - - class VolumeProfileCreator : ProjectWindowCallback.EndNameEditAction - { - public enum Kind { Default, LookDev } - Kind m_Kind; - - void SetKind(Kind kind) => m_Kind = kind; - - public override void Action(int instanceId, string pathName, string resourceFile) - { - var profile = VolumeProfileFactory.CreateVolumeProfileAtPath(pathName); - ProjectWindowUtil.ShowCreatedAsset(profile); - Assign(profile); - } - - void Assign(VolumeProfile profile) - { - switch (m_Kind) - { - case Kind.Default: - settings.volumeProfile = profile; - break; - case Kind.LookDev: - settings.volumeProfileLookDev = profile; - break; - } - EditorUtility.SetDirty(settings); - } - - static string GetDefaultName(Kind kind) - { - string defaultName; - switch (kind) - { - case Kind.Default: - defaultName = "VolumeProfile_Default"; - break; - case Kind.LookDev: - defaultName = "LookDevProfile_Default"; - break; - default: - defaultName = "N/A"; - break; - } - return defaultName; - } - - static HDRenderPipelineGlobalSettings settings; - public static void CreateAndAssign(Kind kind, HDRenderPipelineGlobalSettings globalSettings) - { - settings = globalSettings; - - if (settings == null) - { - Debug.LogError("Trying to create a Volume Profile for a null HDRP Global Settings. Operation aborted."); - return; - } - var assetCreator = ScriptableObject.CreateInstance(); - assetCreator.SetKind(kind); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{globalSettings.name}_{GetDefaultName(kind)}.asset", null, null); - } - } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs new file mode 100644 index 00000000000..880f51b5045 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs @@ -0,0 +1,72 @@ +using System.IO; +using UnityEngine; +using UnityEngine.Rendering.HighDefinition; +using UnityEngine.Rendering; + +namespace UnityEditor.Rendering.HighDefinition +{ + static partial class HDAssetFactory + { + internal class VolumeProfileCreator : ProjectWindowCallback.EndNameEditAction + { + public enum Kind { Default, LookDev } + Kind m_Kind; + + void SetKind(Kind kind) => m_Kind = kind; + + public override void Action(int instanceId, string pathName, string resourceFile) + { + var profile = VolumeProfileFactory.CreateVolumeProfileAtPath(pathName); + ProjectWindowUtil.ShowCreatedAsset(profile); + Assign(profile); + } + + void Assign(VolumeProfile profile) + { + switch (m_Kind) + { + case Kind.Default: + settings.volumeProfile = profile; + break; + case Kind.LookDev: + settings.volumeProfileLookDev = profile; + break; + } + EditorUtility.SetDirty(settings); + } + + static string GetDefaultName(Kind kind) + { + string defaultName; + switch (kind) + { + case Kind.Default: + defaultName = "VolumeProfile_Default"; + break; + case Kind.LookDev: + defaultName = "LookDevProfile_Default"; + break; + default: + defaultName = "N/A"; + break; + } + return defaultName; + } + + static HDRenderPipelineGlobalSettings settings; + public static void CreateAndAssign(Kind kind, HDRenderPipelineGlobalSettings globalSettings) + { + settings = globalSettings; + + if (settings == null) + { + Debug.LogError("Trying to create a Volume Profile for a null HDRP Global Settings. Operation aborted."); + return; + } + var assetCreator = ScriptableObject.CreateInstance(); + assetCreator.SetKind(kind); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{globalSettings.name}_{GetDefaultName(kind)}.asset", null, null); + } + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs.meta new file mode 100644 index 00000000000..ccb4434db5a --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f2700072fbf22d41abc339907d50acb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From da9ac2f90bffda5db9197c4ee7436e9bb49f4ac2 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 26 Feb 2021 16:22:22 +0100 Subject: [PATCH 39/58] Updated UI --- .../Editor/CoreEditorUtils.cs | 2 +- .../Settings/DefaultSettingsPanel.cs | 295 ++++++++++-------- .../Settings/FrameSettingsUI.Drawers.cs | 18 +- .../Settings/SerializedFrameSettings.cs | 17 - 4 files changed, 181 insertions(+), 151 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs b/com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs index 814fb9c7161..80f7c22fb3a 100644 --- a/com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs +++ b/com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs @@ -406,7 +406,7 @@ public static bool DrawHeaderToggle(string title, SerializedProperty group, Seri /// return the state of the foldout header public static bool DrawHeaderToggle(GUIContent title, SerializedProperty group, SerializedProperty activeField, Action contextAction, Func hasMoreOptions, Action toggleMoreOptions, string documentationURL) { - var backgroundRect = GUILayoutUtility.GetRect(1f, 17f); + var backgroundRect = EditorGUI.IndentedRect(GUILayoutUtility.GetRect(1f, 17f)); var labelRect = backgroundRect; labelRect.xMin += 32f; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs index f67f2b1d826..6c2365564a8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs @@ -21,8 +21,7 @@ public static SettingsProvider CreateSettingsProvider() return new SettingsProvider("Project/Graphics/HDRP Settings", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()) + keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() .Concat(OverridableFrameSettingsArea.frameSettingsKeywords) .ToArray(), guiHandler = s_IMGUIImpl.DoGUI @@ -34,30 +33,32 @@ internal class DefaultSettingsPanelIMGUI public class Styles { public const int labelWidth = 220; - internal static readonly GUIContent defaultSettingsAssetLabel = EditorGUIUtility.TrTextContent("Default Settings Asset"); + internal static GUIStyle sectionHeaderStyle = new GUIStyle(EditorStyles.largeLabel) { richText = true, fontSize = 18, fixedHeight = 42 }; + internal static GUIStyle subSectionHeaderStyle = new GUIStyle(EditorStyles.boldLabel); + internal static readonly GUIContent defaultVolumeProfileLabel = EditorGUIUtility.TrTextContent("Default Volume Profile Asset"); internal static readonly GUIContent lookDevVolumeProfileLabel = EditorGUIUtility.TrTextContent("LookDev Volume Profile Asset"); - internal static readonly GUIContent assetSelectionLabel = EditorGUIUtility.TrTextContent("Set Default Settings Profile for HDRP"); - internal static readonly GUIContent assetSelectionIntroLabel = EditorGUIUtility.TrTextContent("The HDRP Settings Profile is a unique asset allowing you to configure default settings and behaviors for any HDRP scene in your project."); - internal static readonly GUIContent resourceLabel = EditorGUIUtility.TrTextContent("Resources"); - internal static readonly GUIContent resourceIntroLabel = EditorGUIUtility.TrTextContent("Resources assets list the Shaders, Materials, Textures, and other Assets needed to operate the Render Pipeline."); + internal static readonly GUIContent frameSettingsLabel = EditorGUIUtility.TrTextContent("Frame Settings"); - internal static readonly GUIContent frameSettingsIntroLabel = EditorGUIUtility.TrTextContent("Frame Settings are settings HDRP uses to render Cameras, real-time, baked, and custom reflections. You can set the default Frame Settings for each of these three individually here:", "You can override the default Frame Settings on a per component basis. Enable the 'Custom Frame Settings' checkbox to set specific Frame Settings for individual Cameras and Reflection Probes."); + internal static readonly GUIContent frameSettingsLabel_Camera = EditorGUIUtility.TrTextContent("Camera"); + internal static readonly GUIContent frameSettingsLabel_RTProbe = EditorGUIUtility.TrTextContent("Realtime Reflection"); + internal static readonly GUIContent frameSettingsLabel_BakedProbe = EditorGUIUtility.TrTextContent("Baked or Custom Reflection"); + internal static readonly GUIContent renderingSettingsHeaderContent = EditorGUIUtility.TrTextContent("Rendering"); + internal static readonly GUIContent lightSettingsHeaderContent = EditorGUIUtility.TrTextContent("Lighting"); + internal static readonly GUIContent asyncComputeSettingsHeaderContent = EditorGUIUtility.TrTextContent("Asynchronous Compute Shaders"); + internal static readonly GUIContent lightLoopSettingsHeaderContent = EditorGUIUtility.TrTextContent("Light Loop Debug"); + internal static readonly GUIContent volumeComponentsLabel = EditorGUIUtility.TrTextContent("Volume Profiles"); - internal static readonly GUIContent volumeComponentsIntroLabel = EditorGUIUtility.TrTextContent("A Volume Profile is a Scriptable Object which contains properties that Volumes use to determine how to render the Scene environment for Cameras they affect. You can define Volume Overrides default values for your project here:", "You can use Volume Overrides on Volume Profiles in your Scenes to override these values and customize the environment settings."); internal static readonly GUIContent customPostProcessOrderLabel = EditorGUIUtility.TrTextContent("Custom Post Process Orders"); - internal static readonly GUIContent defaultFrameSettingsContent = EditorGUIUtility.TrTextContent("Applied to"); - internal static readonly GUIContent customPostProcessIntroLabel = EditorGUIUtility.TrTextContent("The High Definition Render Pipeline (HDRP) allows you to write your own post-processing effects that automatically integrate into Volume. HDRP allows you to customize the order of your custom post-processing effect at each injection point."); + internal static readonly GUIContent resourceLabel = EditorGUIUtility.TrTextContent("Resources"); internal static readonly GUIContent renderPipelineResourcesContent = EditorGUIUtility.TrTextContent("Player Resources", "Set of resources that need to be loaded when creating stand alone"); internal static readonly GUIContent renderPipelineRayTracingResourcesContent = EditorGUIUtility.TrTextContent("Ray Tracing Resources", "Set of resources that need to be loaded when using ray tracing"); internal static readonly GUIContent renderPipelineEditorResourcesContent = EditorGUIUtility.TrTextContent("Editor Resources", "Set of resources that need to be loaded for working in editor"); internal static readonly GUIContent generalSettingsLabel = EditorGUIUtility.TrTextContent("Miscellaneous"); - internal static readonly GUIContent layerNamesLabel = EditorGUIUtility.TrTextContent("Layers Names", "Light and Decal Layers are specific LayerMasks used to to make LightsDecals only affect Meshes that are on corresponding Light Layers, and to apply Decals only matching Mesh Renderer or Terrain. By default, Mesh Renderers, or Terrain, Decal Layers are named **Decal Layer 1-7**. To more easily differentiate between them, you can give each Decal Layer a specific name in this section."); - internal static readonly GUIContent layerNamesIntro = EditorGUIUtility.TrTextContent("By default, Mesh Renderers, or Terrain, Decal Layers are named **Decal Layer 1-7**. To more easily differentiate between them, you can give each Decal Layer a specific name in this section."); - + internal static readonly GUIContent layerNamesLabel = EditorGUIUtility.TrTextContent("Layers Names"); internal static readonly GUIContent lightLayersLabel = EditorGUIUtility.TrTextContent("Light Layers Names", "When enabled, HDRP allocates memory for processing Light Layers. For deferred rendering, this allocation includes an extra render target in memory and extra cost. See the Quality Settings window to enable Decal Layers on your Render pipeline asset."); internal static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0"); internal static readonly GUIContent lightLayerName1 = EditorGUIUtility.TrTextContent("Light Layer 1", "The display name for Light Layer 1. This is purely cosmetic, and can be used to articulate intended use of Light Layer 1"); @@ -78,44 +79,32 @@ public class Styles internal static readonly GUIContent decalLayerName6 = EditorGUIUtility.TrTextContent("Decal Layer 6", "The display name for Decal Layer 6. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 6"); internal static readonly GUIContent decalLayerName7 = EditorGUIUtility.TrTextContent("Decal Layer 7", "The display name for Decal Layer 7. This is purely cosmetic, and can be used to articulate intended use of Decal Layer 7"); - internal static readonly GUIContent shaderVariantLogLevel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information appears in the Unity Console when the build finishes.."); + internal static readonly GUIContent shaderVariantLogLevelLabel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information appears in the Unity Console when the build finishes.."); - internal static readonly GUIContent lensAttenuationModeContent = EditorGUIUtility.TrTextContent("Lens Attenuation Mode", "Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier."); + internal static readonly GUIContent lensAttenuationModeContentLabel = EditorGUIUtility.TrTextContent("Lens Attenuation Mode", "Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier."); - internal static readonly GUIContent diffusionProfileSettingsIntro = EditorGUIUtility.TrTextContent("The High Definition Render Pipeline(HDRP) allows you to use up to 15 custom Diffusion Profiles in view at the same time.To use more than 15 custom Diffusion Profiles in a Scene,you can use the Diffusion Profile Override inside a Volume.This allows you to specify which Diffusion Profiles to use in a certain area(or in the Scene if the Volume is global"); internal static readonly GUIContent diffusionProfileSettingsLabel = EditorGUIUtility.TrTextContent("Diffusion Profile Assets"); - - internal static GUIStyle sectionHeaderStyle = new GUIStyle(EditorStyles.boldLabel) { richText = true }; - internal static GUIStyle introStyle = new GUIStyle(EditorStyles.largeLabel) { wordWrap = true }; } - Vector2 m_ScrollViewPosition = Vector2.zero; public static readonly CED.IDrawer Inspector; - static bool m_verboseMode = true; - static DefaultSettingsPanelIMGUI() { Inspector = CED.Group( - ResourcesSection, + VolumeSection, + CED.Group((serialized, owner) => EditorGUILayout.Space()), + DiffusionProfileSettingsSection, CED.Group((serialized, owner) => EditorGUILayout.Space()), FrameSettingsSection, CED.Group((serialized, owner) => EditorGUILayout.Space()), - VolumeSection, + LayerNamesSection, CED.Group((serialized, owner) => EditorGUILayout.Space()), CustomPostProcessesSection, CED.Group((serialized, owner) => EditorGUILayout.Space()), - DiffusionProfileSettingsSection, + MiscSection, CED.Group((serialized, owner) => EditorGUILayout.Space()), - LayerNamesSection + ResourcesSection ); - // fix init of selection along what is serialized - if (k_ExpandedState[Expandable.BakedOrCustomProbeFrameSettings]) - selectedFrameSettings = SelectedFrameSettings.BakedOrCustomReflection; - else if (k_ExpandedState[Expandable.RealtimeProbeFrameSettings]) - selectedFrameSettings = SelectedFrameSettings.RealtimeReflection; - else //default value: camera - selectedFrameSettings = SelectedFrameSettings.Camera; } SerializedHDRenderPipelineGlobalSettings serializedSettings; @@ -155,7 +144,6 @@ public void DoGUI(string searchContext) /// public void OnActivate(string searchContext, VisualElement rootElement) { - m_ScrollViewPosition = Vector2.zero; } #region Global HDRenderPipelineGlobalSettings asset selection @@ -164,9 +152,6 @@ void Draw_AssetSelection(ref SerializedHDRenderPipelineGlobalSettings serialized var oldWidth = EditorGUIUtility.labelWidth; EditorGUIUtility.labelWidth = Styles.labelWidth; - if (m_verboseMode) - EditorGUILayout.LabelField(Styles.assetSelectionIntroLabel, Styles.introStyle); - if (settingsSerialized == null) { EditorGUILayout.HelpBox("No active settings for HDRP. Rendering may be broken until a new one is assigned.", MessageType.Warning); @@ -194,6 +179,7 @@ void Draw_AssetSelection(ref SerializedHDRenderPipelineGlobalSettings serialized GUI.enabled = guiEnabled; } EditorGUIUtility.labelWidth = oldWidth; + EditorGUILayout.Space(); } #endregion // Global HDRenderPipelineGlobalSettings asset selection @@ -202,13 +188,12 @@ void Draw_AssetSelection(ref SerializedHDRenderPipelineGlobalSettings serialized static readonly CED.IDrawer ResourcesSection = CED.Group( CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.resourceLabel, Styles.sectionHeaderStyle)), - CED.Group(Drawer_ResourcesSection) + CED.Group((serialized, owner) => EditorGUILayout.Space()), + CED.Group(Drawer_ResourcesSection), + CED.Group((serialized, owner) => EditorGUILayout.Space()) ); static void Drawer_ResourcesSection(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { - if (m_verboseMode) - EditorGUILayout.LabelField(Styles.resourceIntroLabel, Styles.introStyle); - using (new EditorGUI.IndentLevelScope()) { var oldWidth = EditorGUIUtility.labelWidth; @@ -235,83 +220,83 @@ static void Drawer_ResourcesSection(SerializedHDRenderPipelineGlobalSettings ser #region Frame Settings - public enum SelectedFrameSettings - { - Camera, - BakedOrCustomReflection, - RealtimeReflection - } - - internal static SelectedFrameSettings selectedFrameSettings; static readonly CED.IDrawer FrameSettingsSection = CED.Group( - CED.Group(Drawer_TitleDefaultFrameSettings), - CED.Group((serialized, owner) => EditorGUI.indentLevel++), - CED.Conditional( - (serialized, owner) => k_ExpandedState[Expandable.CameraFrameSettings], - CED.Select( - (serialized, owner) => serialized.defaultFrameSettings, - FrameSettingsUI.InspectorInnerbox(withOverride: false) - ) - ), - CED.Conditional( - (serialized, owner) => k_ExpandedState[Expandable.BakedOrCustomProbeFrameSettings], - CED.Select( - (serialized, owner) => serialized.defaultBakedOrCustomReflectionFrameSettings, - FrameSettingsUI.InspectorInnerbox(withOverride: false) - ) - ), - CED.Conditional( - (serialized, owner) => k_ExpandedState[Expandable.RealtimeProbeFrameSettings], - CED.Select( - (serialized, owner) => serialized.defaultRealtimeReflectionFrameSettings, - FrameSettingsUI.InspectorInnerbox(withOverride: false) - ) - ), - CED.Group((serialized, owner) => EditorGUI.indentLevel--) + CED.Group(Drawer_FrameSettings), + CED.Group((serialized, owner) => EditorGUILayout.Space()) ); - - static void Drawer_TitleDefaultFrameSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) + static void Drawer_FrameSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { EditorGUILayout.LabelField(Styles.frameSettingsLabel, Styles.sectionHeaderStyle); + EditorGUILayout.Space(); - if (m_verboseMode) - EditorGUILayout.LabelField(Styles.frameSettingsIntroLabel, Styles.introStyle); - - using (new EditorGUILayout.HorizontalScope()) + using (new EditorGUI.IndentLevelScope()) { - EditorGUILayout.LabelField(Styles.defaultFrameSettingsContent); - EditorGUI.BeginChangeCheck(); - selectedFrameSettings = (SelectedFrameSettings)EditorGUILayout.EnumPopup(selectedFrameSettings); - if (EditorGUI.EndChangeCheck()) - ApplyChangedDisplayedFrameSettings(serialized, owner); + EditorGUILayout.LabelField(Styles.frameSettingsLabel_Camera, Styles.subSectionHeaderStyle); + Drawer_FrameSettings_Custom(0, serialized.defaultFrameSettings, owner); + EditorGUILayout.Space(); + + EditorGUILayout.LabelField(Styles.frameSettingsLabel_RTProbe, Styles.subSectionHeaderStyle); + Drawer_FrameSettings_Custom(1, serialized.defaultRealtimeReflectionFrameSettings, owner); + EditorGUILayout.Space(); + + EditorGUILayout.LabelField(Styles.frameSettingsLabel_BakedProbe, Styles.subSectionHeaderStyle); + Drawer_FrameSettings_Custom(2, serialized.defaultBakedOrCustomReflectionFrameSettings, owner); + EditorGUILayout.Space(); } } - enum Expandable + static private bool[] m_ShowFrameSettings_Rendering = { false, false, false }; + static private bool[] m_ShowFrameSettings_Lighting = { false, false, false }; + static private bool[] m_ShowFrameSettings_AsyncCompute = { false, false, false }; + static private bool[] m_ShowFrameSettings_LightLoopDebug = { false, false, false }; + + static void Drawer_FrameSettings_Custom(int index, SerializedFrameSettings serialized, Editor owner) { - CameraFrameSettings = 1 << 0, //obsolete - BakedOrCustomProbeFrameSettings = 1 << 1, //obsolete - RealtimeProbeFrameSettings = 1 << 2, //obsolete - } + var oldWidth = EditorGUIUtility.labelWidth; + EditorGUIUtility.labelWidth = Styles.labelWidth; + + CoreEditorUtils.DrawSplitter(); + m_ShowFrameSettings_Rendering[index] = CoreEditorUtils.DrawHeaderFoldout(Styles.renderingSettingsHeaderContent, m_ShowFrameSettings_Rendering[index]); + if (m_ShowFrameSettings_Rendering[index]) + { + using (new EditorGUI.IndentLevelScope()) + { + FrameSettingsUI.Drawer_SectionRenderingSettings(serialized, owner, withOverride: false); + } + } - static readonly ExpandedState k_ExpandedState = new ExpandedState(Expandable.CameraFrameSettings, "HDRP"); + CoreEditorUtils.DrawSplitter(); + m_ShowFrameSettings_Lighting[index] = CoreEditorUtils.DrawHeaderFoldout(Styles.lightSettingsHeaderContent, m_ShowFrameSettings_Lighting[index]); + if (m_ShowFrameSettings_Lighting[index]) + { + using (new EditorGUI.IndentLevelScope()) + { + FrameSettingsUI.Drawer_SectionLightingSettings(serialized, owner, withOverride: false); + } + } - static public void ApplyChangedDisplayedFrameSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) - { - k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings | Expandable.BakedOrCustomProbeFrameSettings | Expandable.RealtimeProbeFrameSettings, false); - switch (selectedFrameSettings) + CoreEditorUtils.DrawSplitter(); + m_ShowFrameSettings_AsyncCompute[index] = CoreEditorUtils.DrawHeaderFoldout(Styles.asyncComputeSettingsHeaderContent, m_ShowFrameSettings_AsyncCompute[index]); + if (m_ShowFrameSettings_AsyncCompute[index]) { - case SelectedFrameSettings.Camera: - k_ExpandedState.SetExpandedAreas(Expandable.CameraFrameSettings, true); - break; - case SelectedFrameSettings.BakedOrCustomReflection: - k_ExpandedState.SetExpandedAreas(Expandable.BakedOrCustomProbeFrameSettings, true); - break; - case SelectedFrameSettings.RealtimeReflection: - k_ExpandedState.SetExpandedAreas(Expandable.RealtimeProbeFrameSettings, true); - break; + using (new EditorGUI.IndentLevelScope()) + { + FrameSettingsUI.Drawer_SectionAsyncComputeSettings(serialized, owner, withOverride: false); + } } + + CoreEditorUtils.DrawSplitter(); + m_ShowFrameSettings_LightLoopDebug[index] = CoreEditorUtils.DrawHeaderFoldout(Styles.lightLoopSettingsHeaderContent, m_ShowFrameSettings_LightLoopDebug[index]); + if (m_ShowFrameSettings_LightLoopDebug[index]) + { + using (new EditorGUI.IndentLevelScope()) + { + FrameSettingsUI.Drawer_SectionLightLoopSettings(serialized, owner, withOverride: false); + } + } + CoreEditorUtils.DrawSplitter(); + EditorGUIUtility.labelWidth = oldWidth; } #endregion // Frame Settings @@ -320,17 +305,32 @@ static public void ApplyChangedDisplayedFrameSettings(SerializedHDRenderPipeline static readonly CED.IDrawer CustomPostProcessesSection = CED.Group( CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.customPostProcessOrderLabel, Styles.sectionHeaderStyle)), + CED.Group((serialized, owner) => EditorGUILayout.Space()), CED.Group(Drawer_CustomPostProcess) ); static void Drawer_CustomPostProcess(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { - if (m_verboseMode) - EditorGUILayout.LabelField(Styles.customPostProcessIntroLabel, Styles.introStyle); - using (new EditorGUI.IndentLevelScope()) + using (new EditorGUILayout.HorizontalScope()) { + GUILayout.Space(5); serialized.uiBeforeTransparentCustomPostProcesses.DoLayoutList(); + } + GUILayout.Space(2); + using (new EditorGUILayout.HorizontalScope()) + { + GUILayout.Space(5); serialized.uiBeforeTAACustomPostProcesses.DoLayoutList(); + } + GUILayout.Space(2); + using (new EditorGUILayout.HorizontalScope()) + { + GUILayout.Space(5); serialized.uiBeforePostProcessCustomPostProcesses.DoLayoutList(); + } + GUILayout.Space(2); + using (new EditorGUILayout.HorizontalScope()) + { + GUILayout.Space(5); serialized.uiAfterPostProcessCustomPostProcesses.DoLayoutList(); } } @@ -341,14 +341,14 @@ static void Drawer_CustomPostProcess(SerializedHDRenderPipelineGlobalSettings se static readonly CED.IDrawer DiffusionProfileSettingsSection = CED.Group( CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.diffusionProfileSettingsLabel, Styles.sectionHeaderStyle)), + CED.Group((serialized, owner) => EditorGUILayout.Space()), CED.Group(Drawer_DiffusionProfileSettings) ); static void Drawer_DiffusionProfileSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { - if (m_verboseMode) - EditorGUILayout.LabelField(Styles.diffusionProfileSettingsIntro, Styles.introStyle); - using (new EditorGUI.IndentLevelScope()) + using (new EditorGUILayout.HorizontalScope()) { + GUILayout.Space(5); serialized.m_DiffusionProfileUI.OnGUI(serialized.diffusionProfileSettingsList); } } @@ -362,13 +362,13 @@ static void Drawer_DiffusionProfileSettings(SerializedHDRenderPipelineGlobalSett static readonly CED.IDrawer VolumeSection = CED.Group( CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.volumeComponentsLabel, Styles.sectionHeaderStyle)), - CED.Group(Drawer_VolumeSection) + CED.Group((serialized, owner) => EditorGUILayout.Space()), + CED.Group(Drawer_VolumeSection), + CED.Group((serialized, owner) => EditorGUILayout.Space()) ); static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) { - if (m_verboseMode) - EditorGUILayout.LabelField(Styles.volumeComponentsIntroLabel, Styles.introStyle); using (new EditorGUI.IndentLevelScope()) { var oldWidth = EditorGUIUtility.labelWidth; @@ -392,7 +392,6 @@ static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serial HDAssetFactory.VolumeProfileCreator.CreateAndAssign(HDAssetFactory.VolumeProfileCreator.Kind.Default, globalSettings); } } - if (asset != null) { // The state of the profile can change without the asset reference changing so in this case we need to reset the editor. @@ -403,12 +402,10 @@ static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serial } Editor.CreateCachedEditor(asset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedDefaultVolumeProfileEditor); - EditorGUIUtility.labelWidth -= 18; bool oldEnabled = GUI.enabled; GUI.enabled = AssetDatabase.IsOpenForEdit(asset); m_CachedDefaultVolumeProfileEditor.OnInspectorGUI(); GUI.enabled = oldEnabled; - EditorGUIUtility.labelWidth = oldWidth; } EditorGUILayout.Space(); @@ -433,33 +430,69 @@ static void Drawer_VolumeSection(SerializedHDRenderPipelineGlobalSettings serial if (lookDevAsset != null) { Editor.CreateCachedEditor(lookDevAsset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedLookDevVolumeProfileEditor); - EditorGUIUtility.labelWidth -= 18; bool oldEnabled = GUI.enabled; GUI.enabled = AssetDatabase.IsOpenForEdit(lookDevAsset); m_CachedLookDevVolumeProfileEditor.OnInspectorGUI(); GUI.enabled = oldEnabled; - EditorGUIUtility.labelWidth = oldWidth; if (lookDevAsset.Has()) EditorGUILayout.HelpBox("VisualEnvironment is not modifiable and will be overridden by the LookDev", MessageType.Warning); if (lookDevAsset.Has()) EditorGUILayout.HelpBox("HDRISky is not modifiable and will be overridden by the LookDev", MessageType.Warning); } + EditorGUIUtility.labelWidth = oldWidth; } } #endregion // Volume Profiles - #region General Settings (log level, layer names) + #region Misc Settings - static readonly CED.IDrawer LayerNamesSection = CED.Group( + static readonly CED.IDrawer MiscSection = CED.Group( CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.generalSettingsLabel, Styles.sectionHeaderStyle)), - CED.Group((serialized, owner) => EditorGUILayout.PropertyField(serialized.shaderVariantLogLevel, Styles.shaderVariantLogLevel)), - CED.Group((serialized, owner) => EditorGUILayout.PropertyField(serialized.lensAttenuation, Styles.lensAttenuationModeContent)), - CED.Group(Drawer_LightLayerNames), - CED.Group(Drawer_DecalLayerNames) + CED.Group((serialized, owner) => EditorGUILayout.Space()), + CED.Group(Drawer_MiscSettings), + CED.Group((serialized, owner) => EditorGUILayout.Space()) + ); + static void Drawer_MiscSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) + { + var oldWidth = EditorGUIUtility.labelWidth; + EditorGUIUtility.labelWidth = Styles.labelWidth; + + using (new EditorGUI.IndentLevelScope()) + { + EditorGUILayout.PropertyField(serialized.shaderVariantLogLevel, Styles.shaderVariantLogLevelLabel); + EditorGUILayout.PropertyField(serialized.lensAttenuation, Styles.lensAttenuationModeContentLabel); + } + EditorGUIUtility.labelWidth = oldWidth; + } + + #endregion // Misc Settings + + #region Rendering Layer Names + + static readonly CED.IDrawer LayerNamesSection = CED.Group( + CED.Group((serialized, owner) => EditorGUILayout.LabelField(Styles.layerNamesLabel, Styles.sectionHeaderStyle)), + CED.Group((serialized, owner) => EditorGUILayout.Space()), + CED.Group(Drawer_LayerNamesSettings), + CED.Group((serialized, owner) => EditorGUILayout.Space()) ); + static void Drawer_LayerNamesSettings(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) + { + var oldWidth = EditorGUIUtility.labelWidth; + EditorGUIUtility.labelWidth = Styles.labelWidth; + + using (new EditorGUI.IndentLevelScope()) + { + Drawer_LightLayerNames(serialized, owner); + EditorGUILayout.Space(); + Drawer_DecalLayerNames(serialized, owner); + EditorGUILayout.Space(); + } + EditorGUIUtility.labelWidth = oldWidth; + } + static private bool m_ShowLightLayerNames = false; static private bool m_ShowDecalLayerNames = false; static void Drawer_LightLayerNames(SerializedHDRenderPipelineGlobalSettings serialized, Editor owner) @@ -470,12 +503,19 @@ static void Drawer_LightLayerNames(SerializedHDRenderPipelineGlobalSettings seri using (new EditorGUI.IndentLevelScope()) { HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName0, serialized.lightLayerName0); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName1, serialized.lightLayerName1); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName2, serialized.lightLayerName2); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName3, serialized.lightLayerName3); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName4, serialized.lightLayerName4); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName5, serialized.lightLayerName5); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName6, serialized.lightLayerName6); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.lightLayerName7, serialized.lightLayerName7); } } @@ -489,12 +529,19 @@ static void Drawer_DecalLayerNames(SerializedHDRenderPipelineGlobalSettings seri using (new EditorGUI.IndentLevelScope()) { HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName0, serialized.decalLayerName0); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName1, serialized.decalLayerName1); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName2, serialized.decalLayerName2); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName3, serialized.decalLayerName3); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName4, serialized.decalLayerName4); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName5, serialized.decalLayerName5); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName6, serialized.decalLayerName6); + GUILayout.Space(2); HDEditorUtils.DrawDelayedTextField(Styles.decalLayerName7, serialized.decalLayerName7); } } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs index d3d3f4e7cd0..ad316f39f3f 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs @@ -91,17 +91,17 @@ internal static CED.IDrawer Inspector(bool withOverride = true) => CED.Group( ); //separated to add enum popup on default frame settings - internal static CED.IDrawer InspectorInnerbox(bool withOverride = true) => CED.Group( - CED.FoldoutGroup(renderingSettingsHeaderContent, Expandable.RenderingPasses, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.Boxed, + internal static CED.IDrawer InspectorInnerbox(bool withOverride = true, bool isBoxed = true) => CED.Group( + CED.FoldoutGroup(renderingSettingsHeaderContent, Expandable.RenderingPasses, k_ExpandedState, isBoxed ? FoldoutOption.Indent | FoldoutOption.Boxed : FoldoutOption.Indent, CED.Group(206, (serialized, owner) => Drawer_SectionRenderingSettings(serialized, owner, withOverride)) ), - CED.FoldoutGroup(lightSettingsHeaderContent, Expandable.LightingSettings, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.Boxed, + CED.FoldoutGroup(lightSettingsHeaderContent, Expandable.LightingSettings, k_ExpandedState, isBoxed ? FoldoutOption.Indent | FoldoutOption.Boxed : FoldoutOption.Indent, CED.Group(206, (serialized, owner) => Drawer_SectionLightingSettings(serialized, owner, withOverride)) ), - CED.FoldoutGroup(asyncComputeSettingsHeaderContent, Expandable.AsynComputeSettings, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.Boxed, + CED.FoldoutGroup(asyncComputeSettingsHeaderContent, Expandable.AsynComputeSettings, k_ExpandedState, isBoxed ? FoldoutOption.Indent | FoldoutOption.Boxed : FoldoutOption.Indent, CED.Group(206, (serialized, owner) => Drawer_SectionAsyncComputeSettings(serialized, owner, withOverride)) ), - CED.FoldoutGroup(lightLoopSettingsHeaderContent, Expandable.LightLoop, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.Boxed, + CED.FoldoutGroup(lightLoopSettingsHeaderContent, Expandable.LightLoop, k_ExpandedState, isBoxed ? FoldoutOption.Indent | FoldoutOption.Boxed : FoldoutOption.Indent, CED.Group(206, (serialized, owner) => Drawer_SectionLightLoopSettings(serialized, owner, withOverride)) ), CED.Group((serialized, owner) => @@ -144,7 +144,7 @@ static FrameSettings GetDefaultFrameSettingsFor(Editor owner) : HDRenderPipelineGlobalSettings.instance.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); } - static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) + static internal void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) { bool isGUIenabled = GUI.enabled; FrameSettings defaultFrameSettings = GetDefaultFrameSettingsFor(owner); @@ -325,7 +325,7 @@ enum ScalableLevel3ForFrameSettingsUIOnly High } - static void Drawer_SectionLightingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) + static internal void Drawer_SectionLightingSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) { bool isGUIenabled = GUI.enabled; @@ -384,13 +384,13 @@ static void Drawer_SectionLightingSettings(SerializedFrameSettings serialized, E GUI.enabled = isGUIenabled; } - static void Drawer_SectionAsyncComputeSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) + static internal void Drawer_SectionAsyncComputeSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) { var area = GetFrameSettingSectionContent(2, serialized, owner); area.Draw(withOverride); } - static void Drawer_SectionLightLoopSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) + static internal void Drawer_SectionLightLoopSettings(SerializedFrameSettings serialized, Editor owner, bool withOverride) { var area = GetFrameSettingSectionContent(3, serialized, owner); area.Draw(withOverride); diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs index e9d90898db8..e52b6d3ab29 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedFrameSettings.cs @@ -60,23 +60,6 @@ ref FrameSettings GetData(Object obj) return ref data.renderingPathCustomFrameSettings; case HDProbe probe: return ref probe.frameSettings; - default: - { - if (obj is HDRenderPipelineGlobalSettings globalSettings) - { - switch (DefaultSettingsPanelIMGUI.selectedFrameSettings) - { - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.Camera: - return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.BakedOrCustomReflection: - return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.CustomOrBakedReflection); - case DefaultSettingsPanelIMGUI.SelectedFrameSettings.RealtimeReflection: - return ref globalSettings.GetDefaultFrameSettings(FrameSettingsRenderType.RealtimeReflection); - } - } - - break; - } } throw new System.ArgumentException("Unknown kind of object"); } From 1d166eace4bd7228257e2b74af89c8686b964576 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 26 Feb 2021 16:30:01 +0100 Subject: [PATCH 40/58] Fixed issue when creating volume profile on a non-existing folder --- .../Editor/RenderPipeline/VolumeProfileCreator.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs index 880f51b5045..720e4bdbaf6 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeProfileCreator.cs @@ -65,6 +65,10 @@ public static void CreateAndAssign(Kind kind, HDRenderPipelineGlobalSettings glo } var assetCreator = ScriptableObject.CreateInstance(); assetCreator.SetKind(kind); + + if (!AssetDatabase.IsValidFolder("Assets/" + HDProjectSettings.projectSettingsFolderPath)) + AssetDatabase.CreateFolder("Assets", HDProjectSettings.projectSettingsFolderPath); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, $"Assets/{HDProjectSettings.projectSettingsFolderPath}/{globalSettings.name}_{GetDefaultName(kind)}.asset", null, null); } } From 96f11b740f29a9f67a8f66bb8ac435789bcc80eb Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 26 Feb 2021 16:30:44 +0100 Subject: [PATCH 41/58] Fixed Raytracing resources loading code --- .../HDRenderPipelineGlobalSettings.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 24959ccb05b..8ad96edb260 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -574,16 +574,27 @@ internal void EnsureRayTracingResources(bool forceReload) if (AreRayTracingResourcesCreated()) return; - m_RenderPipelineRayTracingResources = UnityEditor.AssetDatabase.LoadAssetAtPath(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"); - + var raytracingResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"; + var objs = InternalEditorUtility.LoadSerializedFileAndForget(raytracingResourcesPath); + m_RenderPipelineRayTracingResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineRayTracingResources : null; if (forceReload) { #if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify ResourceReloader.TryReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); #else - ResourceReloader.ReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); + if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath())) + { + InternalEditorUtility.SaveToSerializedFileAndForget( + new Object[] { m_RenderPipelineRayTracingResources }, + raytracingResourcesPath, + true); + } #endif } + else if (!EditorUtility.IsPersistent(m_RenderPipelineRayTracingResources)) + { + m_RenderPipelineRayTracingResources = AssetDatabase.LoadAssetAtPath(raytracingResourcesPath); + } } internal void ClearRayTracingResources() From 70a95d7def3dccdcd4ef2885641817838f4a54f4 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 26 Feb 2021 17:13:39 +0100 Subject: [PATCH 42/58] Fixed decal layer migration --- .../HDRenderPipelineGlobalSettings.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 8ad96edb260..95ae159d867 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -172,14 +172,14 @@ internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipe assetCreated.lightLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6); assetCreated.lightLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7); - assetCreated.decalLayerName0 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName0); - assetCreated.decalLayerName1 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName1); - assetCreated.decalLayerName2 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName2); - assetCreated.decalLayerName3 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName3); - assetCreated.decalLayerName4 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName4); - assetCreated.decalLayerName5 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName5); - assetCreated.decalLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6); - assetCreated.decalLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7); + assetCreated.decalLayerName0 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName0); + assetCreated.decalLayerName1 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName1); + assetCreated.decalLayerName2 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName2); + assetCreated.decalLayerName3 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName3); + assetCreated.decalLayerName4 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName4); + assetCreated.decalLayerName5 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName5); + assetCreated.decalLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName6); + assetCreated.decalLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName7); assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; From 9c7c0f079a84f74f48a3cf39320e415c373f61c6 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 1 Mar 2021 14:22:53 +0100 Subject: [PATCH 43/58] Renamed defaultSettings to globalSettings + fixed get_defaultShader when globalSettings is not available yet --- .../RenderPipeline/HDRenderPipelineAsset.cs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 1b9b0b9f1b7..7aa55c64727 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -46,12 +46,12 @@ protected override void OnValidate() isInOnValidateCall = false; } - HDRenderPipelineGlobalSettings defaultSettings => HDRenderPipelineGlobalSettings.instance; + HDRenderPipelineGlobalSettings globalSettings => HDRenderPipelineGlobalSettings.instance; internal RenderPipelineResources renderPipelineResources { - get { return defaultSettings.renderPipelineResources; } - set { defaultSettings.renderPipelineResources = value; } + get { return globalSettings.renderPipelineResources; } + set { globalSettings.renderPipelineResources = value; } } internal bool frameSettingsHistory { get; set; } = false; @@ -118,7 +118,7 @@ public override string[] renderingLayerMaskNames /// HDRP default shader. public override Shader defaultShader - => defaultSettings.renderPipelineResources?.shaders.defaultPS; + => globalSettings?.renderPipelineResources?.shaders.defaultPS; [SerializeField] internal VirtualTexturingSettingsSRP virtualTexturingSettings = new VirtualTexturingSettingsSRP(); @@ -135,50 +135,50 @@ internal bool useRenderGraph #if UNITY_EDITOR /// HDRP default material. public override Material defaultMaterial - => defaultSettings.renderPipelineEditorResources?.materials.defaultDiffuseMat; + => globalSettings.renderPipelineEditorResources?.materials.defaultDiffuseMat; // call to GetAutodeskInteractiveShaderXXX are only from within editor /// HDRP default autodesk interactive shader. public override Shader autodeskInteractiveShader - => defaultSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractive; + => globalSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractive; /// HDRP default autodesk interactive transparent shader. public override Shader autodeskInteractiveTransparentShader - => defaultSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveTransparent; + => globalSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveTransparent; /// HDRP default autodesk interactive masked shader. public override Shader autodeskInteractiveMaskedShader - => defaultSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveMasked; + => globalSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveMasked; /// HDRP default terrain detail lit shader. public override Shader terrainDetailLitShader - => defaultSettings.renderPipelineEditorResources.shaders.terrainDetailLitShader; + => globalSettings.renderPipelineEditorResources.shaders.terrainDetailLitShader; /// HDRP default terrain detail grass shader. public override Shader terrainDetailGrassShader - => defaultSettings.renderPipelineEditorResources.shaders.terrainDetailGrassShader; + => globalSettings.renderPipelineEditorResources.shaders.terrainDetailGrassShader; /// HDRP default terrain detail grass billboard shader. public override Shader terrainDetailGrassBillboardShader - => defaultSettings.renderPipelineEditorResources.shaders.terrainDetailGrassBillboardShader; + => globalSettings.renderPipelineEditorResources.shaders.terrainDetailGrassBillboardShader; // Note: This function is HD specific /// HDRP default Decal material. public Material GetDefaultDecalMaterial() - => defaultSettings.renderPipelineEditorResources.materials.defaultDecalMat; + => globalSettings.renderPipelineEditorResources.materials.defaultDecalMat; // Note: This function is HD specific /// HDRP default mirror material. public Material GetDefaultMirrorMaterial() - => defaultSettings.renderPipelineEditorResources.materials.defaultMirrorMat; + => globalSettings.renderPipelineEditorResources.materials.defaultMirrorMat; /// HDRP default particles material. public override Material defaultParticleMaterial - => defaultSettings.renderPipelineEditorResources.materials.defaultParticleMat; + => globalSettings.renderPipelineEditorResources.materials.defaultParticleMat; /// HDRP default terrain material. public override Material defaultTerrainMaterial - => defaultSettings.renderPipelineEditorResources.materials.defaultTerrainMat; + => globalSettings.renderPipelineEditorResources.materials.defaultTerrainMat; // Array structure that allow us to manipulate the set of defines that the HD render pipeline needs List defineArray = new List(); From 61169b7c3c110c7c6c4088467d848ed0c2af2514 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 1 Mar 2021 15:09:06 +0100 Subject: [PATCH 44/58] [Fix] Migration to HDRP Global Settings asset now saves its changes on disk - not only the default values --- .../Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 95ae159d867..6eae1fa6374 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -142,8 +142,6 @@ internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipe assetCreated = ScriptableObject.CreateInstance(); AssetDatabase.CreateAsset(assetCreated, path); assetCreated.Init(); - AssetDatabase.SaveAssets(); - AssetDatabase.Refresh(); } #pragma warning disable 618 // Type or member is obsolete @@ -205,6 +203,9 @@ internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipe } #pragma warning restore 618 + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + return assetCreated; } From ff66003fc143f484bd79a93bc282bdda8cbb0101 Mon Sep 17 00:00:00 2001 From: Lewis Jordan Date: Thu, 4 Mar 2021 14:34:53 +0000 Subject: [PATCH 45/58] Reviewed documentation Also removed unused anchor links (our tools generate them automatically from the header names) --- .../Documentation~/Default-Settings-Window.md | 23 ++++--------------- .../Upgrading-from-2021.1-to-2021.2.md | 2 +- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md index 34b8c80ce2c..04a193467b2 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md @@ -9,28 +9,21 @@ The High Definition Render Pipeline (HDRP) adds the HDRP Settings tab to Unity's The HDRP Settings tab is part of the Graphics Settings window. To get to this tab, select **Edit > Project Settings > Graphics** and then, in the sidebar, click **HDRP Settings**. - ## Resources Resources assets list the Shaders, Materials, Textures, and other Assets needed to operate the High Definition Render Pipeline. | **Property** | **Description** | -| --------------------------| ------------------------------------------------------------ | -| **Player Resources** | Stores references to Shaders and Materials that HDRP uses. When you build your Unity Project, HDRP embeds all of the resources that this Asset references. It allows you to set up multiple render pipelines in a Unity Project and, when you build the Project, Unity only embeds Shaders and Materials relevant for that pipeline. This is the Scriptable Render Pipeline equivalent of Unity’s Resources folder mechanism. When you create a new HDRP Global Settings Asset, Unity also creates one of these and references it in the new HDRP Global Settings Asset automatically.| -| **Ray Tracing Resources** | Stores references to Shaders and Materials that HDRP uses for Ray Tracing. Having these resources in a seperate asset file then the main pipeline resources allows HDRP to use less memory for applciations that don't support ray tracing. | +| ------------------------- | ------------------------------------------------------------ | +| **Player Resources** | Stores references to Shaders and Materials that HDRP uses. When you build your Unity Project, HDRP embeds all of the resources that this Asset references. It allows you to set up multiple render pipelines in a Unity Project and, when you build the Project, Unity only embeds Shaders and Materials relevant for that pipeline. This is the Scriptable Render Pipeline equivalent of Unity’s Resources folder mechanism. When you create a new HDRP Global Settings Asset, Unity also creates one of these and references it in the new HDRP Global Settings Asset automatically. | +| **Ray Tracing Resources** | Stores references to Shaders and Materials that HDRP uses for ray tracing. HDRP stores these resources in a separate Asset file then the main pipeline resources so it can use less memory for applications that don't support ray tracing. | | **Editor Resources** | Stores reference resources for the Editor only. Unity does not include these when you build your Unity Project. When you create an HDRP Asset, Unity creates an HDRP Resources Asset, and the new HDRP Asset references it automatically. | -| Property | Description | -| ------------------------------------- | ------------------------------------------------------------ || - - ## Frame Settings [Frame Settings](Frame-Settings.md) control the rendering passes that Cameras make at runtime. This section allows you to set default Frame Settings that all Cameras use if you do not enable their Custom Frame Settings checkbox. For information about what each property does, see [Frame Settings](Frame-Settings.md). - - ### Volume Profiles You can use this section to assign and edit a [Volume Profile](Volume-Profile.md) that [Volumes](Volumes.md) use by default in your Scenes. You do not need to create a Volume for this specific Volume Profile to be active, because HDRP always processes it as if it is assigned to a global Volume in the Scene, but with the lowest priority. This means that any Volume that you add to a Scene takes priority. @@ -39,20 +32,14 @@ The Default Volume Profile Asset references a Volume Profile in the HDRP Package The LookDev Volume Profile Asset references the Volume Profile that will be used in the [LookDev window](Look-Dev.md). It works the same way than the Default Volume profile except that in this asset you can't put a [Visual Environment Component](Override-Visual-Environment.md) or skies component because they are overwritten by the LookDev. - - ### Custom Post Processes Order Use this section to select which custom post processing effect will be used in the project and in which order they will be executed. You have one list per post processing injection point: `After Opaque And Sky`, `Before Post Process` and `After Post Process`. See the [Custom Post Process](Custom-Post-Process.md) documentation for more details. - - ### Diffusion Profile List -Use this section to select which custom Diffusion Profiles in view at the same time. To use more than 15 custom Diffusion Profiles in a Scene, you can use the Diffusion Profile Override inside a Volume. This allows you to specify which Diffusion Profiles to use in a certain area (or in the Scene if the Volume is global). - - +Use this section to select which custom [Diffusion Profiles](Diffusion-Profile.md) can be in view at the same time. To use more than 15 custom Diffusion Profiles in a Scene, use the [Diffusion Profile Override](Override-Diffusion-Profile.md) inside a Volume. This allows you to specify which Diffusion Profiles to use in a certain area (or in the Scene if the Volume is global). ### Miscellaneous @@ -61,4 +48,4 @@ Use this section to select which custom Diffusion Profiles in view at the same t | Shader Variant Log Level | Use the drop-down to select what information HDRP logs about Shader variants when you build your Unity Project. • Disabled: HDRP doesn’t log any Shader variant information.• Only HDRP Shaders: Only log Shader variant information for HDRP Shaders.• All Shaders: Log Shader variant information for every Shader type. | | Lens Attenuation Mode | Set the attenuation mode of the lens that is used to compute exposure. With imperfect lens some energy is lost when converting from EV100 to the exposure multiplier, while a perfect lens has no attenuation and no energy is lost. | | Light Layer Names | The name displayed on Lights and Meshes when using [Light Layers](Light-Layers.md). | -| Decal Layer Names | The name displayed on decals and Meshes when using [Decal Layers](Decal.md). +| Decal Layer Names | The name displayed on decals and Meshes when using [Decal Layers](Decal.md). | diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md index 82e7ae597b7..dcdb519486d 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md @@ -13,4 +13,4 @@ to: ## HDRP Global Settings -From 2021.2, the GraphicsSettings's assigned HDRP Asset no longer acts as the defaultAsset for HDRP. A new Asset called HDRP Global Settings has been added to save settings unrelated to which HDRP Asset is active. +From 2021.2, the HDRP Asset assigned in the Graphics Settings no longer acts as the default Asset for HDRP. A new HDRP Global Settings Asset now exists to save settings unrelated to which HDRP Asset is active. From 988af54488f57459128b0b9ca65c91ff3deedd00 Mon Sep 17 00:00:00 2001 From: Lewis Jordan Date: Thu, 4 Mar 2021 15:58:26 +0000 Subject: [PATCH 46/58] Removed duplicate space --- .../Documentation~/Default-Settings-Window.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md index 04a193467b2..4bbb5d4b2aa 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Default-Settings-Window.md @@ -17,7 +17,7 @@ Resources assets list the Shaders, Materials, Textures, and other Assets needed | ------------------------- | ------------------------------------------------------------ | | **Player Resources** | Stores references to Shaders and Materials that HDRP uses. When you build your Unity Project, HDRP embeds all of the resources that this Asset references. It allows you to set up multiple render pipelines in a Unity Project and, when you build the Project, Unity only embeds Shaders and Materials relevant for that pipeline. This is the Scriptable Render Pipeline equivalent of Unity’s Resources folder mechanism. When you create a new HDRP Global Settings Asset, Unity also creates one of these and references it in the new HDRP Global Settings Asset automatically. | | **Ray Tracing Resources** | Stores references to Shaders and Materials that HDRP uses for ray tracing. HDRP stores these resources in a separate Asset file then the main pipeline resources so it can use less memory for applications that don't support ray tracing. | -| **Editor Resources** | Stores reference resources for the Editor only. Unity does not include these when you build your Unity Project. When you create an HDRP Asset, Unity creates an HDRP Resources Asset, and the new HDRP Asset references it automatically. | +| **Editor Resources** | Stores reference resources for the Editor only. Unity does not include these when you build your Unity Project. When you create an HDRP Asset, Unity creates an HDRP Resources Asset, and the new HDRP Asset references it automatically. | ## Frame Settings From 5cda3a5a9e31e511fde2dde46a99d68e7ff0d8e5 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 5 Mar 2021 15:25:55 +0100 Subject: [PATCH 47/58] [Fix] Editor/Runtime Resources are sometimes not found when loading a project (tentative fix for DXR shipstopper) --- .../HDRenderPipelineAsset.Migration.cs | 3 -- .../HDRenderPipelineGlobalSettings.cs | 46 +++++++++++++------ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs index d2cf11b3e56..77d99b6fd0d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs @@ -179,9 +179,6 @@ enum Version void OnEnable() { -#if UNITY_EDITOR - HDRenderPipelineGlobalSettings.Ensure(); -#endif k_Migration.Migrate(this); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 6eae1fa6374..55ee9352676 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -116,10 +116,6 @@ void Init() UpdateRenderingLayerNames(); shaderVariantLogLevel = ShaderVariantLogLevel.Disabled; - -#if UNITY_EDITOR - EnsureEditorResources(forceReload: false); -#endif } #if UNITY_EDITOR @@ -228,6 +224,9 @@ internal static HDRenderPipelineGlobalSettings Create(string path, HDRenderPipel if (assetCreated) { +#if UNITY_EDITOR + assetCreated.EnsureEditorResources(forceReload: true); +#endif if (src != null) { assetCreated.renderPipelineResources = src.renderPipelineResources; @@ -438,17 +437,29 @@ internal ref FrameSettings GetDefaultFrameSettings(FrameSettingsRenderType type) internal RenderPipelineResources renderPipelineResources { - get => m_RenderPipelineResources; + get + { +#if UNITY_EDITOR + EnsureRuntimeResources(forceReload: false); +#endif + return m_RenderPipelineResources; + } set { m_RenderPipelineResources = value; } } #if UNITY_EDITOR internal void EnsureRuntimeResources(bool forceReload) { + var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; if (AreResourcesCreated()) + { + if (!EditorUtility.IsPersistent(m_RenderPipelineResources)) + { + m_RenderPipelineResources = AssetDatabase.LoadAssetAtPath(runtimeResourcesPath); + } return; + } - var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; var objs = InternalEditorUtility.LoadSerializedFileAndForget(runtimeResourcesPath); m_RenderPipelineResources = objs != null && objs.Length > 0 ? objs.First() as RenderPipelineResources : null; @@ -462,10 +473,6 @@ internal void EnsureRuntimeResources(bool forceReload) true); } } - else if (!EditorUtility.IsPersistent(m_RenderPipelineResources)) - { - m_RenderPipelineResources = AssetDatabase.LoadAssetAtPath(runtimeResourcesPath); - } } #endif @@ -520,10 +527,22 @@ internal HDRenderPipelineEditorResources renderPipelineEditorResources internal void EnsureEditorResources(bool forceReload) { + var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; if (AreEditorResourcesCreated()) + { + if (!EditorUtility.IsPersistent(m_RenderPipelineEditorResources)) + { + // try to load from AssetDatabase if it is ready + var resources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); + if (resources && !resources.Equals(null)) + { + m_RenderPipelineEditorResources = resources; + } + Debug.Assert(AreEditorResourcesCreated(), "Could not load Editor Resources."); + } return; + } - var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); m_RenderPipelineEditorResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineEditorResources : null; if (forceReload) @@ -536,10 +555,7 @@ internal void EnsureEditorResources(bool forceReload) true); } } - else if (!EditorUtility.IsPersistent(m_RenderPipelineEditorResources)) - { - m_RenderPipelineEditorResources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); - } + Debug.Assert(AreEditorResourcesCreated(), "Could not load Editor Resources."); } internal bool AreEditorResourcesCreated() From 44ab9d783788c57da6e3822c0d533da33e2f69f2 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 8 Mar 2021 10:59:21 +0100 Subject: [PATCH 48/58] [Fix] Consistent Resources loading workflow for Runtime/Editor/Raytracing + fix RT resources path --- .../Editor/Wizard/HDWizard.Configuration.cs | 3 +- .../HDRenderPipelineGlobalSettings.cs | 114 ++++++++++++------ 2 files changed, 77 insertions(+), 40 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index e4410b3d19f..cdcaf6dd244 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -614,7 +614,8 @@ void FixDXRAsset(bool fromAsyncUnused) if (!IsHdrpAssetUsedCorrect()) FixHdrpAssetUsed(fromAsync: false); - HDRenderPipelineGlobalSettings.instance.EnsureRayTracingResources(forceReload: true); + if (SystemInfo.supportsRayTracing) + HDRenderPipelineGlobalSettings.instance.EnsureRayTracingResources(forceReload: true); // IMPORTANT: We display the error only if we are D3D12 as the supportsRayTracing always return false in any other device even if OS/HW supports DXR. // The D3D12 is a separate check in the wizard, so it is fine not to display an error in case we are not D3D12. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 55ee9352676..f2c2eb318a8 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -451,28 +451,40 @@ internal RenderPipelineResources renderPipelineResources internal void EnsureRuntimeResources(bool forceReload) { var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; + RenderPipelineResources resources = null; if (AreResourcesCreated()) { if (!EditorUtility.IsPersistent(m_RenderPipelineResources)) { - m_RenderPipelineResources = AssetDatabase.LoadAssetAtPath(runtimeResourcesPath); + resources = AssetDatabase.LoadAssetAtPath(runtimeResourcesPath); + if (resources && !resources.Equals(null)) + m_RenderPipelineResources = resources; } return; } - var objs = InternalEditorUtility.LoadSerializedFileAndForget(runtimeResourcesPath); - m_RenderPipelineResources = objs != null && objs.Length > 0 ? objs.First() as RenderPipelineResources : null; - - if (forceReload) + resources = AssetDatabase.LoadAssetAtPath(runtimeResourcesPath); + if (resources && !resources.Equals(null)) + { + m_RenderPipelineResources = resources; + } + else { - if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath())) + var objs = InternalEditorUtility.LoadSerializedFileAndForget(runtimeResourcesPath); + m_RenderPipelineResources = objs != null && objs.Length > 0 ? objs.First() as RenderPipelineResources : null; + + if (forceReload) { - InternalEditorUtility.SaveToSerializedFileAndForget( - new UnityEngine.Object[] { m_RenderPipelineResources }, - runtimeResourcesPath, - true); + if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineResources, HDUtils.GetHDRenderPipelinePath())) + { + InternalEditorUtility.SaveToSerializedFileAndForget( + new UnityEngine.Object[] { m_RenderPipelineResources }, + runtimeResourcesPath, + true); + } } } + Debug.Assert(AreResourcesCreated(), "Could not load Runtime Resources for HDRP."); } #endif @@ -528,31 +540,39 @@ internal HDRenderPipelineEditorResources renderPipelineEditorResources internal void EnsureEditorResources(bool forceReload) { var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; + HDRenderPipelineEditorResources resources = null; + if (AreEditorResourcesCreated()) { - if (!EditorUtility.IsPersistent(m_RenderPipelineEditorResources)) + if (!EditorUtility.IsPersistent(m_RenderPipelineEditorResources)) // if not loaded from the Asset database { // try to load from AssetDatabase if it is ready - var resources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); + resources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); if (resources && !resources.Equals(null)) { m_RenderPipelineEditorResources = resources; } - Debug.Assert(AreEditorResourcesCreated(), "Could not load Editor Resources."); } return; } - - var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); - m_RenderPipelineEditorResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineEditorResources : null; - if (forceReload) + resources = AssetDatabase.LoadAssetAtPath(editorResourcesPath); + if (resources && !resources.Equals(null)) + { + m_RenderPipelineEditorResources = resources; + } + else // Asset database may not be ready { - if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineEditorResources, HDUtils.GetHDRenderPipelinePath())) + var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); + m_RenderPipelineEditorResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineEditorResources : null; + if (forceReload) { - InternalEditorUtility.SaveToSerializedFileAndForget( - new Object[] { m_RenderPipelineEditorResources }, - editorResourcesPath, - true); + if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineEditorResources, HDUtils.GetHDRenderPipelinePath())) + { + InternalEditorUtility.SaveToSerializedFileAndForget( + new Object[] { m_RenderPipelineEditorResources }, + editorResourcesPath, + true); + } } } Debug.Assert(AreEditorResourcesCreated(), "Could not load Editor Resources."); @@ -588,29 +608,45 @@ internal HDRenderPipelineRayTracingResources renderPipelineRayTracingResources #if UNITY_EDITOR internal void EnsureRayTracingResources(bool forceReload) { - if (AreRayTracingResourcesCreated()) - return; + var raytracingResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"; + HDRenderPipelineRayTracingResources resources = null; - var raytracingResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"; - var objs = InternalEditorUtility.LoadSerializedFileAndForget(raytracingResourcesPath); - m_RenderPipelineRayTracingResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineRayTracingResources : null; - if (forceReload) + if (AreRayTracingResourcesCreated()) { -#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify - ResourceReloader.TryReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); -#else - if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath())) + if (!EditorUtility.IsPersistent(m_RenderPipelineRayTracingResources)) { - InternalEditorUtility.SaveToSerializedFileAndForget( - new Object[] { m_RenderPipelineRayTracingResources }, - raytracingResourcesPath, - true); + resources = AssetDatabase.LoadAssetAtPath(raytracingResourcesPath); + if (resources && !resources.Equals(null)) + { + m_RenderPipelineRayTracingResources = resources; + } } -#endif + return; } - else if (!EditorUtility.IsPersistent(m_RenderPipelineRayTracingResources)) + resources = AssetDatabase.LoadAssetAtPath(raytracingResourcesPath); + if (resources && !resources.Equals(null)) { - m_RenderPipelineRayTracingResources = AssetDatabase.LoadAssetAtPath(raytracingResourcesPath); + m_RenderPipelineRayTracingResources = resources; + } + else + { + var objs = InternalEditorUtility.LoadSerializedFileAndForget(raytracingResourcesPath); + m_RenderPipelineRayTracingResources = (objs != null && objs.Length > 0) ? objs[0] as HDRenderPipelineRayTracingResources : null; + if (forceReload) + { +#if UNITY_EDITOR_LINUX // Temp hack to be able to make linux test run. To clarify + ResourceReloader.TryReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath()); +#else + if (ResourceReloader.ReloadAllNullIn(m_RenderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath())) + { + InternalEditorUtility.SaveToSerializedFileAndForget( + new Object[] { m_RenderPipelineRayTracingResources }, + raytracingResourcesPath, + true); + } +#endif + Debug.Assert(AreRayTracingResourcesCreated(), $"Could not load Ray Tracing Resources from {raytracingResourcesPath}."); + } } } From fec88ae472394296a01d711a463c1d61165e19ab Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 8 Mar 2021 15:45:40 +0100 Subject: [PATCH 49/58] Formatting fix --- .../DiffusionProfile/DiffusionProfileSettings.Migration.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs index 5bfe4c5016c..7453274f970 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.Migration.cs @@ -43,7 +43,7 @@ internal DiffusionProfile this[int index] var importer = AssetImporter.GetAtPath(assetPath); if (importer == null) return; - + var currentHDAsset = HDRenderPipeline.currentAsset; if (currentHDAsset == null) throw new Exception("Can't upgrade diffusion profile without an active HD Render Pipeline asset (see Quality Settings)."); @@ -106,7 +106,7 @@ internal DiffusionProfile this[int index] #pragma warning restore 618 }) ); - + #if UNITY_EDITOR public static void UpgradeMaterial(Material mat, DiffusionProfileSettings mainProfile) { From 97a718f7a2d85414304bef59ec5fcc17a31c96ba Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 9 Mar 2021 17:56:22 +0100 Subject: [PATCH 50/58] A few fixes when migrating from 2020.2 to 2021.2 --- .../RenderPipeline/HDRenderPipelineAsset.cs | 24 ++++++++-------- .../HDRenderPipelineGlobalSettings.cs | 28 +++++++++++++------ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 7aa55c64727..7f320ce4247 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -99,7 +99,7 @@ internal ReflectionSystemParameters reflectionSystemParameters public MaterialQuality defaultMaterialQualityLevel { get => m_DefaultMaterialQualityLevel; } [SerializeField] - [Obsolete("Use diffusionProfileSettingsList instead")] + [Obsolete("Use HDRP Global Settings' diffusionProfileSettingsList instead")] internal DiffusionProfileSettings diffusionProfileSettings; /// Names used for display of rendering layer masks. @@ -118,7 +118,7 @@ public override string[] renderingLayerMaskNames /// HDRP default shader. public override Shader defaultShader - => globalSettings?.renderPipelineResources?.shaders.defaultPS; + => globalSettings.renderPipelineResources?.shaders.defaultPS; [SerializeField] internal VirtualTexturingSettingsSRP virtualTexturingSettings = new VirtualTexturingSettingsSRP(); @@ -140,45 +140,45 @@ public override Material defaultMaterial // call to GetAutodeskInteractiveShaderXXX are only from within editor /// HDRP default autodesk interactive shader. public override Shader autodeskInteractiveShader - => globalSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractive; + => globalSettings.renderPipelineEditorResources?.shaderGraphs.autodeskInteractive; /// HDRP default autodesk interactive transparent shader. public override Shader autodeskInteractiveTransparentShader - => globalSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveTransparent; + => globalSettings.renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveTransparent; /// HDRP default autodesk interactive masked shader. public override Shader autodeskInteractiveMaskedShader - => globalSettings.renderPipelineEditorResources.shaderGraphs.autodeskInteractiveMasked; + => globalSettings.renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveMasked; /// HDRP default terrain detail lit shader. public override Shader terrainDetailLitShader - => globalSettings.renderPipelineEditorResources.shaders.terrainDetailLitShader; + => globalSettings.renderPipelineEditorResources?.shaders.terrainDetailLitShader; /// HDRP default terrain detail grass shader. public override Shader terrainDetailGrassShader - => globalSettings.renderPipelineEditorResources.shaders.terrainDetailGrassShader; + => globalSettings.renderPipelineEditorResources?.shaders.terrainDetailGrassShader; /// HDRP default terrain detail grass billboard shader. public override Shader terrainDetailGrassBillboardShader - => globalSettings.renderPipelineEditorResources.shaders.terrainDetailGrassBillboardShader; + => globalSettings.renderPipelineEditorResources?.shaders.terrainDetailGrassBillboardShader; // Note: This function is HD specific /// HDRP default Decal material. public Material GetDefaultDecalMaterial() - => globalSettings.renderPipelineEditorResources.materials.defaultDecalMat; + => globalSettings.renderPipelineEditorResources?.materials.defaultDecalMat; // Note: This function is HD specific /// HDRP default mirror material. public Material GetDefaultMirrorMaterial() - => globalSettings.renderPipelineEditorResources.materials.defaultMirrorMat; + => globalSettings.renderPipelineEditorResources?.materials.defaultMirrorMat; /// HDRP default particles material. public override Material defaultParticleMaterial - => globalSettings.renderPipelineEditorResources.materials.defaultParticleMat; + => globalSettings.renderPipelineEditorResources?.materials.defaultParticleMat; /// HDRP default terrain material. public override Material defaultTerrainMaterial - => globalSettings.renderPipelineEditorResources.materials.defaultTerrainMat; + => globalSettings.renderPipelineEditorResources?.materials.defaultTerrainMat; // Array structure that allow us to manipulate the set of defines that the HD render pipeline needs List defineArray = new List(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index f2c2eb318a8..a94cbc63c80 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -166,21 +166,31 @@ internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipe assetCreated.lightLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName6); assetCreated.lightLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteLightLayerName7); - assetCreated.decalLayerName0 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName0); - assetCreated.decalLayerName1 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName1); - assetCreated.decalLayerName2 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName2); - assetCreated.decalLayerName3 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName3); - assetCreated.decalLayerName4 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName4); - assetCreated.decalLayerName5 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName5); - assetCreated.decalLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName6); - assetCreated.decalLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName7); + // Decal layer names were added in 2021 cycle + if (oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName0 != null) + { + assetCreated.decalLayerName0 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName0); + assetCreated.decalLayerName1 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName1); + assetCreated.decalLayerName2 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName2); + assetCreated.decalLayerName3 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName3); + assetCreated.decalLayerName4 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName4); + assetCreated.decalLayerName5 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName5); + assetCreated.decalLayerName6 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName6); + assetCreated.decalLayerName7 = System.String.Copy(oldAsset.currentPlatformRenderPipelineSettings.m_ObsoleteDecalLayerName7); + } assetCreated.shaderVariantLogLevel = oldAsset.m_ObsoleteShaderVariantLogLevel; assetCreated.lensAttenuationMode = oldAsset.m_ObsoleteLensAttenuation; + // we need to make sure the old diffusion profile had time to upgrade before moving it away if (oldAsset.diffusionProfileSettings != null) + { oldAsset.diffusionProfileSettings.TryToUpgrade(); - assetCreated.diffusionProfileSettingsList = oldAsset.m_ObsoleteDiffusionProfileSettingsList; + } + + System.Array.Resize(ref assetCreated.diffusionProfileSettingsList, oldAsset.m_ObsoleteDiffusionProfileSettingsList.Length); + for (int i = 0; i < oldAsset.m_ObsoleteDiffusionProfileSettingsList.Length; ++i) + assetCreated.diffusionProfileSettingsList[i] = oldAsset.m_ObsoleteDiffusionProfileSettingsList[i]; //3. Clear obsolete fields if (bClearObsoleteFields) From 2000f9b0715ccfd6500d447b76f21df7e96478e7 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Wed, 10 Mar 2021 13:51:08 +0100 Subject: [PATCH 51/58] New migration workflow - lazy migration from HDRP Asset to Global Settings --- .../HDRenderPipelineAsset.Migration.cs | 13 ++---- .../RenderPipeline/HDRenderPipelineAsset.cs | 28 ++++++------ .../HDRenderPipelineGlobalSettings.cs | 44 ++++++++++++------- 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs index 77d99b6fd0d..91d7a46ce00 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.Migration.cs @@ -28,6 +28,7 @@ enum Version RoughDistortion, VirtualTexturing, AddedHDRenderPipelineGlobalSettings + // If you add more steps here, do not clear settings that are used for the migration to the HDRP Global Settings asset } static readonly MigrationDescription k_Migration = MigrationDescription.New( @@ -160,14 +161,9 @@ enum Version MigrationStep.New(Version.AddedHDRenderPipelineGlobalSettings, (HDRenderPipelineAsset data) => { #if UNITY_EDITOR - // 2/ it acted as the definition of the Default Settings - now migrated to its own asset -#pragma warning disable 618 // Type or member is obsolete if (data == GraphicsSettings.defaultRenderPipeline) -#pragma warning restore 618 { - HDRenderPipelineGlobalSettings globalSettings = HDRenderPipelineGlobalSettings.MigrateFromHDRPAsset(data, true); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(globalSettings); - EditorUtility.SetDirty(globalSettings); + HDRenderPipelineGlobalSettings.MigrateFromHDRPAsset(data); } #endif }) @@ -177,10 +173,7 @@ enum Version Version m_Version = MigrationDescription.LastVersion(); Version IVersionable.version { get => m_Version; set => m_Version = value; } - void OnEnable() - { - k_Migration.Migrate(this); - } + void OnEnable() => k_Migration.Migrate(this); #pragma warning disable 618 // Type or member is obsolete [SerializeField] diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs index 7f320ce4247..713d49dacd0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineAsset.cs @@ -35,9 +35,7 @@ protected override RenderPipeline CreatePipeline() protected override void OnValidate() { isInOnValidateCall = true; -#if UNITY_EDITOR - HDRenderPipelineGlobalSettings.Ensure(); -#endif + //Do not reconstruct the pipeline if we modify other assets. //OnValidate is called once at first selection of the asset. if (GraphicsSettings.currentRenderPipeline == this) @@ -118,7 +116,7 @@ public override string[] renderingLayerMaskNames /// HDRP default shader. public override Shader defaultShader - => globalSettings.renderPipelineResources?.shaders.defaultPS; + => globalSettings?.renderPipelineResources?.shaders.defaultPS; [SerializeField] internal VirtualTexturingSettingsSRP virtualTexturingSettings = new VirtualTexturingSettingsSRP(); @@ -135,50 +133,50 @@ internal bool useRenderGraph #if UNITY_EDITOR /// HDRP default material. public override Material defaultMaterial - => globalSettings.renderPipelineEditorResources?.materials.defaultDiffuseMat; + => globalSettings?.renderPipelineEditorResources?.materials.defaultDiffuseMat; // call to GetAutodeskInteractiveShaderXXX are only from within editor /// HDRP default autodesk interactive shader. public override Shader autodeskInteractiveShader - => globalSettings.renderPipelineEditorResources?.shaderGraphs.autodeskInteractive; + => globalSettings?.renderPipelineEditorResources?.shaderGraphs.autodeskInteractive; /// HDRP default autodesk interactive transparent shader. public override Shader autodeskInteractiveTransparentShader - => globalSettings.renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveTransparent; + => globalSettings?.renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveTransparent; /// HDRP default autodesk interactive masked shader. public override Shader autodeskInteractiveMaskedShader - => globalSettings.renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveMasked; + => globalSettings?.renderPipelineEditorResources?.shaderGraphs.autodeskInteractiveMasked; /// HDRP default terrain detail lit shader. public override Shader terrainDetailLitShader - => globalSettings.renderPipelineEditorResources?.shaders.terrainDetailLitShader; + => globalSettings?.renderPipelineEditorResources?.shaders.terrainDetailLitShader; /// HDRP default terrain detail grass shader. public override Shader terrainDetailGrassShader - => globalSettings.renderPipelineEditorResources?.shaders.terrainDetailGrassShader; + => globalSettings?.renderPipelineEditorResources?.shaders.terrainDetailGrassShader; /// HDRP default terrain detail grass billboard shader. public override Shader terrainDetailGrassBillboardShader - => globalSettings.renderPipelineEditorResources?.shaders.terrainDetailGrassBillboardShader; + => globalSettings?.renderPipelineEditorResources?.shaders.terrainDetailGrassBillboardShader; // Note: This function is HD specific /// HDRP default Decal material. public Material GetDefaultDecalMaterial() - => globalSettings.renderPipelineEditorResources?.materials.defaultDecalMat; + => globalSettings?.renderPipelineEditorResources?.materials.defaultDecalMat; // Note: This function is HD specific /// HDRP default mirror material. public Material GetDefaultMirrorMaterial() - => globalSettings.renderPipelineEditorResources?.materials.defaultMirrorMat; + => globalSettings?.renderPipelineEditorResources?.materials.defaultMirrorMat; /// HDRP default particles material. public override Material defaultParticleMaterial - => globalSettings.renderPipelineEditorResources?.materials.defaultParticleMat; + => globalSettings?.renderPipelineEditorResources?.materials.defaultParticleMat; /// HDRP default terrain material. public override Material defaultTerrainMaterial - => globalSettings.renderPipelineEditorResources?.materials.defaultTerrainMat; + => globalSettings?.renderPipelineEditorResources?.materials.defaultTerrainMat; // Array structure that allow us to manipulate the set of defines that the HD render pipeline needs List defineArray = new List(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index a94cbc63c80..5272fd412d1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -60,22 +60,31 @@ static internal HDRenderPipelineGlobalSettings Ensure() HDRenderPipelineGlobalSettings assetCreated = null; string path = "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"; - assetCreated = AssetDatabase.LoadAssetAtPath(path); - if (assetCreated == null) + if (assetToBeMigrated != null && !assetToBeMigrated.Equals(null)) { - var guidHDGlobalAssets = AssetDatabase.FindAssets("t:HDRenderPipelineGlobalSettings"); - //If we could not find the asset at the default path, find the first one - if (guidHDGlobalAssets.Length > 0) - { - var curGUID = guidHDGlobalAssets[0]; - path = AssetDatabase.GUIDToAssetPath(curGUID); - assetCreated = AssetDatabase.LoadAssetAtPath(path); - } - else // or create one altogether + assetCreated = MigrateFromHDRPAsset(assetToBeMigrated, path, bClearObsoleteFields: false); + if (assetCreated != null && !assetCreated.Equals(null)) + assetToBeMigrated = null; + } + else + { + assetCreated = AssetDatabase.LoadAssetAtPath(path); + if (assetCreated == null) { - if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) - AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); - assetCreated = Create(path); + var guidHDGlobalAssets = AssetDatabase.FindAssets("t:HDRenderPipelineGlobalSettings"); + //If we could not find the asset at the default path, find the first one + if (guidHDGlobalAssets.Length > 0) + { + var curGUID = guidHDGlobalAssets[0]; + path = AssetDatabase.GUIDToAssetPath(curGUID); + assetCreated = AssetDatabase.LoadAssetAtPath(path); + } + else // or create one altogether + { + if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) + AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); + assetCreated = Create(path); + } } } Debug.Assert(assetCreated, "Could not create HDRP's Global Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); @@ -119,10 +128,11 @@ void Init() } #if UNITY_EDITOR - internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, bool bClearObsoleteFields = true) + + static HDRenderPipelineAsset assetToBeMigrated = null; + internal static void MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset) { - string path = "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"; - return MigrateFromHDRPAsset(oldAsset, path, bClearObsoleteFields); + assetToBeMigrated = oldAsset; } internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) From 7491a8b0ca433f25824cd6b8f0e77ad4305e5f6b Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 12 Mar 2021 18:51:28 +0100 Subject: [PATCH 52/58] Adapting to tests to new workflow --- .../Assets/HDRPDefaultResources.meta | 8 ++ .../HDRenderPipelineGlobalSettings.asset | 105 ++++++++++++++++++ .../HDRenderPipelineGlobalSettings.asset.meta | 8 ++ .../ProjectSettings/GraphicsSettings.asset | 8 +- .../HDRenderPipelineGlobalSettings.cs | 18 ++- 5 files changed, 140 insertions(+), 7 deletions(-) create mode 100644 TestProjects/HDRP_Tests/Assets/HDRPDefaultResources.meta create mode 100644 TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset create mode 100644 TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta diff --git a/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources.meta b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources.meta new file mode 100644 index 00000000000..029e2fd16d9 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2a2ad066435886408abf7d5e95cdeea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset new file mode 100644 index 00000000000..09dca8cd36f --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 781cc897cf8675041a751163b51f97dd, type: 3} + m_Name: HDRenderPipelineGlobalSettings + m_EditorClassIdentifier: + m_VolumeProfileDefault: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + type: 2} + m_VolumeProfileLookDev: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_RenderingPathDefaultCameraFrameSettings: + bitDatas: + data1: 139549384114013 + data2: 4539628425463136264 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + bitDatas: + data1: 139713129348893 + data2: 4539628424389459968 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_RenderingPathDefaultRealtimeReflectionFrameSettings: + bitDatas: + data1: 140065316601629 + data2: 4539628424389459968 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_RenderPipelineResources: {fileID: 0} + m_RenderPipelineRayTracingResources: {fileID: 0} + beforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + beforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + beforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + afterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + decalLayerName0: Decal Layer default + decalLayerName1: Decal Layer 1 + decalLayerName2: Decal Layer 2 + decalLayerName3: Decal Layer 3 + decalLayerName4: Decal Layer 4 + decalLayerName5: Decal Layer 5 + decalLayerName6: Decal Layer 6 + decalLayerName7: Decal Layer 7 + shaderVariantLogLevel: 0 + lensAttenuationMode: 0 + diffusionProfileSettingsList: + - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} + - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} + - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} + - {fileID: 11400000, guid: 968a3176000311d42af174756ece7f4d, type: 2} + - {fileID: 11400000, guid: 768484f758b6f7b4daf53a7d9949f5af, type: 2} + - {fileID: 11400000, guid: fcb8f92518ca5d14bbd7e6751b28cd24, type: 2} + - {fileID: 11400000, guid: 64ca25f51b132ea4093511f7456ea220, type: 2} + - {fileID: 11400000, guid: fd29a6d903d5eae4d94833c2048bfd9d, type: 2} + - {fileID: 11400000, guid: 76f34276e6d50dc4bb0762b87af8931e, type: 2} + - {fileID: 11400000, guid: cd1cd5a7c0527844dbca2b7d562b9049, type: 2} + - {fileID: 11400000, guid: 385fff18b5c61754188b49a485ecb84a, type: 2} + - {fileID: 11400000, guid: d3dd41407c183554ca54bded902d4b7b, type: 2} + - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} + - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} + - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} + m_Version: 0 diff --git a/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 00000000000..c256e9e4e82 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b9ef005ea53e8049b064103da30d115 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/ProjectSettings/GraphicsSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/GraphicsSettings.asset index ca9dc00be0e..41780579dd0 100644 --- a/TestProjects/HDRP_Tests/ProjectSettings/GraphicsSettings.asset +++ b/TestProjects/HDRP_Tests/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -35,7 +35,7 @@ GraphicsSettings: m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, + m_CustomRenderPipeline: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} @@ -57,4 +57,8 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 + m_DefaultRenderingLayerMask: 257 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: 8b9ef005ea53e8049b064103da30d115, + type: 2} diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 5272fd412d1..14a3ad30894 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -55,13 +55,18 @@ static internal void UpdateGraphicsSettings(HDRenderPipelineGlobalSettings newSe //Making sure there is at least one HDRenderPipelineGlobalSettings instance in the project static internal HDRenderPipelineGlobalSettings Ensure() { - if (HDRenderPipelineGlobalSettings.instance) + bool needsMigration = (assetToBeMigrated != null && !assetToBeMigrated.Equals(null)); + + if (HDRenderPipelineGlobalSettings.instance && !needsMigration) return HDRenderPipelineGlobalSettings.instance; HDRenderPipelineGlobalSettings assetCreated = null; string path = "Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset"; - if (assetToBeMigrated != null && !assetToBeMigrated.Equals(null)) + if (needsMigration) { + if (HDRenderPipelineGlobalSettings.instance) + path = AssetDatabase.GetAssetPath(HDRenderPipelineGlobalSettings.instance); + assetCreated = MigrateFromHDRPAsset(assetToBeMigrated, path, bClearObsoleteFields: false); if (assetCreated != null && !assetCreated.Equals(null)) assetToBeMigrated = null; @@ -468,9 +473,10 @@ internal RenderPipelineResources renderPipelineResources } #if UNITY_EDITOR + string runtimeResourcesPath => HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; + internal void EnsureRuntimeResources(bool forceReload) { - var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; RenderPipelineResources resources = null; if (AreResourcesCreated()) { @@ -557,9 +563,10 @@ internal HDRenderPipelineEditorResources renderPipelineEditorResources } } + string editorResourcesPath => HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; + internal void EnsureEditorResources(bool forceReload) { - var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; HDRenderPipelineEditorResources resources = null; if (AreEditorResourcesCreated()) @@ -626,9 +633,10 @@ internal HDRenderPipelineRayTracingResources renderPipelineRayTracingResources } #if UNITY_EDITOR + string raytracingResourcesPath => HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"; + internal void EnsureRayTracingResources(bool forceReload) { - var raytracingResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset"; HDRenderPipelineRayTracingResources resources = null; if (AreRayTracingResourcesCreated()) From 151e219553be0cd39136453386fa4c65a811bc36 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Fri, 12 Mar 2021 20:21:50 +0100 Subject: [PATCH 53/58] Fix test 4060 --- .../HDRenderPipelineGlobalSettings.asset | 45 +- .../HDRP_Test_CustomQualityLevels.asset | 448 ++++++++++------- .../RP_Assets/HDRP_Test_Def.asset | 470 +++++++++--------- .../RP_Assets/HDRP_Test_Def_Decal_3RT.asset | 457 ++++++++++------- .../HDRP_Test_Def_Drs_Hardware.asset | 187 +++---- .../HDRP_Test_Def_Drs_Software.asset | 187 +++---- .../RP_Assets/HDRP_Test_Def_FP16.asset | 451 ++++++++++------- .../HDRP_Test_Def_FP16_PPAlpha.asset | 454 ++++++++++------- .../RP_Assets/HDRP_Test_Def_MSAABoth.asset | 403 ++++++++++----- .../RP_Assets/HDRP_Test_Def_MSAAForward.asset | 453 +++++++++-------- .../HDRP_Test_Def_No_Motion_Vectors.asset | 466 ++++++++--------- ...P_Test_Def_No_Motion_Vectors_Forward.asset | 459 ++++++++--------- .../HDRP_Test_FabricConvolutionOn.asset | 403 ++++++++++----- .../HDRP_Test_ShadowFilteringHigh.asset | 439 ++++++++++------ .../RP_Assets/HDRP_Test_TransparentSSR.asset | 448 ++++++++++------- 15 files changed, 3407 insertions(+), 2363 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset index 09dca8cd36f..2d234ecce61 100644 --- a/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset +++ b/TestProjects/HDRP_Tests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset @@ -19,7 +19,7 @@ MonoBehaviour: m_RenderingPathDefaultCameraFrameSettings: bitDatas: data1: 139549384114013 - data2: 4539628425463136264 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -33,7 +33,7 @@ MonoBehaviour: m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: bitDatas: data1: 139713129348893 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -47,7 +47,7 @@ MonoBehaviour: m_RenderingPathDefaultRealtimeReflectionFrameSettings: bitDatas: data1: 140065316601629 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -58,32 +58,33 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineResources: {fileID: 0} + m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} m_RenderPipelineRayTracingResources: {fileID: 0} beforeTransparentCustomPostProcesses: - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforeTAACustomPostProcesses: - - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null beforePostProcessCustomPostProcesses: - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null afterPostProcessCustomPostProcesses: - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 + beforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + decalLayerName0: Decal Layer default + decalLayerName1: Decal Layer 1 + decalLayerName2: Decal Layer 2 + decalLayerName3: Decal Layer 3 + decalLayerName4: Decal Layer 4 + decalLayerName5: Decal Layer 5 + decalLayerName6: Decal Layer 6 + decalLayerName7: Decal Layer 7 shaderVariantLogLevel: 0 lensAttenuationMode: 0 diffusionProfileSettingsList: diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_CustomQualityLevels.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_CustomQualityLevels.asset index e9f39732a82..b264d9182c7 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_CustomQualityLevels.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_CustomQualityLevels.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_CustomQualityLevels m_EditorClassIdentifier: - m_Version: 11 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 1 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 0 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000000 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: 5 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,191 +397,64 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69180639936349 - data2: 4539628424926265344 + data1: 139549384114013 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69344385171229 - data2: 4539628424389459968 + data1: 139713129348893 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69696572423965 - data2: 4539628424389459968 + data1: 140065316601629 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - increaseSssSampleCount: 0 - supportVolumetrics: 1 - increaseResolutionOfVolumetrics: 1 - supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 1 - supportRayTracing: 0 - supportedRaytracingTier: 2 - lightLoopSettings: - cookieSize: 128 - cookieTexArraySize: 16 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - planarReflectionProbeCacheSize: 12 - planarReflectionTextureSize: 512 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 0 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadows: 2 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - singlePass: 1 - occlusionMesh: 1 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000000 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - availableMaterialQualityLevels: 5 - m_DefaultMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -348,9 +470,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def.asset index 8f0ba94356a..c2373febd76 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def.asset @@ -12,192 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def m_EditorClassIdentifier: - m_Version: 16 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteBakedOrCustomReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteRealtimeReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, - type: 2} - m_LensAttenuation: 0 - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: - bitDatas: - data1: 139549384114013 - data2: 4539628425463136264 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: - bitDatas: - data1: 139713129348893 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: - bitDatas: - data1: 140065316601629 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 1 @@ -210,15 +24,8 @@ MonoBehaviour: m_SchemaId: m_Id: With3Levels supportVolumetrics: 1 + supportVolumetricClouds: 0 supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -227,37 +34,33 @@ MonoBehaviour: supportCustomPass: 1 customBufferFormat: 12 supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels supportDecals: 1 supportDecalLayers: 1 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 msaaSampleCount: 1 supportMotionVectors: 1 supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 supportDitheringCrossFade: 0 supportTerrainHole: 1 supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 supportRayTracing: 0 supportedRayTracingMode: 3 - probeVolumeSettings: - atlasResolution: 128 - atlasOctahedralDepthResolution: 2048 lightLoopSettings: cookieAtlasSize: 8192 cookieFormat: 74 - pointCookieSize: 256 cookieAtlasLastValidMip: 0 cookieTexArraySize: 1 planarReflectionAtlasSize: 2048 reflectionProbeCacheSize: 128 reflectionCubemapSize: 128 reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 skyReflectionSize: 256 skyLightingOverrideLayerMask: serializedVersion: 2 @@ -269,6 +72,9 @@ MonoBehaviour: maxEnvLightsOnScreen: 64 maxDecalsOnScreen: 512 maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 hdShadowInitParams: maxShadowRequests: 128 directionalShadowsDepthBits: 32 @@ -339,9 +145,11 @@ MonoBehaviour: - 13 DoFResolution: 040000000200000001000000 DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 MotionBlurSampleCount: 04000000080000000c000000 BloomRes: 040000000200000002000000 BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 ChromaticAberrationMaxSamples: 03000000060000000c000000 lightSettings: useContactShadow: @@ -367,6 +175,8 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 RTAORayLength: - 0.5 - 3 @@ -394,10 +204,6 @@ MonoBehaviour: - 0.66 - 1 RTGISecondDenoise: 010101 - RTGISecondDenoiserRadius: - - 0.33 - - 0.33 - - 0.5 RTRMinSmoothness: - 0.6 - 0.4 @@ -414,18 +220,243 @@ MonoBehaviour: - 0.8 - 1 - 1.2 - RTRUpScaleRadius: 040000000400000003000000 RTRFullResolution: 000001 RTRDenoise: 010101 RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: Decal Layer default + m_ObsoleteDecalLayerName1: Decal Layer 1 + m_ObsoleteDecalLayerName2: Decal Layer 2 + m_ObsoleteDecalLayerName3: Decal Layer 3 + m_ObsoleteDecalLayerName4: Decal Layer 4 + m_ObsoleteDecalLayerName5: Decal Layer 5 + m_ObsoleteDecalLayerName6: Decal Layer 6 + m_ObsoleteDecalLayerName7: Decal Layer 7 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - diffusionProfileSettingsList: + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteRealtimeReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + type: 2} + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_ObsoleteFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139549384114013 + data2: 4539628425463136280 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139713129348893 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 140065316601629 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -441,16 +472,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforeTAACustomPostProcesses: - - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - virtualTexturingSettings: - streamingCpuCacheSizeInMegaBytes: 256 - streamingGpuCacheSettings: - - format: 0 - sizeInMegaBytes: 128 diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Decal_3RT.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Decal_3RT.asset index 68f2d61800c..8262a686864 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Decal_3RT.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Decal_3RT.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_Decal_3RT m_EditorClassIdentifier: - m_Version: 15 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 1 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 4096 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 1 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 1 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 0 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000000 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,17 +397,14 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, type: 2} - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: data1: 139549384114013 - data2: 4539628425463136256 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -169,10 +415,10 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 139713129348893 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -183,10 +429,10 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 140065316601629 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -197,176 +443,19 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSRTransparent: 0 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - sssSampleBudget: - m_Values: 140000002800000050000000 - m_SchemaId: - m_Id: With3Levels - supportVolumetrics: 1 - supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 1 - supportProbeVolume: 0 - supportRayTracing: 0 - supportedRayTracingMode: 3 - probeVolumeSettings: - atlasWidth: 128 - atlasHeight: 128 - atlasDepth: 512 - atlasOctahedralDepthWidth: 2048 - atlasOctahedralDepthHeight: 2048 - lightLoopSettings: - cookieAtlasSize: 4096 - cookieFormat: 74 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - cookieAtlasLastValidMip: 0 - cookieTexArraySize: 1 - planarReflectionAtlasSize: 2048 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - maxPlanarReflectionOnScreen: 16 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 1 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadowSlots: 4 - screenSpaceShadowBufferFormat: 48 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 0 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - bufferFormat: 74 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - singlePass: 1 - occlusionMesh: 1 - cameraJitter: 0 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000000 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - lightingQualitySettings: - AOStepCount: 040000000600000010000000 - AOFullRes: 000001 - AOMaximumRadiusPixels: 200000002800000050000000 - AOBilateralUpsample: 000101 - AODirectionCount: 010000000200000004000000 - ContactShadowSampleCount: 060000000a00000010000000 - SSRMaxRaySteps: 100000002000000040000000 - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - availableMaterialQualityLevels: -1 - m_DefaultMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -382,9 +471,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Hardware.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Hardware.asset index 9d4d49f0306..20fccec9d17 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Hardware.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Hardware.asset @@ -12,56 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_Drs_Hardware m_EditorClassIdentifier: - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, - type: 2} - m_LensAttenuation: 0 - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: - bitDatas: - data1: 139549384114013 - data2: 4539628425463136280 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: - bitDatas: - data1: 139713129348893 - data2: 4539628424389459992 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: - bitDatas: - data1: 140065316601629 - data2: 4539628424389459992 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 1 @@ -76,14 +26,6 @@ MonoBehaviour: supportVolumetrics: 1 supportVolumetricClouds: 0 supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -98,14 +40,6 @@ MonoBehaviour: m_Id: With3Levels supportDecals: 1 supportDecalLayers: 1 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 msaaSampleCount: 1 supportMotionVectors: 1 supportRuntimeDebugDisplay: 0 @@ -241,6 +175,8 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 RTAORayLength: - 0.5 - 3 @@ -297,43 +233,35 @@ MonoBehaviour: - 0.666 - 0.666 - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: Decal Layer default + m_ObsoleteDecalLayerName1: Decal Layer 1 + m_ObsoleteDecalLayerName2: Decal Layer 2 + m_ObsoleteDecalLayerName3: Decal Layer 3 + m_ObsoleteDecalLayerName4: Decal Layer 4 + m_ObsoleteDecalLayerName5: Decal Layer 5 + m_ObsoleteDecalLayerName6: Decal Layer 6 + m_ObsoleteDecalLayerName7: Decal Layer 7 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - diffusionProfileSettingsList: - - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} - - {fileID: 11400000, guid: 968a3176000311d42af174756ece7f4d, type: 2} - - {fileID: 11400000, guid: 768484f758b6f7b4daf53a7d9949f5af, type: 2} - - {fileID: 11400000, guid: fcb8f92518ca5d14bbd7e6751b28cd24, type: 2} - - {fileID: 11400000, guid: 64ca25f51b132ea4093511f7456ea220, type: 2} - - {fileID: 11400000, guid: fd29a6d903d5eae4d94833c2048bfd9d, type: 2} - - {fileID: 11400000, guid: 76f34276e6d50dc4bb0762b87af8931e, type: 2} - - {fileID: 11400000, guid: cd1cd5a7c0527844dbca2b7d562b9049, type: 2} - - {fileID: 11400000, guid: 385fff18b5c61754188b49a485ecb84a, type: 2} - - {fileID: 11400000, guid: d3dd41407c183554ca54bded902d4b7b, type: 2} - - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforeTAACustomPostProcesses: - - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null virtualTexturingSettings: streamingCpuCacheSizeInMegaBytes: 256 streamingGpuCacheSettings: - format: 0 sizeInMegaBytes: 128 - m_Version: 18 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -469,3 +397,78 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + type: 2} + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_ObsoleteFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139549384114013 + data2: 4539628425463136280 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139713129348893 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 140065316601629 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: + - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} + - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} + - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} + - {fileID: 11400000, guid: 968a3176000311d42af174756ece7f4d, type: 2} + - {fileID: 11400000, guid: 768484f758b6f7b4daf53a7d9949f5af, type: 2} + - {fileID: 11400000, guid: fcb8f92518ca5d14bbd7e6751b28cd24, type: 2} + - {fileID: 11400000, guid: 64ca25f51b132ea4093511f7456ea220, type: 2} + - {fileID: 11400000, guid: fd29a6d903d5eae4d94833c2048bfd9d, type: 2} + - {fileID: 11400000, guid: 76f34276e6d50dc4bb0762b87af8931e, type: 2} + - {fileID: 11400000, guid: cd1cd5a7c0527844dbca2b7d562b9049, type: 2} + - {fileID: 11400000, guid: 385fff18b5c61754188b49a485ecb84a, type: 2} + - {fileID: 11400000, guid: d3dd41407c183554ca54bded902d4b7b, type: 2} + - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} + - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} + - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Software.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Software.asset index 86977a39dfd..61ba73ecd80 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Software.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_Drs_Software.asset @@ -12,56 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_Drs_Software m_EditorClassIdentifier: - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, - type: 2} - m_LensAttenuation: 0 - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: - bitDatas: - data1: 139549384114013 - data2: 4539628425463136280 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: - bitDatas: - data1: 139713129348893 - data2: 4539628424389459992 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: - bitDatas: - data1: 140065316601629 - data2: 4539628424389459992 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 1 @@ -76,14 +26,6 @@ MonoBehaviour: supportVolumetrics: 1 supportVolumetricClouds: 0 supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -98,14 +40,6 @@ MonoBehaviour: m_Id: With3Levels supportDecals: 1 supportDecalLayers: 1 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 msaaSampleCount: 1 supportMotionVectors: 1 supportRuntimeDebugDisplay: 0 @@ -241,6 +175,8 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 RTAORayLength: - 0.5 - 3 @@ -297,43 +233,35 @@ MonoBehaviour: - 0.666 - 0.666 - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: Decal Layer default + m_ObsoleteDecalLayerName1: Decal Layer 1 + m_ObsoleteDecalLayerName2: Decal Layer 2 + m_ObsoleteDecalLayerName3: Decal Layer 3 + m_ObsoleteDecalLayerName4: Decal Layer 4 + m_ObsoleteDecalLayerName5: Decal Layer 5 + m_ObsoleteDecalLayerName6: Decal Layer 6 + m_ObsoleteDecalLayerName7: Decal Layer 7 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - diffusionProfileSettingsList: - - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} - - {fileID: 11400000, guid: 968a3176000311d42af174756ece7f4d, type: 2} - - {fileID: 11400000, guid: 768484f758b6f7b4daf53a7d9949f5af, type: 2} - - {fileID: 11400000, guid: fcb8f92518ca5d14bbd7e6751b28cd24, type: 2} - - {fileID: 11400000, guid: 64ca25f51b132ea4093511f7456ea220, type: 2} - - {fileID: 11400000, guid: fd29a6d903d5eae4d94833c2048bfd9d, type: 2} - - {fileID: 11400000, guid: 76f34276e6d50dc4bb0762b87af8931e, type: 2} - - {fileID: 11400000, guid: cd1cd5a7c0527844dbca2b7d562b9049, type: 2} - - {fileID: 11400000, guid: 385fff18b5c61754188b49a485ecb84a, type: 2} - - {fileID: 11400000, guid: d3dd41407c183554ca54bded902d4b7b, type: 2} - - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforeTAACustomPostProcesses: - - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null virtualTexturingSettings: streamingCpuCacheSizeInMegaBytes: 256 streamingGpuCacheSettings: - format: 0 sizeInMegaBytes: 128 - m_Version: 18 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -469,3 +397,78 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + type: 2} + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_ObsoleteFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139549384114013 + data2: 4539628425463136280 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139713129348893 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 140065316601629 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: + - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} + - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} + - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} + - {fileID: 11400000, guid: 968a3176000311d42af174756ece7f4d, type: 2} + - {fileID: 11400000, guid: 768484f758b6f7b4daf53a7d9949f5af, type: 2} + - {fileID: 11400000, guid: fcb8f92518ca5d14bbd7e6751b28cd24, type: 2} + - {fileID: 11400000, guid: 64ca25f51b132ea4093511f7456ea220, type: 2} + - {fileID: 11400000, guid: fd29a6d903d5eae4d94833c2048bfd9d, type: 2} + - {fileID: 11400000, guid: 76f34276e6d50dc4bb0762b87af8931e, type: 2} + - {fileID: 11400000, guid: cd1cd5a7c0527844dbca2b7d562b9049, type: 2} + - {fileID: 11400000, guid: 385fff18b5c61754188b49a485ecb84a, type: 2} + - {fileID: 11400000, guid: d3dd41407c183554ca54bded902d4b7b, type: 2} + - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} + - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} + - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16.asset index e845a29e74b..9ec0febfcd9 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_FP16 m_EditorClassIdentifier: - m_Version: 15 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 48 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 1 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 0 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000000 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,16 +397,13 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_DefaultLookDevProfile: {fileID: 0} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: data1: 139549384114013 - data2: 4539628425463136256 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -168,10 +414,10 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 139713129348893 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -182,10 +428,10 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 140065316601629 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -196,176 +442,16 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSRTransparent: 0 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - sssSampleBudget: - m_Values: 140000002800000050000000 - m_SchemaId: - m_Id: With3Levels - supportVolumetrics: 1 - supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 48 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 1 - supportProbeVolume: 0 - supportRayTracing: 0 - supportedRayTracingMode: 3 - probeVolumeSettings: - atlasWidth: 128 - atlasHeight: 128 - atlasDepth: 512 - atlasOctahedralDepthWidth: 2048 - atlasOctahedralDepthHeight: 2048 - lightLoopSettings: - cookieAtlasSize: 512 - cookieFormat: 74 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - cookieAtlasLastValidMip: 0 - cookieTexArraySize: 16 - planarReflectionAtlasSize: 2048 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - maxPlanarReflectionOnScreen: 16 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 0 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadowSlots: 4 - screenSpaceShadowBufferFormat: 48 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - bufferFormat: 74 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - singlePass: 1 - occlusionMesh: 1 - cameraJitter: 0 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000000 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - lightingQualitySettings: - AOStepCount: 040000000600000010000000 - AOFullRes: 000001 - AOMaximumRadiusPixels: 200000002800000050000000 - AOBilateralUpsample: 000101 - AODirectionCount: 010000000200000004000000 - ContactShadowSampleCount: 060000000a00000010000000 - SSRMaxRaySteps: 100000002000000040000000 - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - availableMaterialQualityLevels: -1 - m_DefaultMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -381,6 +467,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: [] - beforePostProcessCustomPostProcesses: [] - afterPostProcessCustomPostProcesses: [] diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16_PPAlpha.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16_PPAlpha.asset index c9c8224e226..dbafebcc66d 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16_PPAlpha.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_FP16_PPAlpha.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_FP16_PPAlpha m_EditorClassIdentifier: - m_Version: 13 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 48 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 1 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 0 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 48 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 1 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000000 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,203 +397,61 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_DefaultLookDevProfile: {fileID: 0} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69180639936349 - data2: 4539628425463136256 + data1: 139549384114013 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69344385171229 - data2: 4539628424389459968 + data1: 139713129348893 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69696572423965 - data2: 4539628424389459968 + data1: 140065316601629 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - increaseSssSampleCount: 0 - supportVolumetrics: 1 - increaseResolutionOfVolumetrics: 1 - supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 48 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 1 - supportRayTracing: 0 - supportedRaytracingTier: 2 - lightLoopSettings: - cookieSize: 128 - cookieTexArraySize: 16 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - planarReflectionProbeCacheSize: 12 - planarReflectionTextureSize: 512 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 0 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadowSlots: 4 - screenSpaceShadowBufferFormat: 48 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - bufferFormat: 48 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - singlePass: 1 - occlusionMesh: 1 - cameraJitter: 1 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000000 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - lightingQualitySettings: - AOStepCount: 040000000600000010000000 - AOFullRes: 000001 - AOMaximumRadiusPixels: 200000002800000050000000 - AOBilateralUpsample: 000101 - AODirectionCount: 010000000200000004000000 - ContactShadowSampleCount: 060000000a00000010000000 - SSRMaxRaySteps: 100000002000000040000000 - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - availableMaterialQualityLevels: -1 - m_DefaultMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -360,6 +467,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: [] - beforePostProcessCustomPostProcesses: [] - afterPostProcessCustomPostProcesses: [] diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAABoth.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAABoth.asset index 65d54281d12..ae63ed7fce3 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAABoth.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAABoth.asset @@ -12,7 +12,255 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_MSAABoth m_EditorClassIdentifier: - m_Version: 7 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 0 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 0 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 8 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 0 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 64 + reflectionCubemapSize: 256 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 0 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 1 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 1 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 4096 + atlasHeight: 4096 + perChannelMask: 0 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000001 + m_SchemaId: + m_Id: With3Levels + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: + m_ObsoleteLightLayerName1: + m_ObsoleteLightLayerName2: + m_ObsoleteLightLayerName3: + m_ObsoleteLightLayerName4: + m_ObsoleteLightLayerName5: + m_ObsoleteLightLayerName6: + m_ObsoleteLightLayerName7: + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 0} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,134 +396,59 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 16681643802396 - data2: 4539628424657829888 + data1: 87875021700956 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 + lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 16567827037981 - data2: 4539628424389459968 + data1: 86936571215645 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 + lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 16645136383773 - data2: 4539628424389459968 + data1: 87288758468381 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 + lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 0 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - increaseSssSampleCount: 0 - supportVolumetrics: 1 - increaseResolutionOfVolumetrics: 0 - supportLightLayers: 0 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 8 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 0 - supportRayTracing: 0 - supportedRaytracingTier: 2 - lightLoopSettings: - cookieSize: 128 - cookieTexArraySize: 16 - pointCookieSize: 128 - cubeCookieTexArraySize: 16 - planarReflectionProbeCacheSize: 12 - planarReflectionTextureSize: 512 - reflectionProbeCacheSize: 64 - reflectionCubemapSize: 256 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 0 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 - directionalLightsResolutionTiers: - lowQualityResolution: 256 - mediumQualityResolution: 512 - highQualityResolution: 1024 - veryHighQualityResolution: 2048 - punctualLightsResolutionTiers: - lowQualityResolution: 256 - mediumQualityResolution: 512 - highQualityResolution: 1024 - veryHighQualityResolution: 2048 - areaLightsResolutionTiers: - lowQualityResolution: 256 - mediumQualityResolution: 512 - highQualityResolution: 1024 - veryHighQualityResolution: 2048 - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadows: 2 - decalSettings: - drawDistance: 1000 - atlasWidth: 4096 - atlasHeight: 4096 - perChannelMask: 0 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - diffusionProfileSettings: {fileID: 0} - diffusionProfileSettingsList: + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAAForward.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAAForward.asset index 54fd1a878c2..e68e5d5dfbe 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAAForward.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_MSAAForward.asset @@ -12,191 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_MSAAForward m_EditorClassIdentifier: - m_Version: 16 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteBakedOrCustomReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteRealtimeReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, - type: 2} - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: - bitDatas: - data1: 72130075896840028 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: - bitDatas: - data1: 71543408426781 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: - bitDatas: - data1: 71895595679517 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 0 @@ -209,15 +24,8 @@ MonoBehaviour: m_SchemaId: m_Id: With3Levels supportVolumetrics: 1 + supportVolumetricClouds: 0 supportLightLayers: 0 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -226,37 +34,33 @@ MonoBehaviour: supportCustomPass: 1 customBufferFormat: 12 supportedLitShaderMode: 1 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels supportDecals: 1 supportDecalLayers: 1 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 msaaSampleCount: 8 supportMotionVectors: 1 supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 supportDitheringCrossFade: 0 supportTerrainHole: 0 supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 supportRayTracing: 0 supportedRayTracingMode: 3 - probeVolumeSettings: - atlasResolution: 128 - atlasOctahedralDepthResolution: 2048 lightLoopSettings: cookieAtlasSize: 512 cookieFormat: 74 - pointCookieSize: 128 cookieAtlasLastValidMip: 0 cookieTexArraySize: 16 planarReflectionAtlasSize: 2048 reflectionProbeCacheSize: 64 reflectionCubemapSize: 256 reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 skyReflectionSize: 256 skyLightingOverrideLayerMask: serializedVersion: 2 @@ -268,6 +72,9 @@ MonoBehaviour: maxEnvLightsOnScreen: 64 maxDecalsOnScreen: 512 maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 hdShadowInitParams: maxShadowRequests: 128 directionalShadowsDepthBits: 32 @@ -338,9 +145,11 @@ MonoBehaviour: - 13 DoFResolution: 040000000200000001000000 DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 MotionBlurSampleCount: 04000000080000000c000000 BloomRes: 040000000200000002000000 BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 ChromaticAberrationMaxSamples: 03000000060000000c000000 lightSettings: useContactShadow: @@ -366,6 +175,8 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 RTAORayLength: - 0.5 - 3 @@ -393,10 +204,6 @@ MonoBehaviour: - 0.66 - 1 RTGISecondDenoise: 010101 - RTGISecondDenoiserRadius: - - 0.33 - - 0.33 - - 0.5 RTRMinSmoothness: - 0.6 - 0.4 @@ -413,24 +220,236 @@ MonoBehaviour: - 0.8 - 1 - 1.2 - RTRUpScaleRadius: 040000000400000003000000 RTRFullResolution: 000001 RTRDenoise: 010101 RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: Decal Layer default + m_ObsoleteDecalLayerName1: Decal Layer 1 + m_ObsoleteDecalLayerName2: Decal Layer 2 + m_ObsoleteDecalLayerName3: Decal Layer 3 + m_ObsoleteDecalLayerName4: Decal Layer 4 + m_ObsoleteDecalLayerName5: Decal Layer 5 + m_ObsoleteDecalLayerName6: Decal Layer 6 + m_ObsoleteDecalLayerName7: Decal Layer 7 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 0} - diffusionProfileSettingsList: - - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - beforeTransparentCustomPostProcesses: [] - beforeTAACustomPostProcesses: [] - beforePostProcessCustomPostProcesses: [] - afterPostProcessCustomPostProcesses: [] virtualTexturingSettings: streamingCpuCacheSizeInMegaBytes: 256 streamingGpuCacheSettings: - format: 0 sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteRealtimeReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + type: 2} + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_ObsoleteFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 72130075896840028 + data2: 4539628424657829912 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 71543408426781 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 71895595679517 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: + - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors.asset index 6daf6a1297a..aad2da17328 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors.asset @@ -12,191 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_No_Motion_Vectors m_EditorClassIdentifier: - m_Version: 16 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteBakedOrCustomReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteRealtimeReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, - type: 2} - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: - bitDatas: - data1: 139549384114013 - data2: 4539628425463136256 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: - bitDatas: - data1: 139713129348893 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: - bitDatas: - data1: 140065316601629 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 1 @@ -209,15 +24,8 @@ MonoBehaviour: m_SchemaId: m_Id: With3Levels supportVolumetrics: 1 + supportVolumetricClouds: 0 supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -226,27 +34,23 @@ MonoBehaviour: supportCustomPass: 1 customBufferFormat: 12 supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels supportDecals: 1 supportDecalLayers: 1 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 msaaSampleCount: 4 supportMotionVectors: 0 supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 supportDitheringCrossFade: 0 supportTerrainHole: 1 supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 supportRayTracing: 0 supportedRayTracingMode: 3 - probeVolumeSettings: - atlasResolution: 128 - atlasOctahedralDepthResolution: 2048 lightLoopSettings: cookieAtlasSize: 8192 cookieFormat: 74 @@ -256,6 +60,7 @@ MonoBehaviour: reflectionProbeCacheSize: 128 reflectionCubemapSize: 128 reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 skyReflectionSize: 256 skyLightingOverrideLayerMask: serializedVersion: 2 @@ -268,6 +73,8 @@ MonoBehaviour: maxDecalsOnScreen: 512 maxPlanarReflectionOnScreen: 16 maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 hdShadowInitParams: maxShadowRequests: 128 directionalShadowsDepthBits: 32 @@ -342,6 +149,7 @@ MonoBehaviour: MotionBlurSampleCount: 04000000080000000c000000 BloomRes: 040000000200000002000000 BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 ChromaticAberrationMaxSamples: 03000000060000000c000000 lightSettings: useContactShadow: @@ -367,6 +175,8 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 RTAORayLength: - 0.5 - 3 @@ -394,10 +204,6 @@ MonoBehaviour: - 0.66 - 1 RTGISecondDenoise: 010101 - RTGISecondDenoiserRadius: - - 0.33 - - 0.33 - - 0.5 RTRMinSmoothness: - 0.6 - 0.4 @@ -414,18 +220,243 @@ MonoBehaviour: - 0.8 - 1 - 1.2 - RTRUpScaleRadius: 040000000400000003000000 RTRFullResolution: 000001 RTRDenoise: 010101 RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: Decal Layer default + m_ObsoleteDecalLayerName1: Decal Layer 1 + m_ObsoleteDecalLayerName2: Decal Layer 2 + m_ObsoleteDecalLayerName3: Decal Layer 3 + m_ObsoleteDecalLayerName4: Decal Layer 4 + m_ObsoleteDecalLayerName5: Decal Layer 5 + m_ObsoleteDecalLayerName6: Decal Layer 6 + m_ObsoleteDecalLayerName7: Decal Layer 7 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - diffusionProfileSettingsList: + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteRealtimeReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + type: 2} + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_ObsoleteFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139549384114013 + data2: 4539628425463136280 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139713129348893 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 140065316601629 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -441,16 +472,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforeTAACustomPostProcesses: - - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - virtualTexturingSettings: - streamingCpuCacheSizeInMegaBytes: 256 - streamingGpuCacheSettings: - - format: 0 - sizeInMegaBytes: 128 diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors_Forward.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors_Forward.asset index 9d58f72114a..e5ddf81d601 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors_Forward.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_Def_No_Motion_Vectors_Forward.asset @@ -12,192 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_Def_No_Motion_Vectors_Forward m_EditorClassIdentifier: - m_Version: 16 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteBakedOrCustomReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteRealtimeReflectionFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 0} - m_LensAttenuation: 0 - m_UseRenderGraph: 1 - m_DefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: - bitDatas: - data1: 139549384114013 - data2: 4539628425463136256 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: - bitDatas: - data1: 139713129348893 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: - bitDatas: - data1: 140065316601629 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - materialQuality: 0 m_RenderPipelineSettings: supportShadowMask: 1 supportSSR: 1 @@ -210,15 +24,8 @@ MonoBehaviour: m_SchemaId: m_Id: With3Levels supportVolumetrics: 1 + supportVolumetricClouds: 0 supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -233,14 +40,6 @@ MonoBehaviour: m_Id: With3Levels supportDecals: 1 supportDecalLayers: 1 - decalLayerName0: Decal Layer default - decalLayerName1: Decal Layer 1 - decalLayerName2: Decal Layer 2 - decalLayerName3: Decal Layer 3 - decalLayerName4: Decal Layer 4 - decalLayerName5: Decal Layer 5 - decalLayerName6: Decal Layer 6 - decalLayerName7: Decal Layer 7 msaaSampleCount: 8 supportMotionVectors: 0 supportRuntimeDebugDisplay: 0 @@ -248,11 +47,10 @@ MonoBehaviour: supportDitheringCrossFade: 0 supportTerrainHole: 1 supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 supportRayTracing: 0 supportedRayTracingMode: 3 - probeVolumeSettings: - atlasResolution: 128 - atlasOctahedralDepthResolution: 2048 lightLoopSettings: cookieAtlasSize: 8192 cookieFormat: 74 @@ -275,6 +73,8 @@ MonoBehaviour: maxDecalsOnScreen: 512 maxPlanarReflectionOnScreen: 16 maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 hdShadowInitParams: maxShadowRequests: 128 directionalShadowsDepthBits: 32 @@ -375,6 +175,8 @@ MonoBehaviour: AODirectionCount: 010000000200000004000000 ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 RTAORayLength: - 0.5 - 3 @@ -402,10 +204,6 @@ MonoBehaviour: - 0.66 - 1 RTGISecondDenoise: 010101 - RTGISecondDenoiserRadius: - - 0.33 - - 0.33 - - 0.5 RTRMinSmoothness: - 0.6 - 0.4 @@ -422,18 +220,242 @@ MonoBehaviour: - 0.8 - 1 - 1.2 - RTRUpScaleRadius: 040000000400000003000000 RTRFullResolution: 000001 RTRDenoise: 010101 RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: Decal Layer default + m_ObsoleteDecalLayerName1: Decal Layer 1 + m_ObsoleteDecalLayerName2: Decal Layer 2 + m_ObsoleteDecalLayerName3: Decal Layer 3 + m_ObsoleteDecalLayerName4: Decal Layer 4 + m_ObsoleteDecalLayerName5: Decal Layer 5 + m_ObsoleteDecalLayerName6: Decal Layer 6 + m_ObsoleteDecalLayerName7: Decal Layer 7 allowShaderVariantStripping: 1 enableSRPBatcher: 1 - shaderVariantLogLevel: 0 availableMaterialQualityLevels: -1 m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - diffusionProfileSettingsList: + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteRealtimeReflectionFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteDefaultVolumeProfile: {fileID: 0} + m_ObsoleteDefaultLookDevProfile: {fileID: 11400000, guid: 254c4fe87beb7be4fa72e1681edbed02, + type: 2} + m_ObsoleteFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139549384114013 + data2: 4539628425463136280 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 139713129348893 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: + bitDatas: + data1: 140065316601629 + data2: 4539628424389459992 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: + - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -449,16 +471,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforeTAACustomPostProcesses: - - DepthTAA, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - virtualTexturingSettings: - streamingCpuCacheSizeInMegaBytes: 256 - streamingGpuCacheSettings: - - format: 0 - sizeInMegaBytes: 128 diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_FabricConvolutionOn.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_FabricConvolutionOn.asset index 429b4d0a9f4..0f92f64bb7d 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_FabricConvolutionOn.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_FabricConvolutionOn.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_FabricConvolutionOn m_EditorClassIdentifier: - m_Version: 7 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 0 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 0 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 1 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 0 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 1 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 1 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000001 + m_SchemaId: + m_Id: With3Levels + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: + m_ObsoleteLightLayerName1: + m_ObsoleteLightLayerName2: + m_ObsoleteLightLayerName3: + m_ObsoleteLightLayerName4: + m_ObsoleteLightLayerName5: + m_ObsoleteLightLayerName6: + m_ObsoleteLightLayerName7: + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,137 +397,61 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, - type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 68356005953309 - data2: 4539628424657829888 + data1: 139549383851869 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 + lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69344385171229 - data2: 4539628424389459968 + data1: 139713129348893 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 + lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69421694517021 - data2: 4539628424389459968 + data1: 140065316601629 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 + lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 0 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - increaseSssSampleCount: 0 - supportVolumetrics: 1 - increaseResolutionOfVolumetrics: 1 - supportLightLayers: 1 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 0 - supportRayTracing: 0 - supportedRaytracingTier: 2 - lightLoopSettings: - cookieSize: 128 - cookieTexArraySize: 16 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - planarReflectionProbeCacheSize: 12 - planarReflectionTextureSize: 512 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 1 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 0 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 - directionalLightsResolutionTiers: - lowQualityResolution: 256 - mediumQualityResolution: 512 - highQualityResolution: 1024 - veryHighQualityResolution: 2048 - punctualLightsResolutionTiers: - lowQualityResolution: 256 - mediumQualityResolution: 512 - highQualityResolution: 1024 - veryHighQualityResolution: 2048 - areaLightsResolutionTiers: - lowQualityResolution: 256 - mediumQualityResolution: 512 - highQualityResolution: 1024 - veryHighQualityResolution: 2048 - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadows: 2 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_ShadowFilteringHigh.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_ShadowFilteringHigh.asset index 1d38a09df64..87d11794303 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_ShadowFilteringHigh.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_ShadowFilteringHigh.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_ShadowFilteringHigh m_EditorClassIdentifier: - m_Version: 11 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 1 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 1 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 2 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000000 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: + m_ObsoleteLightLayerName1: + m_ObsoleteLightLayerName2: + m_ObsoleteLightLayerName3: + m_ObsoleteLightLayerName4: + m_ObsoleteLightLayerName5: + m_ObsoleteLightLayerName6: + m_ObsoleteLightLayerName7: + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,182 +397,64 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69180639936349 - data2: 4539628424926265344 + data1: 139549384114013 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69344385171229 - data2: 4539628424389459968 + data1: 139713129348893 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69696572423965 - data2: 4539628424389459968 + data1: 140065316601629 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - increaseSssSampleCount: 0 - supportVolumetrics: 1 - increaseResolutionOfVolumetrics: 1 - supportLightLayers: 1 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 1 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 1 - supportRayTracing: 0 - supportedRaytracingTier: 2 - lightLoopSettings: - cookieSize: 128 - cookieTexArraySize: 16 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - planarReflectionProbeCacheSize: 12 - planarReflectionTextureSize: 512 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 2 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadows: 2 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - occlusionMesh: 1 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000000 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - materialQualityLevels: -1 - m_CurrentMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -339,9 +470,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_TransparentSSR.asset b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_TransparentSSR.asset index 410ea5b55c8..dec8b5caec7 100644 --- a/com.unity.testing.hdrp/RP_Assets/HDRP_Test_TransparentSSR.asset +++ b/com.unity.testing.hdrp/RP_Assets/HDRP_Test_TransparentSSR.asset @@ -12,7 +12,256 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRP_Test_TransparentSSR m_EditorClassIdentifier: - m_Version: 11 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 1 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 1 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 1 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 1 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 1 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 512 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 2048 + reflectionProbeCacheSize: 128 + reflectionCubemapSize: 128 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 16 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 128 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 0 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 0 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000000000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 2048 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 2048 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 0 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000000 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + type: 2} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,191 +397,64 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, - type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: aea7ff43876258748be47d8751e0e9d5, type: 2} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69180648324957 - data2: 4539628426000007168 + data1: 139549392502621 + data2: 4539628426536878104 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69344385171229 - data2: 4539628424389459968 + data1: 139713129348893 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: - data1: 69696572423965 - data2: 4539628424389459968 + data1: 140065316601629 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSRTransparent: 1 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - increaseSssSampleCount: 0 - supportVolumetrics: 1 - increaseResolutionOfVolumetrics: 1 - supportLightLayers: 1 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 1 - supportDecals: 1 - msaaSampleCount: 1 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 1 - supportRayTracing: 0 - supportedRaytracingTier: 2 - lightLoopSettings: - cookieSize: 128 - cookieTexArraySize: 16 - pointCookieSize: 512 - cubeCookieTexArraySize: 16 - planarReflectionProbeCacheSize: 12 - planarReflectionTextureSize: 512 - reflectionProbeCacheSize: 128 - reflectionCubemapSize: 128 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - hdShadowInitParams: - maxShadowRequests: 128 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 0 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 0 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000000000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 2048 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadows: 2 - decalSettings: - drawDistance: 1000 - atlasWidth: 2048 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 0 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - occlusionMesh: 1 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000000 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - materialQualityLevels: -1 - m_CurrentMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: + - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforePostProcessCustomPostProcesses: + - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteAfterPostProcessCustomPostProcesses: + - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 1 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} - {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2} - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} @@ -348,9 +470,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 86c1c808ebce1cc4992b9b0fd197a0b3, type: 2} - {fileID: 11400000, guid: 3506ae472b257f042af66a183fbaac6a, type: 2} - {fileID: 11400000, guid: 6be2047feaba36945b8fd12f29e3a7b5, type: 2} - beforeTransparentCustomPostProcesses: - - GreenPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - beforePostProcessCustomPostProcesses: - - RedPP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - afterPostProcessCustomPostProcesses: - - BluePP, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null From aa78c634ec274f847afb64422f5654ed7bae8704 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 15 Mar 2021 18:00:06 +0100 Subject: [PATCH 54/58] Fixed frame settings for HDRP test projects --- .../1x_Materials/1221_Lit_POM_Emission.unity | 13 +- .../2222_ReflectionProbeDistanceBased.unity | 270 +-- .../2x_Lighting/2701_TransparentSSR.unity | 91 +- .../5x_SkyAndFog/5009_HDRI_Sky_Flow.unity | 12 +- .../5x_SkyAndFog/5011_VolumetricClouds.unity | 29 +- .../5011_VolumetricCloudsShadows.unity | 37 +- ...UnlitShadowMatteAmbientOcclusionMSAA.unity | 17 +- .../9x_Other/9401_MSAAForwardBoth.unity | 60 +- .../9x_Other/9401_MSAAForwardOnly.unity | 72 +- .../9x_Other/9402_AlphaToMask-Graph.unity | 99 +- .../9x_Other/9402_AlphaToMask-HDRP.unity | 149 +- .../9601_SkinnedMeshBatching-Off.unity | 1582 ++++++++-------- .../9602_SkinnedMeshBatching-On.unity | 1590 +++++++++-------- .../9603_MeshRendererBatching-Off.unity | 852 ++++++--- .../9604_MeshRendererBatching-On.unity | 848 ++++++--- 15 files changed, 3272 insertions(+), 2449 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission.unity index 594703ff67e..aba72dd7b44 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission.unity @@ -869,6 +869,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1217,10 +1218,20 @@ PrefabInstance: propertyPath: m_Version value: 7 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 70007966400349 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 2147483648 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2222_ReflectionProbeDistanceBased.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2222_ReflectionProbeDistanceBased.unity index ff3f635cd12..83beff0db72 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2222_ReflectionProbeDistanceBased.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2222_ReflectionProbeDistanceBased.unity @@ -167,6 +167,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -229,6 +230,7 @@ GameObject: m_Component: - component: {fileID: 526606416} - component: {fileID: 526606415} + - component: {fileID: 526606417} m_Layer: 0 m_Name: Global Volume m_TagString: Untagged @@ -267,6 +269,23 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &526606417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526606414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: -100 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f940a8037e6cda542891dc1aac1fa4e8, type: 2} --- !u!1 &679939595 GameObject: m_ObjectHideFlags: 0 @@ -373,14 +392,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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 @@ -464,6 +475,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -479,10 +491,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 5 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!1 &1336332765 GameObject: m_ObjectHideFlags: 0 @@ -526,6 +545,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -608,101 +628,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1} - m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -719,6 +644,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 1, y: 1, z: 1} m_EditorAdvancedModeBlendDistanceNegative: {x: 1, y: 1, z: 1} m_EditorSimplifiedModeBlendDistance: 0 @@ -731,24 +667,13 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 1 capturePositionProxySpace: {x: 0, y: 0, z: 0} @@ -761,10 +686,10 @@ MonoBehaviour: m_Level: 0 resolution: 0 cameraSettings: - customRenderingSettings: 0 + customRenderingSettings: 1 renderingPathCustomFrameSettings: bitDatas: - data1: 72198262773251917 + data1: 72198125334298445 data2: 13763000468760363016 lodBias: 1 lodBiasMode: 0 @@ -778,7 +703,7 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 0 + data1: 137438953472 data2: 0 bufferClearing: clearColorMode: 0 @@ -957,7 +882,101 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 1, y: 1, z: 1} + m_BoxBlendDistanceNegative: {x: 1, y: 1, z: 1} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 @@ -977,7 +996,7 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 + m_Mode: 2 m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 @@ -1079,6 +1098,11 @@ PrefabInstance: propertyPath: m_FocalLength value: 32.96973 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipelineAsset 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 20492caad80..228e9147c65 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 @@ -181,6 +181,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -317,6 +318,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -404,6 +406,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -472,14 +475,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 5 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -489,6 +484,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -505,6 +501,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -554,9 +551,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -572,10 +574,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &280720572 Light: m_ObjectHideFlags: 0 @@ -709,6 +718,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -805,6 +815,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -907,6 +918,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 --- !u!4 &491657228 Transform: m_ObjectHideFlags: 1 @@ -986,6 +998,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1081,6 +1094,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1168,6 +1182,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1296,6 +1311,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1425,6 +1441,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1506,6 +1523,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1649,6 +1667,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1874,6 +1893,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1969,6 +1989,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2072,6 +2093,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2159,6 +2181,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2295,6 +2318,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2390,6 +2414,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2544,6 +2569,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2639,6 +2665,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2735,6 +2762,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2831,6 +2859,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2927,6 +2956,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3009,6 +3039,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3119,6 +3150,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3248,6 +3280,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3351,6 +3384,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3446,6 +3480,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3487,6 +3522,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3499,6 +3538,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -15 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0.38268343 @@ -3511,14 +3554,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.92387956 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 45 @@ -3546,11 +3581,31 @@ PrefabInstance: propertyPath: m_Version value: 7 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data2 + value: 4539628425463201792 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 8388608 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data2 + value: 1073741824 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipelineAsset @@ -3621,6 +3676,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3716,6 +3772,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 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 a9c2719f084..553664082cf 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 @@ -274,10 +274,20 @@ PrefabInstance: propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 70007966400349 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 2147483648 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds.unity index 51060beb4a5..78ebe46326d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds.unity @@ -447,6 +447,7 @@ GameObject: m_Component: - component: {fileID: 402895081} - component: {fileID: 402895080} + - component: {fileID: 402895082} m_Layer: 0 m_Name: Global Volume m_TagString: Untagged @@ -485,6 +486,23 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &402895082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402895079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: -100 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f940a8037e6cda542891dc1aac1fa4e8, type: 2} --- !u!1 &597511101 GameObject: m_ObjectHideFlags: 0 @@ -684,7 +702,7 @@ MonoBehaviour: xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 - customRenderingSettings: 0 + customRenderingSettings: 1 invertFaceCulling: 0 probeLayerMask: serializedVersion: 2 @@ -999,7 +1017,7 @@ MonoBehaviour: xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 - customRenderingSettings: 0 + customRenderingSettings: 1 invertFaceCulling: 0 probeLayerMask: serializedVersion: 2 @@ -1190,7 +1208,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 1.02e-43, y: -2.1520224e-25, z: 4.5904e-41, w: 0} + m_BoundingSphereOverride: {x: 1.02e-43, y: -1.4822748e+10, z: 4.5905e-41, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 @@ -1304,6 +1322,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1403,7 +1422,7 @@ MonoBehaviour: xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 - customRenderingSettings: 0 + customRenderingSettings: 1 invertFaceCulling: 0 probeLayerMask: serializedVersion: 2 @@ -1640,7 +1659,7 @@ MonoBehaviour: xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 - customRenderingSettings: 0 + customRenderingSettings: 1 invertFaceCulling: 0 probeLayerMask: serializedVersion: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows.unity index 07f2c8d443c..a0cdb0708e0 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 2829.894, g: 4166.4497, b: 4750.5654, a: 1} + m_IndirectSpecularColor: {r: 2941.0608, g: 4370.924, b: 4980.884, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -296,6 +296,21 @@ PrefabInstance: propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data2 + value: 4539628424389492736 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data2 + value: 32768 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: waitFrames @@ -395,6 +410,7 @@ GameObject: m_Component: - component: {fileID: 402895081} - component: {fileID: 402895080} + - component: {fileID: 402895082} m_Layer: 0 m_Name: Global Volume m_TagString: Untagged @@ -433,6 +449,23 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &402895082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402895079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: -100 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f940a8037e6cda542891dc1aac1fa4e8, type: 2} --- !u!1 &996408220 GameObject: m_ObjectHideFlags: 0 @@ -1003,7 +1036,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_BoundingSphereOverride: {x: 1.02e-43, y: -1.4822748e+10, z: 4.5905e-41, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8108_UnlitShadowMatteAmbientOcclusionMSAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8108_UnlitShadowMatteAmbientOcclusionMSAA.unity index 30d4039050e..b8798c03624 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8108_UnlitShadowMatteAmbientOcclusionMSAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8108_UnlitShadowMatteAmbientOcclusionMSAA.unity @@ -650,6 +650,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -665,7 +666,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -732,6 +732,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70007966400349 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 2147483648 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible 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 33ca8565db4..2747e769d2a 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,7 +38,7 @@ 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, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -135,6 +135,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -147,6 +151,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -10 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -159,14 +167,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -189,10 +189,20 @@ PrefabInstance: propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 640 + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70007966400348 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 2147483649 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -205,6 +215,11 @@ PrefabInstance: propertyPath: renderGraphCompatible value: 1 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 640 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1693911544 @@ -214,6 +229,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -229,6 +249,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -244,16 +269,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -340,6 +355,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: e14bd757737c3884ba64af99a466ec80, type: 2} m_StaticLightingSkyUniqueID: 2 + m_StaticLightingCloudsUniqueID: 0 --- !u!114 &1916420831 MonoBehaviour: m_ObjectHideFlags: 0 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 098e0991050..d12ae35231f 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,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.042444408, g: 0.05500044, b: 0.07089285, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -156,6 +156,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 + m_StaticLightingCloudsUniqueID: 0 --- !u!114 &115701100 MonoBehaviour: m_ObjectHideFlags: 0 @@ -198,6 +199,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -210,6 +215,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -9.08 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -222,14 +231,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -252,22 +253,37 @@ PrefabInstance: propertyPath: clearColorMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 640 + propertyPath: customRenderingSettings + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70007966400349 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 2147483648 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderPipelineAsset - value: - objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, - type: 2} + propertyPath: waitFrames + value: 2 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, + type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderGraphCompatible @@ -275,8 +291,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: waitFrames - value: 2 + propertyPath: ImageComparisonSettings.TargetHeight + value: 640 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -287,6 +303,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -302,6 +323,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -317,16 +343,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x 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 73681dd8c5a..7d66819e390 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,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -225,6 +226,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0.37 @@ -237,6 +242,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.06 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0.7071068 @@ -249,14 +258,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 @@ -271,19 +272,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: field of view - value: 46.781662 + propertyPath: orthographic + value: 1 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic - value: 1 + propertyPath: field of view + value: 46.781662 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: orthographic size value: 6.6187506 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: renderingPath @@ -291,43 +297,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_FrameSettings.enableMotionVectors - value: 0 + propertyPath: customRenderingSettings + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_FrameSettings.enableForwardRenderingOnly + propertyPath: m_ObsoleteRenderingPath value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: m_FrameSettings.enableMotionVectors + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteRenderingPath + propertyPath: m_FrameSettings.enableForwardRenderingOnly value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916700 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: customRenderingSettings - value: 0 + value: 72127602004328284 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 + value: 72057596185411585 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -336,24 +332,29 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, + type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible 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 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderPipelineAsset - value: - objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, - type: 2} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -378,6 +379,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalPosition.x @@ -393,6 +399,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.6 objectReference: {fileID: 0} + - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalRotation.x @@ -408,16 +419,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalEulerAnglesHint.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 02bcb851ae8..01fee23cdb4 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,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -225,6 +226,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0.37 @@ -237,6 +242,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.06 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0.7071068 @@ -249,14 +258,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 @@ -271,19 +272,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: field of view - value: 46.781662 + propertyPath: orthographic + value: 1 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic - value: 1 + propertyPath: field of view + value: 46.781662 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: orthographic size value: 6.6187506 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: renderingPath @@ -291,43 +297,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_FrameSettings.enableMotionVectors - value: 0 + propertyPath: customRenderingSettings + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_FrameSettings.enableForwardRenderingOnly + propertyPath: m_ObsoleteRenderingPath value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: m_FrameSettings.enableMotionVectors + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteRenderingPath + propertyPath: m_FrameSettings.enableForwardRenderingOnly value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916700 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: customRenderingSettings - value: 0 + value: 72127602004328284 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 + value: 72057596185411585 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -336,24 +332,29 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, + type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible 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 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderPipelineAsset - value: - objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, - type: 2} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -388,6 +389,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalPosition.x @@ -403,6 +409,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.6 objectReference: {fileID: 0} + - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalRotation.x @@ -418,16 +429,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4722329109038158770, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -465,13 +466,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4722329109126294355, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Name + value: AxF objectReference: {fileID: 0} - target: {fileID: 4722329109126294355, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_Name - value: AxF + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 4722329109307351572, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} @@ -515,13 +516,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4722329109554934316, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Name + value: LayeredLitTessellation objectReference: {fileID: 0} - target: {fileID: 4722329109554934316, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_Name - value: LayeredLitTessellation + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 4722329109681357558, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} @@ -560,13 +561,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4722329109849044639, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Name + value: LitTessellation objectReference: {fileID: 0} - target: {fileID: 4722329109849044639, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_Name - value: LitTessellation + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 4722329109895375718, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} @@ -665,13 +666,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4722329110518267379, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Name + value: LayeredLit objectReference: {fileID: 0} - target: {fileID: 4722329110518267379, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} - propertyPath: m_Name - value: LayeredLit + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 4722329110678483852, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} @@ -723,22 +724,17 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c7f3b16846225424cb8307ced99d507e, type: 2} - - target: {fileID: 7443794894673594034, guid: 788468ec810cab144bdb8014e3b29cc1, - type: 3} - propertyPath: m_CharacterSize - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7443794894673594034, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_Text value: AxF objectReference: {fileID: 0} - - target: {fileID: 7443794894774102981, guid: 788468ec810cab144bdb8014e3b29cc1, + - target: {fileID: 7443794894673594034, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_CharacterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 7443794895150638996, guid: 788468ec810cab144bdb8014e3b29cc1, + - target: {fileID: 7443794894774102981, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_CharacterSize value: 1 @@ -748,7 +744,7 @@ PrefabInstance: propertyPath: m_Text value: LayeredLit objectReference: {fileID: 0} - - target: {fileID: 7443794895527850124, guid: 788468ec810cab144bdb8014e3b29cc1, + - target: {fileID: 7443794895150638996, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_CharacterSize value: 1 @@ -760,7 +756,7 @@ PrefabInstance: Tessellation' objectReference: {fileID: 0} - - target: {fileID: 7443794895756511813, guid: 788468ec810cab144bdb8014e3b29cc1, + - target: {fileID: 7443794895527850124, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_CharacterSize value: 1 @@ -772,6 +768,11 @@ PrefabInstance: Tessellation' objectReference: {fileID: 0} + - target: {fileID: 7443794895756511813, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_CharacterSize + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7443794896006972066, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_CharacterSize 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 cd657ce1cac..bc2034e7808 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 @@ -223,11 +223,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -235,10 +230,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -247,8 +247,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 4 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -265,6 +270,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -280,16 +290,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -362,11 +362,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -374,6 +369,11 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 3 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Alignment @@ -381,13 +381,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -396,8 +396,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 10 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -414,6 +419,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -429,16 +439,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -479,11 +479,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -491,10 +486,15 @@ PrefabInstance: +animation' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -503,7 +503,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, @@ -523,27 +528,22 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, @@ -629,53 +629,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 @@ -714,7 +667,7 @@ MonoBehaviour: exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: - data1: 70005810528093 + data1: 72127601995939677 data2: 4539628424389459968 lodBias: 0.8 lodBiasMode: 2 @@ -728,9 +681,56 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 3458764513820540928 + data1: 3530822110005952512 data2: 0 defaultFrameSettings: 0 + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &295567762 Camera: m_ObjectHideFlags: 0 @@ -804,14 +804,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 300.9 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -821,6 +813,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -837,6 +830,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -886,9 +880,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -904,10 +903,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &316708079 Light: m_ObjectHideFlags: 0 @@ -1058,6 +1064,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1190,6 +1197,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2044308108} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -1205,6 +1217,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -1220,16 +1237,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1367,6 +1374,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 936570776} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -1382,6 +1394,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -1397,16 +1414,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1446,11 +1453,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -1458,6 +1460,11 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 3 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Alignment @@ -1465,13 +1472,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1480,8 +1487,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 7 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1498,6 +1510,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -1513,16 +1530,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1563,6 +1570,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 454156638} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -1578,6 +1590,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -1593,16 +1610,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1714,6 +1721,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2005980549} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.x + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.y + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.z + value: 0.016614528 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -1729,6 +1756,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -5.14 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.13021934 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -1744,16 +1776,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.06766387 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.13021934 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1769,21 +1791,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -2.0370002 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.x - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.y - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.z - value: 0.016614528 - objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_Name @@ -1818,6 +1825,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1061673664} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -1833,6 +1845,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -1848,16 +1865,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1927,6 +1934,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 --- !u!114 &627418905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1965,6 +1973,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 454156638} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -1980,6 +1993,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -1995,16 +2013,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2129,14 +2137,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 133.58 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -2146,6 +2146,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2162,6 +2163,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2211,9 +2213,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2229,10 +2236,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &739942738 Light: m_ObjectHideFlags: 0 @@ -2318,18 +2332,18 @@ PrefabInstance: m_Modifications: - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.x - value: -0.02790393 + propertyPath: m_LocalPosition.x + value: -0.0000000012216855 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.y - value: -0.71824515 + propertyPath: m_LocalPosition.y + value: 0.04577807 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.z - value: -0.06802491 + propertyPath: m_LocalPosition.z + value: 1.9844953e-10 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -2338,18 +2352,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.x - value: -0.0000000012216855 + propertyPath: m_LocalRotation.x + value: -0.02790393 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.y - value: 0.04577807 + propertyPath: m_LocalRotation.y + value: -0.71824515 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.z - value: 1.9844953e-10 + propertyPath: m_LocalRotation.z + value: -0.06802491 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -2366,6 +2380,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.x + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.y + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.z + value: 0.016614528 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -2381,6 +2415,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -5.043314 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.13021934 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -2396,16 +2435,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.06766387 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.13021934 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2421,35 +2450,20 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -2.0370002 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalScale.x - value: 0.016614528 + propertyPath: m_LocalPosition.x + value: 0.000034766643 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalScale.y - value: 0.016614528 + propertyPath: m_LocalPosition.y + value: -0.027032869 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalScale.z - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.5320949 - objectReference: {fileID: 0} - - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.43931857 - objectReference: {fileID: 0} - - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.535253 + propertyPath: m_LocalPosition.z + value: -0.0001357919 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -2458,18 +2472,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.x - value: 0.000034766643 + propertyPath: m_LocalRotation.x + value: -0.5320949 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.y - value: -0.027032869 + propertyPath: m_LocalRotation.y + value: 0.43931857 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.z - value: -0.0001357919 + propertyPath: m_LocalRotation.z + value: 0.535253 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -2503,8 +2517,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 758350840589664019, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_BlendShapeWeights.Array.data[3] - value: 17.6 + propertyPath: m_BlendShapeWeights.Array.data[1] + value: 9.1 objectReference: {fileID: 0} - target: {fileID: 758350840589664019, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -2513,8 +2527,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 758350840589664019, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_BlendShapeWeights.Array.data[1] - value: 9.1 + propertyPath: m_BlendShapeWeights.Array.data[3] + value: 17.6 objectReference: {fileID: 0} - target: {fileID: 5742002543470526063, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -2553,14 +2567,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 1 - m_AreaLightShape: 0 m_Intensity: 162.03 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -2570,6 +2576,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2586,6 +2593,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2635,9 +2643,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2653,10 +2666,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 1 + m_AreaLightShape: 0 --- !u!108 &803090226 Light: m_ObjectHideFlags: 0 @@ -2762,6 +2782,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2080852370} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -2777,6 +2802,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -2792,16 +2822,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2903,14 +2923,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 2 - m_AreaLightShape: 0 m_Intensity: 7.1 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -2920,6 +2932,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2936,6 +2949,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2985,9 +2999,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3003,10 +3022,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 2 + m_AreaLightShape: 0 --- !u!108 &928375464 Light: m_ObjectHideFlags: 0 @@ -3146,6 +3172,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 936570776} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -3161,6 +3192,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -3176,16 +3212,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3238,24 +3264,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: shadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowResolution.m_Level + propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: m_MinFilterSize - value: 1 + propertyPath: shadowNearPlane + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_ShadowNearPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -3268,29 +3294,34 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: shadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowResolution.m_Level + propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: m_MinFilterSize - value: 1 + propertyPath: shadowNearPlane + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_ShadowNearPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name value: TriPointLight objectReference: {fileID: 0} + - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_LocalPosition.x @@ -3306,6 +3337,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7728611 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_LocalRotation.x @@ -3321,16 +3357,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.38158453 objectReference: {fileID: 0} - - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7728611 - objectReference: {fileID: 0} - - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3358,24 +3384,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: shadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowResolution.m_Level + propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: m_MinFilterSize - value: 1 + propertyPath: shadowNearPlane + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_ShadowNearPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3510,6 +3536,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1408269546} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -3525,6 +3556,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -3540,16 +3576,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3726,11 +3752,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -3743,10 +3764,15 @@ PrefabInstance: propertyPath: m_Color.rgba value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -3755,8 +3781,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -3773,6 +3804,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -3788,16 +3824,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3909,14 +3935,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 133.58 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -3926,6 +3944,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3942,6 +3961,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3991,9 +4011,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4009,10 +4034,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1237229781 Light: m_ObjectHideFlags: 0 @@ -4156,14 +4188,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 300.9 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -4173,6 +4197,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4189,6 +4214,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4238,9 +4264,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4256,10 +4287,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1274396916 Light: m_ObjectHideFlags: 0 @@ -4343,11 +4381,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -4355,8 +4388,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Color.rgba - value: 4288059135 + propertyPath: m_Anchor + value: 3 objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4365,13 +4398,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_Color.rgba + value: 4288059135 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4380,8 +4418,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 11 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4398,6 +4441,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -4413,16 +4461,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4463,6 +4501,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2044308108} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -4478,6 +4521,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -4493,16 +4541,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4548,11 +4586,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.1 - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -4565,10 +4598,15 @@ PrefabInstance: propertyPath: m_Anchor value: 4 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4577,8 +4615,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 2 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4595,6 +4638,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -4610,16 +4658,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4655,6 +4693,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1408269546} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -4670,6 +4713,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -4685,16 +4733,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4807,11 +4845,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -4819,10 +4852,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4831,8 +4869,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 5 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4849,6 +4892,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -4864,16 +4912,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4945,6 +4983,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2005980549} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.x + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.y + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.z + value: 0.016614528 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -4960,6 +5018,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -5.2357597 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.13021934 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -4975,16 +5038,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.06766387 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.13021934 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5000,21 +5053,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -2.0370002 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.x - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.y - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.z - value: 0.016614528 - objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_Name @@ -5044,11 +5082,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -5056,10 +5089,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5068,8 +5106,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 3 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5086,6 +5129,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -5103,23 +5151,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_LocalEulerAnglesHint.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 + propertyPath: m_LocalEulerAnglesHint.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5157,6 +5195,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1061673664} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -5172,6 +5215,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -5187,16 +5235,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5326,11 +5364,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -5341,10 +5374,15 @@ PrefabInstance: propertyPath: m_Color.rgba value: 4278190335 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5353,8 +5391,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 8 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5371,6 +5414,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -5386,16 +5434,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5435,6 +5473,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -5447,6 +5489,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -5459,14 +5505,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -5481,13 +5519,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: field of view - value: 60 + propertyPath: orthographic + value: 1 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: near clip plane - value: 1.5 + propertyPath: field of view + value: 60 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -5496,18 +5534,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic - value: 1 + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 0} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: near clip plane + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: orthographic size value: 1 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_TargetTexture - value: + propertyPath: m_Version + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -5516,23 +5559,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: customRenderingSettings + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 70007966400349 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 1 + propertyPath: xrLayout + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 320 + propertyPath: waitFrames + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 60 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -5542,48 +5595,48 @@ PrefabInstance: type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: renderGraphCompatible 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 + propertyPath: ImageComparisonSettings.TargetWidth + value: 470 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1024625045} + propertyPath: ImageComparisonSettings.TargetHeight + value: 320 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ToggleBatching + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 470 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: captureFramerate - value: 60 - objectReference: {fileID: 0} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1024625045} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: waitFrames - value: 10 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -5592,8 +5645,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToggleBatching objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -5602,18 +5655,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine 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: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -5669,53 +5717,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 @@ -5754,7 +5755,7 @@ MonoBehaviour: exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: - data1: 70005810528093 + data1: 72127601995939677 data2: 4539628424389459968 lodBias: 0.85 lodBiasMode: 2 @@ -5768,9 +5769,56 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 3458764513820540928 + data1: 3530822110005952512 data2: 0 defaultFrameSettings: 0 + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &1849359547 Camera: m_ObjectHideFlags: 0 @@ -5857,11 +5905,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -5871,6 +5914,11 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 3 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Alignment @@ -5878,13 +5926,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5893,8 +5941,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 9 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -5911,6 +5964,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -5926,16 +5984,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5976,11 +6024,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1045739129} m_Modifications: - - 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 @@ -5988,10 +6031,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -6000,8 +6048,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 6 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -6018,6 +6071,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -6033,16 +6091,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6089,6 +6137,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2080852370} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -6104,6 +6157,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -6119,16 +6177,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6224,14 +6272,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 600 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -6241,6 +6281,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -6257,6 +6298,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -6306,9 +6348,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6324,10 +6371,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &2010550058 Light: m_ObjectHideFlags: 0 @@ -6492,53 +6546,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 @@ -6577,7 +6584,7 @@ MonoBehaviour: exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: - data1: 70005810528093 + data1: 72127601995939677 data2: 4539628424389459968 lodBias: 0.8 lodBiasMode: 2 @@ -6591,9 +6598,56 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 3458764513820540928 + data1: 3530822110005952512 data2: 0 defaultFrameSettings: 0 + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &2041827064 Camera: m_ObjectHideFlags: 0 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 ae0d988b93d..0ef4b16dab3 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 @@ -243,6 +243,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1399070541} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -258,6 +263,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -273,16 +283,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -381,6 +381,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 60258361} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -396,6 +401,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -411,16 +421,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -519,6 +519,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 60258361} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -534,6 +539,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -549,16 +559,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -677,6 +677,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 --- !u!114 &160564957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -715,11 +716,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -732,10 +728,15 @@ PrefabInstance: propertyPath: m_Color.rgba value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -744,8 +745,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -762,6 +768,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -777,16 +788,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -822,6 +823,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 255003794} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -837,6 +843,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -852,16 +863,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1095,14 +1096,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 600 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -1112,6 +1105,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1128,6 +1122,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1177,9 +1172,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1195,10 +1195,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &376190249 Light: m_ObjectHideFlags: 0 @@ -1282,11 +1289,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.1 - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -1299,10 +1301,15 @@ PrefabInstance: propertyPath: m_Anchor value: 4 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1311,8 +1318,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 2 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1329,6 +1341,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -1344,16 +1361,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1420,11 +1427,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -1432,6 +1434,11 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 3 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Alignment @@ -1439,13 +1446,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1454,8 +1461,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 10 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1472,6 +1484,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -1487,16 +1504,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1625,14 +1632,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 1 - m_AreaLightShape: 0 m_Intensity: 162.03 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -1642,6 +1641,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1658,6 +1658,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1707,9 +1708,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1725,10 +1731,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 1 + m_AreaLightShape: 0 --- !u!108 &597864850 Light: m_ObjectHideFlags: 0 @@ -1835,14 +1848,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 133.58 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -1852,6 +1857,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1868,6 +1874,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1917,9 +1924,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1935,10 +1947,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &632939249 Light: m_ObjectHideFlags: 0 @@ -2022,11 +2041,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -2034,8 +2048,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Color.rgba - value: 4288059135 + propertyPath: m_Anchor + value: 3 objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2044,13 +2058,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_Color.rgba + value: 4288059135 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2059,8 +2078,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 11 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2077,6 +2101,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -2092,16 +2121,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2165,14 +2184,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 133.58 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -2182,6 +2193,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2198,6 +2210,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2247,9 +2260,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2265,10 +2283,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &667701177 Light: m_ObjectHideFlags: 0 @@ -2352,6 +2377,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 64433677} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -2367,6 +2397,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -2382,16 +2417,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2490,6 +2515,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1085574692} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.x + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.y + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.z + value: 0.016614528 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -2505,6 +2550,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -5.14 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.13021934 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -2520,16 +2570,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.06766387 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.13021934 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2545,21 +2585,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -2.0370002 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.x - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.y - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.z - value: 0.016614528 - objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_Name @@ -2647,11 +2672,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -2659,10 +2679,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2671,8 +2696,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 5 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2689,6 +2719,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -2704,16 +2739,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2754,11 +2779,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -2769,10 +2789,15 @@ PrefabInstance: propertyPath: m_Color.rgba value: 4278190335 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2781,8 +2806,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 8 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2799,6 +2829,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -2814,16 +2849,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2859,6 +2884,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 302669325} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -2874,6 +2904,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -2889,16 +2924,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2997,6 +3022,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 255003794} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -3012,6 +3042,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -3027,16 +3062,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3215,73 +3240,73 @@ PrefabInstance: m_Modifications: - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.x - value: 4.26 + propertyPath: m_RootOrder + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.y - value: -9.54665 + propertyPath: m_LocalScale.x + value: 0.016614528 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.z - value: -5.2357597 + propertyPath: m_LocalScale.y + value: 0.016614528 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.x - value: -0.008907941 + propertyPath: m_LocalScale.z + value: 0.016614528 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.y - value: 0.98913354 + propertyPath: m_LocalPosition.x + value: 4.26 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.z - value: 0.06766387 + propertyPath: m_LocalPosition.y + value: -9.54665 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.w - value: -0.13021934 + propertyPath: m_LocalPosition.z + value: -5.2357597 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_RootOrder - value: 0 + propertyPath: m_LocalRotation.w + value: -0.13021934 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -7.5580006 + propertyPath: m_LocalRotation.x + value: -0.008907941 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -164.86601 + propertyPath: m_LocalRotation.y + value: 0.98913354 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -2.0370002 + propertyPath: m_LocalRotation.z + value: 0.06766387 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalScale.x - value: 0.016614528 + propertyPath: m_LocalEulerAnglesHint.x + value: -7.5580006 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalScale.y - value: 0.016614528 + propertyPath: m_LocalEulerAnglesHint.y + value: -164.86601 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalScale.z - value: 0.016614528 + propertyPath: m_LocalEulerAnglesHint.z + value: -2.0370002 objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -3365,11 +3390,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -3379,6 +3399,11 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 3 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Alignment @@ -3386,13 +3411,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -3401,8 +3426,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 9 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -3419,6 +3449,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -3434,16 +3469,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3540,14 +3565,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 5 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 305.5 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -3557,6 +3574,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3573,6 +3591,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3622,9 +3641,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3640,10 +3664,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 5 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1190946901 Light: m_ObjectHideFlags: 0 @@ -3750,53 +3781,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 @@ -3835,7 +3819,7 @@ MonoBehaviour: exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: - data1: 70005810528093 + data1: 72127601995939677 data2: 4539628424389459968 lodBias: 0.85 lodBiasMode: 2 @@ -3849,9 +3833,56 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 3458764513820540928 + data1: 3530822110005952512 data2: 0 defaultFrameSettings: 0 + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &1196391046 Camera: m_ObjectHideFlags: 0 @@ -3952,6 +3983,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3997,11 +4029,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -4009,10 +4036,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4021,8 +4053,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 6 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4039,6 +4076,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -4054,16 +4096,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4104,6 +4136,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1633040849} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -4119,6 +4156,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -4134,16 +4176,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4251,6 +4283,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -4263,6 +4299,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -4275,14 +4315,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -4297,13 +4329,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: field of view - value: 60 + propertyPath: orthographic + value: 1 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: near clip plane - value: 1.5 + propertyPath: field of view + value: 60 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -4312,22 +4344,17 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic - value: 1 + propertyPath: m_TargetTexture + value: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic size - value: 1 + propertyPath: near clip plane + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_TargetTexture - value: - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: clearColorMode + propertyPath: orthographic size value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -4335,6 +4362,11 @@ PrefabInstance: propertyPath: m_Version value: 7 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 @@ -4342,13 +4374,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 320 + propertyPath: waitFrames + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 60 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -4358,48 +4395,48 @@ PrefabInstance: type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: renderGraphCompatible 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 + propertyPath: ImageComparisonSettings.TargetWidth + value: 470 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + propertyPath: ImageComparisonSettings.TargetHeight + value: 320 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ToggleBatching + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 470 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: captureFramerate - value: 60 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: waitFrames - value: 10 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -4408,8 +4445,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToggleBatching objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -4418,18 +4455,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine 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: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -4440,11 +4472,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -4452,6 +4479,11 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 3 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Alignment @@ -4459,13 +4491,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 3 + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4474,8 +4506,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 7 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4492,6 +4529,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -4507,16 +4549,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4580,14 +4612,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 300.9 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -4597,6 +4621,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4613,6 +4638,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4662,9 +4688,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4680,10 +4711,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1313756196 Light: m_ObjectHideFlags: 0 @@ -4767,11 +4805,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -4779,10 +4812,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4791,8 +4829,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 3 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -4809,6 +4852,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -4824,16 +4872,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5017,14 +5055,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 2 - m_AreaLightShape: 0 m_Intensity: 7.1 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -5034,6 +5064,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -5050,6 +5081,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -5099,9 +5131,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5117,10 +5154,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 2 + m_AreaLightShape: 0 --- !u!108 &1503478094 Light: m_ObjectHideFlags: 0 @@ -5235,6 +5279,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1399070541} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -5250,6 +5299,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -5265,16 +5319,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5378,6 +5422,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1633040849} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -5393,6 +5442,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -5408,16 +5462,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5516,6 +5560,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 64433677} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -5533,28 +5582,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_LocalRotation.y + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_RootOrder - value: 0 + propertyPath: m_LocalRotation.z + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -5649,6 +5693,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 302669325} m_Modifications: + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -5664,6 +5713,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2.9838946 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -5679,16 +5733,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5850,24 +5894,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: shadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowResolution.m_Level + propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: m_MinFilterSize - value: 1 + propertyPath: shadowNearPlane + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_ShadowNearPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -5880,29 +5924,34 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: shadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowResolution.m_Level + propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: m_MinFilterSize - value: 1 + propertyPath: shadowNearPlane + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_ShadowNearPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name value: TriPointLight objectReference: {fileID: 0} + - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_LocalPosition.x @@ -5918,6 +5967,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7728611 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_LocalRotation.x @@ -5933,16 +5987,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.38158453 objectReference: {fileID: 0} - - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7728611 - objectReference: {fileID: 0} - - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_RootOrder - value: 17 - objectReference: {fileID: 0} - target: {fileID: 5166460635194736117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5970,24 +6014,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: shadowNearPlane - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, - type: 3} - propertyPath: m_ShadowResolution.m_Level + propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - propertyPath: m_MinFilterSize - value: 1 + propertyPath: shadowNearPlane + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_ShadowNearPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -6037,53 +6081,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 @@ -6122,7 +6119,7 @@ MonoBehaviour: exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: - data1: 70005810528093 + data1: 72127601995939677 data2: 4539628424389459968 lodBias: 0.8 lodBiasMode: 2 @@ -6136,9 +6133,56 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 3458764513820540928 + data1: 3530822110005952512 data2: 0 defaultFrameSettings: 0 + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &1761505112 Camera: m_ObjectHideFlags: 0 @@ -6189,11 +6233,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -6201,10 +6240,15 @@ PrefabInstance: light' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -6213,8 +6257,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 4 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -6231,6 +6280,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -6246,16 +6300,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6296,11 +6340,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 897782710} m_Modifications: - - 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 @@ -6308,10 +6347,15 @@ PrefabInstance: +animation' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -6320,7 +6364,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, @@ -6340,27 +6389,22 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, @@ -6426,14 +6470,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 300.9 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -6443,6 +6479,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -6459,6 +6496,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -6508,9 +6546,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6526,10 +6569,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1970729143 Light: m_ObjectHideFlags: 0 @@ -6615,18 +6665,18 @@ PrefabInstance: m_Modifications: - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.x - value: -0.02790393 + propertyPath: m_LocalPosition.x + value: -0.0000000012216855 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.y - value: -0.71824515 + propertyPath: m_LocalPosition.y + value: 0.04577807 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.z - value: -0.06802491 + propertyPath: m_LocalPosition.z + value: 1.9844953e-10 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -6635,18 +6685,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.x - value: -0.0000000012216855 + propertyPath: m_LocalRotation.x + value: -0.02790393 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.y - value: 0.04577807 + propertyPath: m_LocalRotation.y + value: -0.71824515 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.z - value: 1.9844953e-10 + propertyPath: m_LocalRotation.z + value: -0.06802491 objectReference: {fileID: 0} - target: {fileID: -5224941450663219140, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -6663,6 +6713,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.x + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.y + value: 0.016614528 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalScale.z + value: 0.016614528 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -6678,6 +6748,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -5.043314 objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.13021934 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalRotation.x @@ -6693,16 +6768,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.06766387 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.13021934 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6718,35 +6783,20 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -2.0370002 objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.x - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.y - value: 0.016614528 - objectReference: {fileID: 0} - - target: {fileID: -4216859302048453862, guid: bd33b31d152672c4e85280426297e6fb, - type: 3} - propertyPath: m_LocalScale.z - value: 0.016614528 - objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.x - value: -0.5320949 + propertyPath: m_LocalPosition.x + value: 0.000034766643 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.y - value: 0.43931857 + propertyPath: m_LocalPosition.y + value: -0.027032869 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalRotation.z - value: 0.535253 + propertyPath: m_LocalPosition.z + value: -0.0001357919 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -6755,18 +6805,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.x - value: 0.000034766643 + propertyPath: m_LocalRotation.x + value: -0.5320949 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.y - value: -0.027032869 + propertyPath: m_LocalRotation.y + value: 0.43931857 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_LocalPosition.z - value: -0.0001357919 + propertyPath: m_LocalRotation.z + value: 0.535253 objectReference: {fileID: 0} - target: {fileID: -4011201092182063583, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -6800,8 +6850,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 758350840589664019, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_BlendShapeWeights.Array.data[3] - value: 17.6 + propertyPath: m_BlendShapeWeights.Array.data[1] + value: 9.1 objectReference: {fileID: 0} - target: {fileID: 758350840589664019, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -6810,8 +6860,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 758350840589664019, guid: bd33b31d152672c4e85280426297e6fb, type: 3} - propertyPath: m_BlendShapeWeights.Array.data[1] - value: 9.1 + propertyPath: m_BlendShapeWeights.Array.data[3] + value: 17.6 objectReference: {fileID: 0} - target: {fileID: 5742002543470526063, guid: bd33b31d152672c4e85280426297e6fb, type: 3} @@ -6917,53 +6967,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 @@ -7002,7 +7005,7 @@ MonoBehaviour: exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: - data1: 70005810528093 + data1: 72127601995939677 data2: 4539628424389459968 lodBias: 0.8 lodBiasMode: 2 @@ -7016,9 +7019,56 @@ MonoBehaviour: materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: - data1: 3458764513820540928 + data1: 3530822110005952512 data2: 0 defaultFrameSettings: 0 + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &2078445862 Camera: m_ObjectHideFlags: 0 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 ff4def59973..fa097d49bb5 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 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.049940802, g: 0.069669686, b: 0.10658538, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -136,11 +136,6 @@ PrefabInstance: 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 @@ -156,10 +151,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -168,8 +168,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -186,6 +206,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 3.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -201,16 +226,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -226,21 +241,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -282,6 +282,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -363,6 +364,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -444,6 +446,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -525,6 +528,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -606,6 +610,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -687,6 +692,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -783,6 +789,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -867,6 +874,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 + m_StaticLightingCloudsUniqueID: 0 --- !u!114 &115701100 MonoBehaviour: m_ObjectHideFlags: 0 @@ -927,6 +935,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -991,11 +1000,6 @@ PrefabInstance: 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 @@ -1016,10 +1020,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1028,8 +1037,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -8.535574 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 8.535574 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 8.535574 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -1046,6 +1075,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.81 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -1061,16 +1095,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1086,21 +1110,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -8.535574 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 8.535574 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 8.535574 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -1142,6 +1151,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1223,6 +1233,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1304,6 +1315,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1385,6 +1397,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1466,6 +1479,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1547,6 +1561,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1628,6 +1643,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1709,6 +1725,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1790,6 +1807,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1871,6 +1889,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1952,6 +1971,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2016,11 +2036,6 @@ PrefabInstance: 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 @@ -2036,10 +2051,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2048,8 +2068,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2066,6 +2106,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.38 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -2081,16 +2126,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2106,21 +2141,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -2162,6 +2182,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2243,6 +2264,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2324,6 +2346,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2405,6 +2428,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2486,6 +2510,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2567,6 +2592,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2648,6 +2674,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2744,6 +2771,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2825,6 +2853,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2889,11 +2918,6 @@ PrefabInstance: 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 @@ -2909,10 +2933,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2921,8 +2950,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2939,6 +2988,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.38 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -2954,16 +3008,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2979,21 +3023,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -3035,6 +3064,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3116,6 +3146,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3197,6 +3228,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3278,6 +3310,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3359,6 +3392,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3440,6 +3474,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3521,6 +3556,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3602,6 +3638,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3683,6 +3720,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3764,6 +3802,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3845,6 +3884,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3926,6 +3966,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4007,6 +4048,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4102,6 +4144,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4169,6 +4212,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4250,6 +4294,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4331,6 +4376,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4412,6 +4458,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4493,6 +4540,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4574,6 +4622,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4670,6 +4719,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4751,6 +4801,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4847,6 +4898,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4928,6 +4980,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5009,6 +5062,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5090,6 +5144,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5171,6 +5226,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5252,6 +5308,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5333,6 +5390,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5414,6 +5472,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5531,6 +5590,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5612,6 +5672,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5693,6 +5754,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5774,6 +5836,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5855,6 +5918,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5936,6 +6000,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6017,6 +6082,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6098,6 +6164,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6194,6 +6261,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6275,6 +6343,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6356,6 +6425,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6437,6 +6507,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6518,6 +6589,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6599,6 +6671,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6680,6 +6753,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6761,6 +6835,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6842,6 +6917,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6923,6 +6999,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7004,6 +7081,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7085,6 +7163,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7166,6 +7245,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7247,6 +7327,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7328,6 +7409,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7409,6 +7491,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7490,6 +7573,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7571,6 +7655,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7652,6 +7737,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7733,6 +7819,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7814,6 +7901,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7895,6 +7983,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7976,6 +8065,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8057,6 +8147,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8138,6 +8229,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8219,6 +8311,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8300,6 +8393,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8395,6 +8489,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8462,6 +8557,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8543,6 +8639,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8624,6 +8721,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8705,6 +8803,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8786,6 +8885,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8867,6 +8967,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8991,6 +9092,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9072,6 +9174,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9153,6 +9256,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9234,6 +9338,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9315,6 +9420,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9396,6 +9502,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9477,6 +9584,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9558,6 +9666,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9639,6 +9748,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9720,6 +9830,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9801,6 +9912,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9882,6 +9994,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9963,6 +10076,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10044,6 +10158,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10125,6 +10240,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10221,14 +10337,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 13.6 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -10238,6 +10346,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 4 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -10254,6 +10363,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -10303,9 +10413,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10321,10 +10436,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1186812977 Light: m_ObjectHideFlags: 0 @@ -10416,6 +10538,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10497,6 +10620,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10578,6 +10702,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10659,6 +10784,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10740,6 +10866,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10821,6 +10948,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10902,6 +11030,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10997,6 +11126,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11064,6 +11194,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11145,6 +11276,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11226,6 +11358,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11307,6 +11440,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11388,6 +11522,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11469,6 +11604,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11550,6 +11686,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11631,6 +11768,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11712,6 +11850,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11793,6 +11932,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11874,6 +12014,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11955,6 +12096,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12036,6 +12178,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12132,14 +12275,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 2 - m_AreaLightShape: 0 m_Intensity: 13.7 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -12149,6 +12284,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 4 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12165,6 +12301,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12214,9 +12351,14 @@ MonoBehaviour: m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12232,10 +12374,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 2 + m_AreaLightShape: 0 --- !u!108 &1334092060 Light: m_ObjectHideFlags: 0 @@ -12341,6 +12490,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12408,6 +12558,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12489,6 +12640,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12570,6 +12722,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12651,6 +12804,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12732,6 +12886,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12813,6 +12968,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12894,6 +13050,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12975,6 +13132,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13056,6 +13214,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13137,6 +13296,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13218,6 +13378,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13299,6 +13460,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13380,6 +13542,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13462,14 +13625,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -13479,6 +13634,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -13495,6 +13651,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -13544,9 +13701,14 @@ MonoBehaviour: m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13562,10 +13724,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1481024265 Light: m_ObjectHideFlags: 0 @@ -13671,6 +13840,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13752,6 +13922,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13833,6 +14004,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13914,6 +14086,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13995,6 +14168,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14076,6 +14250,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14157,6 +14332,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14238,6 +14414,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14319,6 +14496,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14400,6 +14578,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14717,6 +14896,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14798,6 +14978,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14879,6 +15060,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14960,6 +15142,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15041,6 +15224,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15122,6 +15306,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15203,6 +15388,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15267,11 +15453,6 @@ PrefabInstance: 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 @@ -15287,10 +15468,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15299,14 +15485,34 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 1 + propertyPath: testSettings + value: 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_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15322,6 +15528,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 3.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -15337,16 +15548,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15362,21 +15563,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -15418,6 +15604,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15499,6 +15686,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15580,6 +15768,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15661,6 +15850,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15742,6 +15932,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15823,6 +16014,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15904,6 +16096,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15985,6 +16178,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16048,6 +16242,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -0.75 @@ -16060,6 +16258,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.6 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.002293504 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0.0019338258 @@ -16072,14 +16274,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.64459807 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.002293504 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 30.000002 @@ -16102,6 +16296,11 @@ PrefabInstance: propertyPath: far clip plane value: 40 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: clearColorMode @@ -16109,23 +16308,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: customRenderingSettings + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 72127602004328285 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 72057596185411584 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 1 + propertyPath: xrLayout + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 640 + propertyPath: waitFrames + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -16135,53 +16344,48 @@ PrefabInstance: type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: renderGraphCompatible 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 + propertyPath: ImageComparisonSettings.TargetWidth + value: 800 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1094080313} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ToggleBatching + propertyPath: ImageComparisonSettings.TargetHeight + value: 640 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: captureFramerate - value: 0 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: waitFrames - value: 0 - objectReference: {fileID: 0} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1094080313} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 800 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: xrLayout - value: 0 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToggleBatching objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -16197,11 +16401,6 @@ PrefabInstance: 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 @@ -16217,10 +16416,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -16229,8 +16433,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -16247,6 +16471,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.38 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -16262,16 +16491,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16287,21 +16506,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -16343,6 +16547,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16424,6 +16629,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16505,6 +16711,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16586,6 +16793,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16667,6 +16875,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16748,6 +16957,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16829,6 +17039,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16910,6 +17121,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16991,6 +17203,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17072,6 +17285,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17153,6 +17367,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17234,6 +17449,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17315,6 +17531,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17396,6 +17613,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17477,6 +17695,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17573,14 +17792,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 1 - m_AreaLightShape: 0 m_Intensity: 14.8 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -17590,6 +17801,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 4 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -17606,6 +17818,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -17655,9 +17868,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17673,10 +17891,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 1 + m_AreaLightShape: 0 --- !u!108 &1934754985 Light: m_ObjectHideFlags: 0 @@ -17768,6 +17993,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17849,6 +18075,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17930,6 +18157,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18011,6 +18239,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18092,6 +18321,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18173,6 +18403,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18255,14 +18486,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 79.78 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -18272,6 +18495,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -18288,6 +18512,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -18337,9 +18562,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -18355,10 +18585,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &2000975652 Light: m_ObjectHideFlags: 0 @@ -18464,6 +18701,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18545,6 +18783,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18626,6 +18865,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18707,6 +18947,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18788,6 +19029,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18869,6 +19111,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18950,6 +19193,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19046,14 +19290,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 2 - m_AreaLightShape: 0 m_Intensity: 11.47 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -19063,6 +19299,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -19079,6 +19316,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -19128,9 +19366,14 @@ MonoBehaviour: m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -19146,10 +19389,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 2 + m_AreaLightShape: 0 --- !u!108 &2063225983 Light: m_ObjectHideFlags: 0 @@ -19241,6 +19491,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19322,6 +19573,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19403,6 +19655,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19484,6 +19737,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19579,6 +19833,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19660,6 +19915,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19727,6 +19983,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19808,6 +20065,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 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 e66dab5c89a..c256e4b7315 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 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.049940802, g: 0.069669686, b: 0.10658538, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -167,6 +167,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -248,6 +249,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -329,6 +331,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -399,6 +402,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 + m_StaticLightingCloudsUniqueID: 0 --- !u!114 &63803591 MonoBehaviour: m_ObjectHideFlags: 0 @@ -473,6 +477,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -554,6 +559,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -635,6 +641,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -716,6 +723,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -797,6 +805,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -878,6 +887,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -959,6 +969,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1041,14 +1052,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 79.78 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -1058,6 +1061,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1074,6 +1078,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1123,9 +1128,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1141,10 +1151,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &154133178 Light: m_ObjectHideFlags: 0 @@ -1250,6 +1267,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1331,6 +1349,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1412,6 +1431,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1493,6 +1513,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1574,6 +1595,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1655,6 +1677,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1737,14 +1760,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 2 - m_AreaLightShape: 0 m_Intensity: 11.47 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -1754,6 +1769,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1770,6 +1786,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1819,9 +1836,14 @@ MonoBehaviour: m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1837,10 +1859,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 2 + m_AreaLightShape: 0 --- !u!108 &208533895 Light: m_ObjectHideFlags: 0 @@ -1982,6 +2011,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2063,6 +2093,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2144,6 +2175,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2225,6 +2257,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2306,6 +2339,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2387,6 +2421,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2468,6 +2503,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2549,6 +2585,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2630,6 +2667,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2711,6 +2749,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2792,6 +2831,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2873,6 +2913,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2954,6 +2995,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3004,11 +3046,6 @@ PrefabInstance: 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 @@ -3024,10 +3061,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -3036,8 +3078,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -3054,6 +3116,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.38 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -3069,16 +3136,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3094,21 +3151,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -3164,6 +3206,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3245,6 +3288,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3326,6 +3370,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3407,6 +3452,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3488,6 +3534,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3569,6 +3616,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3650,6 +3698,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3731,6 +3780,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3812,6 +3862,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3893,6 +3944,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3975,14 +4027,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 1 - m_AreaLightShape: 0 m_Intensity: 14.8 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -3992,6 +4036,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 4 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4008,6 +4053,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4057,9 +4103,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4075,10 +4126,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 1 + m_AreaLightShape: 0 --- !u!108 &426295405 Light: m_ObjectHideFlags: 0 @@ -4185,6 +4243,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4280,6 +4339,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4361,6 +4421,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4442,6 +4503,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4523,6 +4585,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4605,14 +4668,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 2 - m_AreaLightShape: 0 m_Intensity: 13.7 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -4622,6 +4677,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 4 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4638,6 +4694,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4687,9 +4744,14 @@ MonoBehaviour: m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4705,10 +4767,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 2 + m_AreaLightShape: 0 --- !u!108 &461319428 Light: m_ObjectHideFlags: 0 @@ -4814,6 +4883,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4895,6 +4965,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4976,6 +5047,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5057,6 +5129,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5138,6 +5211,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5219,6 +5293,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5300,6 +5375,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5381,6 +5457,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5462,6 +5539,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5543,6 +5621,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5624,6 +5703,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5705,6 +5785,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5786,6 +5867,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5867,6 +5949,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5948,6 +6031,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6029,6 +6113,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6110,6 +6195,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6191,6 +6277,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6272,6 +6359,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6353,6 +6441,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6434,6 +6523,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6515,6 +6605,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6596,6 +6687,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6677,6 +6769,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6758,6 +6851,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6839,6 +6933,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -6920,6 +7015,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7001,6 +7097,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7082,6 +7179,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7164,14 +7262,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -7181,6 +7271,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -7197,6 +7288,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -7246,9 +7338,14 @@ MonoBehaviour: m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7264,10 +7361,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 8 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &762691883 Light: m_ObjectHideFlags: 0 @@ -7609,6 +7713,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7690,6 +7795,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7771,6 +7877,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7852,6 +7959,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -7933,6 +8041,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8014,6 +8123,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8095,6 +8205,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8176,6 +8287,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8257,6 +8369,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8338,6 +8451,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8419,6 +8533,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8500,6 +8615,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8581,6 +8697,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8662,6 +8779,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8743,6 +8861,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8824,6 +8943,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8905,6 +9025,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -8955,11 +9076,6 @@ PrefabInstance: 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 @@ -8975,10 +9091,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -8987,8 +9108,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -9005,6 +9146,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.38 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -9020,16 +9166,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9045,21 +9181,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -9115,6 +9236,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9196,6 +9318,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9277,6 +9400,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9359,6 +9483,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9454,6 +9579,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9535,6 +9661,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9616,6 +9743,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9697,6 +9825,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9778,6 +9907,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9859,6 +9989,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9940,6 +10071,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10021,6 +10153,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10102,6 +10235,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10183,6 +10317,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10264,6 +10399,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10345,6 +10481,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10426,6 +10563,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10507,6 +10645,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10588,6 +10727,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10669,6 +10809,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10750,6 +10891,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10831,6 +10973,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10912,6 +11055,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10993,6 +11137,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11074,6 +11219,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11155,6 +11301,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11236,6 +11383,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11317,6 +11465,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11398,6 +11547,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11479,6 +11629,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11560,6 +11711,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11641,6 +11793,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11722,6 +11875,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11803,6 +11957,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11884,6 +12039,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11965,6 +12121,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12046,6 +12203,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12127,6 +12285,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12208,6 +12367,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12289,6 +12449,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12370,6 +12531,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12451,6 +12613,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12532,6 +12695,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12581,6 +12745,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -0.75 @@ -12593,6 +12761,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.6 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.002293504 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0.0019338258 @@ -12605,14 +12777,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.64459807 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.002293504 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 30.000002 @@ -12635,6 +12799,11 @@ PrefabInstance: propertyPath: far clip plane value: 40 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: clearColorMode @@ -12642,23 +12811,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: customRenderingSettings + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + value: 72127602004328285 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderingPathCustomFrameSettingsOverrideMask.mask.data1 + value: 72057596185411584 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 640 + propertyPath: waitFrames + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -12668,53 +12847,48 @@ PrefabInstance: type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: renderGraphCompatible 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: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + propertyPath: ImageComparisonSettings.TargetWidth + value: 800 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ToggleBatching + propertyPath: ImageComparisonSettings.TargetHeight + value: 640 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: captureFramerate - value: 0 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: waitFrames - value: 0 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 800 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: xrLayout - value: 0 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToggleBatching objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 1 + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -12761,6 +12935,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12842,6 +13017,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -12923,6 +13099,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13004,6 +13181,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13085,6 +13263,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13166,6 +13345,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13247,6 +13427,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13328,6 +13509,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13409,6 +13591,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13490,6 +13673,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13571,6 +13755,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13652,6 +13837,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13734,14 +13920,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 13.6 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -13751,6 +13929,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 4 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -13767,6 +13946,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -13816,9 +13996,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13834,10 +14019,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1386862605 Light: m_ObjectHideFlags: 0 @@ -13943,6 +14135,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14024,6 +14217,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14105,6 +14299,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14186,6 +14381,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14236,11 +14432,6 @@ PrefabInstance: 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 @@ -14256,10 +14447,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -14268,8 +14464,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -14286,6 +14502,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 3.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -14301,16 +14522,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14326,21 +14537,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -14396,6 +14592,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14477,6 +14674,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14558,6 +14756,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14639,6 +14838,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14720,6 +14920,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14801,6 +15002,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14882,6 +15084,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14963,6 +15166,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15044,6 +15248,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15125,6 +15330,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15206,6 +15412,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15287,6 +15494,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15337,11 +15545,6 @@ PrefabInstance: 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 @@ -15362,10 +15565,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15374,8 +15582,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -8.535574 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 8.535574 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 8.535574 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15392,6 +15620,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.81 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -15407,16 +15640,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15432,21 +15655,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -8.535574 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 8.535574 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 8.535574 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -15471,11 +15679,6 @@ PrefabInstance: 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 @@ -15491,10 +15694,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15503,8 +15711,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15521,6 +15749,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.38 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -15536,16 +15769,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15561,21 +15784,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -15631,6 +15839,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15712,6 +15921,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15793,6 +16003,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15874,6 +16085,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15955,6 +16167,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16036,6 +16249,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16117,6 +16331,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16198,6 +16413,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16279,6 +16495,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16360,6 +16577,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16442,6 +16660,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -16537,6 +16756,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16618,6 +16838,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16699,6 +16920,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16780,6 +17002,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16861,6 +17084,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -16942,6 +17166,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17024,6 +17249,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -17119,6 +17345,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17200,6 +17427,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17281,6 +17509,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17362,6 +17591,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17443,6 +17673,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17524,6 +17755,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17605,6 +17837,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17686,6 +17919,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17767,6 +18001,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17848,6 +18083,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -17929,6 +18165,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18010,6 +18247,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18091,6 +18329,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18172,6 +18411,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18253,6 +18493,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18334,6 +18575,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18415,6 +18657,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18496,6 +18739,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18577,6 +18821,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18658,6 +18903,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18739,6 +18985,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -18789,11 +19036,6 @@ PrefabInstance: 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 @@ -18809,10 +19051,15 @@ PrefabInstance: propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: testSettings - value: + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -18821,8 +19068,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: -5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 5.4803042 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 5.4803042 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -18839,6 +19106,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 3.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -18854,16 +19126,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18879,21 +19141,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: -5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 5.4803042 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 5.4803042 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -18949,6 +19196,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19030,6 +19278,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19111,6 +19360,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19192,6 +19442,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19273,6 +19524,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19354,6 +19606,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19435,6 +19688,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19517,6 +19771,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -19612,6 +19867,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19693,6 +19949,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19774,6 +20031,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 From 0a50d1b0082aecda83fcaabaf0b3698af3a38ab2 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Mon, 15 Mar 2021 18:22:56 +0100 Subject: [PATCH 55/58] Fix for HDRP DXR test 803 --- ...bSurfaceScatteringGlobalIllumination.unity | 87 ++++++++++++------- 1 file changed, 58 insertions(+), 29 deletions(-) diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/803_SubSurfaceScatteringGlobalIllumination.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/803_SubSurfaceScatteringGlobalIllumination.unity index 5648e4dc80f..c2365f576e4 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/803_SubSurfaceScatteringGlobalIllumination.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/803_SubSurfaceScatteringGlobalIllumination.unity @@ -168,6 +168,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -230,6 +231,7 @@ GameObject: m_Component: - component: {fileID: 321196268} - component: {fileID: 321196267} + - component: {fileID: 321196269} m_Layer: 0 m_Name: Global Volume m_TagString: Untagged @@ -268,6 +270,23 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &321196269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321196266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: -100 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f940a8037e6cda542891dc1aac1fa4e8, type: 2} --- !u!1 &940557428 GameObject: m_ObjectHideFlags: 0 @@ -312,6 +331,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -408,6 +428,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -490,14 +511,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, 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: 100 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -507,6 +520,7 @@ MonoBehaviour: m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -523,6 +537,7 @@ MonoBehaviour: m_AreaLightCookie: {fileID: 0} m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -572,9 +587,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -590,10 +610,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &998453647 Light: m_ObjectHideFlags: 0 @@ -699,6 +726,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -782,6 +810,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 94acb726607bf8f4fa833981233fffc5, type: 2} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 --- !u!4 &2058112915 Transform: m_ObjectHideFlags: 1 @@ -807,6 +836,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -819,6 +852,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -831,14 +868,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.17364816 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 20 @@ -853,13 +882,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_FocalLength - value: 34.170994 + propertyPath: field of view + value: 38.7 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: field of view - value: 38.7 + propertyPath: m_FocalLength + value: 34.170994 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -879,18 +908,18 @@ PrefabInstance: type: 2} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 480 + propertyPath: checkMemoryAllocation + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: checkMemoryAllocation - value: 0 + propertyPath: renderGraphCompatible + value: 1 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.PerPixelCorrectnessThreshold - value: 0.0016 + propertyPath: ImageComparisonSettings.TargetHeight + value: 480 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -899,8 +928,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: renderGraphCompatible - value: 1 + propertyPath: ImageComparisonSettings.PerPixelCorrectnessThreshold + value: 0.0016 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} From 4ff810b02e71cc9ea0496400535c96f94ca9a1d3 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 16 Mar 2021 11:49:04 +0100 Subject: [PATCH 56/58] Fix for player build from commandline Made sure HDRenderPipelineGlobalSettings are loaded before pulling its setting for shadervariantloglevel. --- .../Editor/BuildProcessors/HDRPPreprocessShaders.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index 511cf828fb7..942e703d583 100644 --- a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -317,6 +317,9 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis if (HDRenderPipeline.currentAsset == null) return; + if (HDRenderPipelineGlobalSettings.Ensure() == null) + return; + var exportLog = ShaderBuildPreprocessor.hdrpAssets.Count > 0 && (HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); @@ -472,6 +475,9 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList 0 && (HDRenderPipelineGlobalSettings.instance.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); From 262b61810053b6976f3b5fa72de6e1e6a8e13ff0 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Tue, 16 Mar 2021 17:54:32 +0100 Subject: [PATCH 57/58] Fix case where building a player without opening it first in the Editor (cannot create an asset while building a player) --- .../HDRenderPipelineGlobalSettings.asset | 84 +++++++++++++++++++ .../HDRenderPipelineGlobalSettings.asset.meta | 8 ++ .../ProjectSettings/GraphicsSettings.asset | 8 +- .../BuildProcessors/HDRPPreprocessShaders.cs | 4 +- .../HDRenderPipelineGlobalSettings.cs | 18 +++- 5 files changed, 113 insertions(+), 9 deletions(-) create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta diff --git a/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset b/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset new file mode 100644 index 00000000000..5b71074f29c --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 781cc897cf8675041a751163b51f97dd, type: 3} + m_Name: HDRenderPipelineGlobalSettings + m_EditorClassIdentifier: + m_VolumeProfileDefault: {fileID: 0} + m_VolumeProfileLookDev: {fileID: 0} + m_RenderingPathDefaultCameraFrameSettings: + bitDatas: + data1: 72198262773251917 + data2: 13763000468760363032 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + bitDatas: + data1: 135310754214733 + data2: 4539628428684427288 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_RenderingPathDefaultRealtimeReflectionFrameSettings: + bitDatas: + data1: 139923391782733 + data2: 13763000465807638544 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + materialQuality: 0 + m_RenderPipelineResources: {fileID: 0} + m_RenderPipelineRayTracingResources: {fileID: 0} + beforeTransparentCustomPostProcesses: [] + beforePostProcessCustomPostProcesses: [] + afterPostProcessCustomPostProcesses: [] + beforeTAACustomPostProcesses: [] + lightLayerName0: + lightLayerName1: + lightLayerName2: + lightLayerName3: + lightLayerName4: + lightLayerName5: + lightLayerName6: + lightLayerName7: + decalLayerName0: + decalLayerName1: + decalLayerName2: + decalLayerName3: + decalLayerName4: + decalLayerName5: + decalLayerName6: + decalLayerName7: + shaderVariantLogLevel: 0 + lensAttenuationMode: 0 + diffusionProfileSettingsList: [] + m_Version: 0 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta b/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 00000000000..38baebbc5f1 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 737f58924e3402a4f8b124942a5fd7af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset index 138b9b618ef..9307dbae5cf 100644 --- a/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset +++ b/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -42,7 +43,7 @@ GraphicsSettings: m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: a2b3940bdd38ca54880a3ae1fe6be80f, + m_CustomRenderPipeline: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} @@ -64,5 +65,6 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0 + m_SRPDefaultSettings: {} diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index 942e703d583..85e67597442 100644 --- a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -317,7 +317,7 @@ public void OnProcessComputeShader(ComputeShader shader, string kernelName, ILis if (HDRenderPipeline.currentAsset == null) return; - if (HDRenderPipelineGlobalSettings.Ensure() == null) + if (HDRenderPipelineGlobalSettings.Ensure(canCreateNewAsset: false) == null) return; var exportLog = ShaderBuildPreprocessor.hdrpAssets.Count > 0 @@ -475,7 +475,7 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippet, IList 0 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index 14a3ad30894..15100f4d7b4 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -53,7 +53,7 @@ static internal void UpdateGraphicsSettings(HDRenderPipelineGlobalSettings newSe #if UNITY_EDITOR //Making sure there is at least one HDRenderPipelineGlobalSettings instance in the project - static internal HDRenderPipelineGlobalSettings Ensure() + static internal HDRenderPipelineGlobalSettings Ensure(bool canCreateNewAsset = true) { bool needsMigration = (assetToBeMigrated != null && !assetToBeMigrated.Equals(null)); @@ -67,7 +67,7 @@ static internal HDRenderPipelineGlobalSettings Ensure() if (HDRenderPipelineGlobalSettings.instance) path = AssetDatabase.GetAssetPath(HDRenderPipelineGlobalSettings.instance); - assetCreated = MigrateFromHDRPAsset(assetToBeMigrated, path, bClearObsoleteFields: false); + assetCreated = MigrateFromHDRPAsset(assetToBeMigrated, path, bClearObsoleteFields: false, canCreateNewAsset: canCreateNewAsset); if (assetCreated != null && !assetCreated.Equals(null)) assetToBeMigrated = null; } @@ -84,12 +84,17 @@ static internal HDRenderPipelineGlobalSettings Ensure() path = AssetDatabase.GUIDToAssetPath(curGUID); assetCreated = AssetDatabase.LoadAssetAtPath(path); } - else // or create one altogether + else if (canCreateNewAsset)// or create one altogether { if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); assetCreated = Create(path); } + else + { + Debug.LogError("Cannot migrate HDRP Asset to a new HDRP Global Settings asset. If you are building a Player, make sure to save an HDRP Global Settings asset by opening the project in the Editor."); + return null; + } } } Debug.Assert(assetCreated, "Could not create HDRP's Global Settings - HDRP may not work correctly - Open the Graphics Window for additional help."); @@ -140,7 +145,7 @@ internal static void MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset) assetToBeMigrated = oldAsset; } - internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true) + internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipelineAsset oldAsset, string path, bool bClearObsoleteFields = true, bool canCreateNewAsset = true) { HDRenderPipelineGlobalSettings assetCreated = null; @@ -148,6 +153,11 @@ internal static HDRenderPipelineGlobalSettings MigrateFromHDRPAsset(HDRenderPipe assetCreated = AssetDatabase.LoadAssetAtPath(path); if (assetCreated == null) { + if (!canCreateNewAsset) + { + Debug.LogError("Cannot migrate HDRP Asset to a new HDRP Global Settings asset. If you are building a Player, make sure to save an HDRP Global Settings asset by opening the project in the Editor."); + return null; + } if (!AssetDatabase.IsValidFolder("Assets/HDRPDefaultResources/")) AssetDatabase.CreateFolder("Assets", "HDRPDefaultResources"); assetCreated = ScriptableObject.CreateInstance(); From 62c9baf0c519d5d68c4d04c9781bfd7013d31ca8 Mon Sep 17 00:00:00 2001 From: Jennifer Roig-Deslandes Date: Wed, 17 Mar 2021 18:37:59 +0100 Subject: [PATCH 58/58] Adding HDRP Global Settings to HDRP Runtime tests project --- .../Assets/Common/HDRPAsset.asset | 451 +++++++++++------- .../HDRenderPipelineGlobalSettings.asset | 35 +- .../ProjectSettings/GraphicsSettings.asset | 4 +- 3 files changed, 296 insertions(+), 194 deletions(-) diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Common/HDRPAsset.asset b/TestProjects/HDRP_RuntimeTests/Assets/Common/HDRPAsset.asset index bc90ce65a2c..5de6a8330ba 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/Common/HDRPAsset.asset +++ b/TestProjects/HDRP_RuntimeTests/Assets/Common/HDRPAsset.asset @@ -12,7 +12,255 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3} m_Name: HDRPAsset m_EditorClassIdentifier: - m_Version: 15 + m_RenderPipelineSettings: + supportShadowMask: 1 + supportSSR: 1 + supportSSRTransparent: 0 + supportSSAO: 1 + supportSSGI: 0 + supportSubsurfaceScattering: 1 + sssSampleBudget: + m_Values: 140000002800000050000000 + m_SchemaId: + m_Id: With3Levels + supportVolumetrics: 1 + supportVolumetricClouds: 0 + supportLightLayers: 0 + supportDistortion: 1 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 + colorBufferFormat: 74 + supportCustomPass: 1 + customBufferFormat: 12 + supportedLitShaderMode: 3 + planarReflectionResolution: + m_Values: 000100000004000000080000 + m_SchemaId: + m_Id: With3Levels + supportDecals: 1 + supportDecalLayers: 0 + msaaSampleCount: 2 + supportMotionVectors: 1 + supportRuntimeDebugDisplay: 0 + supportRuntimeAOVAPI: 0 + supportDitheringCrossFade: 0 + supportTerrainHole: 0 + supportProbeVolume: 0 + probeVolumeMemoryBudget: 1024 + probeVolumeSHBands: 1 + supportRayTracing: 0 + supportedRayTracingMode: 3 + lightLoopSettings: + cookieAtlasSize: 1024 + cookieFormat: 74 + cookieAtlasLastValidMip: 0 + cookieTexArraySize: 16 + planarReflectionAtlasSize: 1024 + reflectionProbeCacheSize: 16 + reflectionCubemapSize: 256 + reflectionCacheCompressed: 0 + reflectionProbeFormat: 74 + skyReflectionSize: 256 + skyLightingOverrideLayerMask: + serializedVersion: 2 + m_Bits: 0 + supportFabricConvolution: 0 + maxDirectionalLightsOnScreen: 16 + maxPunctualLightsOnScreen: 512 + maxAreaLightsOnScreen: 64 + maxEnvLightsOnScreen: 64 + maxDecalsOnScreen: 512 + maxPlanarReflectionOnScreen: 2 + maxLightsPerClusterCell: 8 + maxDensityVolumeSize: 32 + maxDensityVolumesOnScreen: 64 + hdShadowInitParams: + maxShadowRequests: 16 + directionalShadowsDepthBits: 32 + shadowFilteringQuality: 2 + punctualLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 1 + areaLightShadowAtlas: + shadowAtlasResolution: 4096 + shadowAtlasDepthBits: 32 + useDynamicViewportRescale: 1 + cachedPunctualLightShadowAtlas: 2048 + cachedAreaLightShadowAtlas: 1024 + shadowResolutionDirectional: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionPunctual: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + shadowResolutionArea: + m_Values: 00010000000200000004000000080000 + m_SchemaId: + m_Id: With4Levels + maxDirectionalShadowMapResolution: 4096 + maxPunctualShadowMapResolution: 2048 + maxAreaShadowMapResolution: 2048 + supportScreenSpaceShadows: 0 + maxScreenSpaceShadowSlots: 4 + screenSpaceShadowBufferFormat: 48 + decalSettings: + drawDistance: 1000 + atlasWidth: 1024 + atlasHeight: 1024 + perChannelMask: 1 + postProcessSettings: + m_LutSize: 32 + lutFormat: 48 + bufferFormat: 74 + dynamicResolutionSettings: + enabled: 0 + maxPercentage: 100 + minPercentage: 100 + dynResType: 1 + upsampleFilter: 1 + forceResolution: 0 + forcedPercentage: 100 + lowresTransparentSettings: + enabled: 1 + checkerboardDepthBuffer: 1 + upsampleType: 1 + xrSettings: + singlePass: 1 + occlusionMesh: 1 + cameraJitter: 0 + postProcessQualitySettings: + NearBlurSampleCount: 030000000500000008000000 + NearBlurMaxRadius: + - 2 + - 4 + - 7 + FarBlurSampleCount: 04000000070000000e000000 + FarBlurMaxRadius: + - 5 + - 8 + - 13 + DoFResolution: 040000000200000001000000 + DoFHighQualityFiltering: 000101 + DoFPhysicallyBased: 000000 + MotionBlurSampleCount: 04000000080000000c000000 + BloomRes: 040000000200000002000000 + BloomHighQualityFiltering: 000101 + BloomHighQualityPrefiltering: 000001 + ChromaticAberrationMaxSamples: 03000000060000000c000000 + lightSettings: + useContactShadow: + m_Values: 000001 + m_SchemaId: + m_Id: + maximumLODLevel: + m_Values: 000000000000000000000000 + m_SchemaId: + m_Id: With3Levels + lodBias: + m_Values: + - 1 + - 1 + - 1 + m_SchemaId: + m_Id: With3Levels + lightingQualitySettings: + AOStepCount: 040000000600000010000000 + AOFullRes: 000001 + AOMaximumRadiusPixels: 200000002800000050000000 + AOBilateralUpsample: 000101 + AODirectionCount: 010000000200000004000000 + ContactShadowSampleCount: 060000000a00000010000000 + SSRMaxRaySteps: 100000002000000040000000 + SSGIRaySteps: 200000004000000080000000 + SSGIFilterRadius: 100000000e0000000c000000 + RTAORayLength: + - 0.5 + - 3 + - 20 + RTAOSampleCount: 010000000200000008000000 + RTAODenoise: 010101 + RTAODenoiserRadius: + - 0.25 + - 0.5 + - 0.65 + RTGIRayLength: + - 50 + - 50 + - 50 + RTGIFullResolution: 000001 + RTGIClampValue: + - 0.5 + - 0.8 + - 1.5 + RTGIUpScaleRadius: 040000000400000004000000 + RTGIDenoise: 010101 + RTGIHalfResDenoise: 010000 + RTGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.25 + RTGISecondDenoise: 010101 + RTRMinSmoothness: + - 0.6 + - 0.4 + - 0 + RTRSmoothnessFadeStart: + - 0.7 + - 0.5 + - 0 + RTRRayLength: + - 50 + - 50 + - 50 + RTRClampValue: + - 0.8 + - 1 + - 1.2 + RTRFullResolution: 000001 + RTRDenoise: 010101 + RTRDenoiserRadius: 080000000c00000010000000 + RTRSmoothDenoising: 010000 + Fog_ControlMode: 000000000000000000000000 + Fog_Budget: + - 0.166 + - 0.33 + - 0.666 + Fog_DepthRatio: + - 0.666 + - 0.666 + - 0.5 + m_ObsoleteLightLayerName0: Light Layer default + m_ObsoleteLightLayerName1: Light Layer 1 + m_ObsoleteLightLayerName2: Light Layer 2 + m_ObsoleteLightLayerName3: Light Layer 3 + m_ObsoleteLightLayerName4: Light Layer 4 + m_ObsoleteLightLayerName5: Light Layer 5 + m_ObsoleteLightLayerName6: Light Layer 6 + m_ObsoleteLightLayerName7: Light Layer 7 + m_ObsoleteDecalLayerName0: + m_ObsoleteDecalLayerName1: + m_ObsoleteDecalLayerName2: + m_ObsoleteDecalLayerName3: + m_ObsoleteDecalLayerName4: + m_ObsoleteDecalLayerName5: + m_ObsoleteDecalLayerName6: + m_ObsoleteDecalLayerName7: + allowShaderVariantStripping: 1 + enableSRPBatcher: 1 + availableMaterialQualityLevels: -1 + m_DefaultMaterialQualityLevel: 4 + diffusionProfileSettings: {fileID: 0} + virtualTexturingSettings: + streamingCpuCacheSizeInMegaBytes: 256 + streamingGpuCacheSettings: + - format: 0 + sizeInMegaBytes: 128 + m_UseRenderGraph: 1 + m_Version: 19 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 @@ -148,16 +396,13 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + m_ObsoleteDefaultVolumeProfile: {fileID: 11400000, guid: dc4052ec38b9ac147a469135b69baa9a, type: 2} - m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: dc4052ec38b9ac147a469135b69baa9a, - type: 2} - m_DefaultLookDevProfile: {fileID: 0} - m_RenderingPathDefaultCameraFrameSettings: + m_ObsoleteDefaultLookDevProfile: {fileID: 0} + m_ObsoleteFrameSettingsMovedToDefaultSettings: bitDatas: data1: 140651589009244 - data2: 4539628425463136256 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -168,10 +413,10 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: + m_ObsoleteBakedOrCustomReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 135310787769117 - data2: 4539628424389459968 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -182,10 +427,10 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderingPathDefaultRealtimeReflectionFrameSettings: + m_ObsoleteRealtimeReflectionFrameSettingsMovedToDefaultSettings: bitDatas: data1: 140060864290589 - data2: 4539628424657895424 + data2: 4539628424657895448 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -196,176 +441,14 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineSettings: - supportShadowMask: 1 - supportSSR: 1 - supportSSRTransparent: 0 - supportSSAO: 1 - supportSubsurfaceScattering: 1 - sssSampleBudget: - m_Values: 140000002800000050000000 - m_SchemaId: - m_Id: With3Levels - supportVolumetrics: 1 - supportLightLayers: 0 - lightLayerName0: Light Layer default - lightLayerName1: Light Layer 1 - lightLayerName2: Light Layer 2 - lightLayerName3: Light Layer 3 - lightLayerName4: Light Layer 4 - lightLayerName5: Light Layer 5 - lightLayerName6: Light Layer 6 - lightLayerName7: Light Layer 7 - supportDistortion: 1 - supportTransparentBackface: 1 - supportTransparentDepthPrepass: 1 - supportTransparentDepthPostpass: 1 - colorBufferFormat: 74 - supportCustomPass: 1 - customBufferFormat: 12 - supportedLitShaderMode: 3 - supportDecals: 1 - msaaSampleCount: 2 - supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 - supportDitheringCrossFade: 0 - supportTerrainHole: 0 - supportProbeVolume: 0 - supportRayTracing: 0 - supportedRayTracingMode: 3 - probeVolumeSettings: - atlasWidth: 128 - atlasHeight: 128 - atlasDepth: 512 - atlasOctahedralDepthWidth: 2048 - atlasOctahedralDepthHeight: 2048 - lightLoopSettings: - cookieAtlasSize: 1024 - cookieFormat: 74 - pointCookieSize: 128 - cubeCookieTexArraySize: 4 - cookieAtlasLastValidMip: 0 - cookieTexArraySize: 16 - planarReflectionAtlasSize: 1024 - reflectionProbeCacheSize: 16 - reflectionCubemapSize: 256 - reflectionCacheCompressed: 0 - planarReflectionCacheCompressed: 0 - skyReflectionSize: 256 - skyLightingOverrideLayerMask: - serializedVersion: 2 - m_Bits: 0 - supportFabricConvolution: 0 - maxDirectionalLightsOnScreen: 16 - maxPunctualLightsOnScreen: 512 - maxAreaLightsOnScreen: 64 - maxEnvLightsOnScreen: 64 - maxDecalsOnScreen: 512 - maxPlanarReflectionOnScreen: 2 - hdShadowInitParams: - maxShadowRequests: 16 - directionalShadowsDepthBits: 32 - shadowFilteringQuality: 2 - punctualLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 - areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 - shadowResolutionDirectional: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionPunctual: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - shadowResolutionArea: - m_Values: 00010000000200000004000000080000 - m_SchemaId: - m_Id: With4Levels - maxDirectionalShadowMapResolution: 4096 - maxPunctualShadowMapResolution: 2048 - maxAreaShadowMapResolution: 2048 - supportScreenSpaceShadows: 0 - maxScreenSpaceShadowSlots: 4 - screenSpaceShadowBufferFormat: 48 - decalSettings: - drawDistance: 1000 - atlasWidth: 1024 - atlasHeight: 1024 - perChannelMask: 1 - postProcessSettings: - m_LutSize: 32 - lutFormat: 48 - bufferFormat: 74 - dynamicResolutionSettings: - enabled: 0 - maxPercentage: 100 - minPercentage: 100 - dynResType: 1 - upsampleFilter: 1 - forceResolution: 0 - forcedPercentage: 100 - lowresTransparentSettings: - enabled: 1 - checkerboardDepthBuffer: 1 - upsampleType: 1 - xrSettings: - singlePass: 1 - occlusionMesh: 1 - cameraJitter: 0 - postProcessQualitySettings: - NearBlurSampleCount: 030000000500000008000000 - NearBlurMaxRadius: - - 2 - - 4 - - 7 - FarBlurSampleCount: 04000000070000000e000000 - FarBlurMaxRadius: - - 5 - - 8 - - 13 - DoFResolution: 040000000200000001000000 - DoFHighQualityFiltering: 000101 - MotionBlurSampleCount: 04000000080000000c000000 - BloomRes: 040000000200000002000000 - BloomHighQualityFiltering: 000101 - ChromaticAberrationMaxSamples: 03000000060000000c000000 - lightSettings: - useContactShadow: - m_Values: 000001 - m_SchemaId: - m_Id: - maximumLODLevel: - m_Values: 000000000000000000000000 - m_SchemaId: - m_Id: With3Levels - lodBias: - m_Values: - - 1 - - 1 - - 1 - m_SchemaId: - m_Id: With3Levels - lightingQualitySettings: - AOStepCount: 040000000600000010000000 - AOFullRes: 000001 - AOMaximumRadiusPixels: 200000002800000050000000 - AOBilateralUpsample: 000101 - AODirectionCount: 010000000200000004000000 - ContactShadowSampleCount: 060000000a00000010000000 - SSRMaxRaySteps: 100000002000000040000000 - allowShaderVariantStripping: 1 - enableSRPBatcher: 1 - shaderVariantLogLevel: 0 - availableMaterialQualityLevels: -1 - m_DefaultMaterialQualityLevel: 4 - diffusionProfileSettings: {fileID: 0} - diffusionProfileSettingsList: + m_ObsoleteRenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} + m_ObsoleteRenderPipelineRayTracingResources: {fileID: 0} + m_ObsoleteBeforeTransparentCustomPostProcesses: [] + m_ObsoleteBeforePostProcessCustomPostProcesses: [] + m_ObsoleteAfterPostProcessCustomPostProcesses: [] + m_ObsoleteBeforeTAACustomPostProcesses: [] + m_ObsoleteShaderVariantLogLevel: 0 + m_ObsoleteLensAttenuation: 0 + m_ObsoleteDiffusionProfileSettingsList: - {fileID: 11400000, guid: 2384dbf2c1c420f45a792fbc315fbfb1, type: 2} - beforeTransparentCustomPostProcesses: [] - beforePostProcessCustomPostProcesses: [] - afterPostProcessCustomPostProcesses: [] diff --git a/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset b/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset index 5b71074f29c..6ac9e3adc61 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset +++ b/TestProjects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset @@ -12,12 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 781cc897cf8675041a751163b51f97dd, type: 3} m_Name: HDRenderPipelineGlobalSettings m_EditorClassIdentifier: - m_VolumeProfileDefault: {fileID: 0} + m_VolumeProfileDefault: {fileID: 11400000, guid: dc4052ec38b9ac147a469135b69baa9a, + type: 2} m_VolumeProfileLookDev: {fileID: 0} m_RenderingPathDefaultCameraFrameSettings: bitDatas: - data1: 72198262773251917 - data2: 13763000468760363032 + data1: 140651589009244 + data2: 4539628425463136280 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -30,8 +31,8 @@ MonoBehaviour: materialQuality: 0 m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings: bitDatas: - data1: 135310754214733 - data2: 4539628428684427288 + data1: 135310787769117 + data2: 4539628424389459992 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -44,8 +45,8 @@ MonoBehaviour: materialQuality: 0 m_RenderingPathDefaultRealtimeReflectionFrameSettings: bitDatas: - data1: 139923391782733 - data2: 13763000465807638544 + data1: 140060864290589 + data2: 4539628424657895448 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -56,7 +57,8 @@ MonoBehaviour: sssQualityLevel: 0 sssCustomSampleBudget: 20 materialQuality: 0 - m_RenderPipelineResources: {fileID: 0} + m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} m_RenderPipelineRayTracingResources: {fileID: 0} beforeTransparentCustomPostProcesses: [] beforePostProcessCustomPostProcesses: [] @@ -80,5 +82,20 @@ MonoBehaviour: decalLayerName7: shaderVariantLogLevel: 0 lensAttenuationMode: 0 - diffusionProfileSettingsList: [] + diffusionProfileSettingsList: + - {fileID: 11400000, guid: 2384dbf2c1c420f45a792fbc315fbfb1, type: 2} + - {fileID: 11400000, guid: 2b7005ba3a4d8474b8cdc34141ad766e, type: 2} + - {fileID: 11400000, guid: 404820c4cf36ad944862fa59c56064f0, type: 2} + - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} + - {fileID: 11400000, guid: 968a3176000311d42af174756ece7f4d, type: 2} + - {fileID: 11400000, guid: 64ca25f51b132ea4093511f7456ea220, type: 2} + - {fileID: 11400000, guid: fd29a6d903d5eae4d94833c2048bfd9d, type: 2} + - {fileID: 11400000, guid: 76f34276e6d50dc4bb0762b87af8931e, type: 2} + - {fileID: 11400000, guid: cd1cd5a7c0527844dbca2b7d562b9049, type: 2} + - {fileID: 11400000, guid: 385fff18b5c61754188b49a485ecb84a, type: 2} + - {fileID: 11400000, guid: d3dd41407c183554ca54bded902d4b7b, type: 2} + - {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2} + - {fileID: 11400000, guid: 8471a5bfcdb8fff4f9406cd8079b8554, type: 2} + - {fileID: 11400000, guid: fcb8f92518ca5d14bbd7e6751b28cd24, type: 2} + - {fileID: 11400000, guid: 768484f758b6f7b4daf53a7d9949f5af, type: 2} m_Version: 0 diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset index 9307dbae5cf..66cd62de454 100644 --- a/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset +++ b/TestProjects/HDRP_RuntimeTests/ProjectSettings/GraphicsSettings.asset @@ -67,4 +67,6 @@ GraphicsSettings: m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_SRPDefaultSettings: {} + m_SRPDefaultSettings: + UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: 737f58924e3402a4f8b124942a5fd7af, + type: 2}