From 5e2b0b8049f27ac6d625c2f9335ae3f7abe9a34e Mon Sep 17 00:00:00 2001 From: FrancescoC-Unity Date: Thu, 22 Oct 2020 18:26:02 +0200 Subject: [PATCH 1/5] Renaming --- .../Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs | 2 +- .../Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs | 3 +-- .../Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs | 2 +- .../Editor/Wizard/HDWizard.Window.cs | 4 ++-- .../Runtime/RenderPipeline/Settings/FrameSettings.cs | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs index dc3290a3f0e..f36b289675c 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs @@ -104,7 +104,7 @@ protected override void CreatePropertyGUI() AddProperty(supportDecalsText, () => lightingData.receiveDecals, (newValue) => lightingData.receiveDecals = newValue); if (systemData.surfaceType == SurfaceType.Transparent) - AddProperty(receivesSSRTransparentText, () => lightingData.receiveSSRTransparent, (newValue) => lightingData.receiveSSRTransparent = newValue); + AddProperty(receivesSSRText, () => lightingData.receiveSSRTransparent, (newValue) => lightingData.receiveSSRTransparent = newValue); else AddProperty(receivesSSRText, () => lightingData.receiveSSR, (newValue) => lightingData.receiveSSR = newValue); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs index 39ea7e6284f..a0f617d5485 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs @@ -106,7 +106,6 @@ internal static class Styles // SSR public static GUIContent receivesSSRText = new GUIContent("Receive SSR", "When enabled, this Material can receive screen space reflections."); - public static GUIContent receivesSSRTransparentText = new GUIContent("Receive SSR Transparent", "When enabled, this Material can receive screen space reflections."); public static GUIContent opaqueCullModeText = new GUIContent("Cull Mode", "For opaque objects, change the cull mode of the object."); @@ -763,7 +762,7 @@ void DrawLitSurfaceOptions() { // Based on the surface type, display the right recieveSSR option if (surfaceTypeValue == SurfaceType.Transparent) - materialEditor.ShaderProperty(receivesSSRTransparent, Styles.receivesSSRTransparentText); + materialEditor.ShaderProperty(receivesSSRTransparent, Styles.receivesSSRText); else materialEditor.ShaderProperty(receivesSSR, Styles.receivesSSRText); } 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 be814317d7d..784aa9d9017 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 @@ -85,7 +85,7 @@ public class GeneralSection public static readonly GUIContent supportShadowMaskContent = EditorGUIUtility.TrTextContent("Shadowmask", "When enabled, HDRP allocates Shader variants and memory for processing shadow masks. This allows you to use shadow masks in your Unity Project."); public static readonly GUIContent supportSSRContent = EditorGUIUtility.TrTextContent("Screen Space Reflection", "When enabled, HDRP allocates memory for processing screen space reflection (SSR). This allows you to use SSR in your Unity Project."); public static readonly GUIContent planarResolutionTitle = EditorGUIUtility.TrTextContent("Planar Resolution Tiers"); - public static readonly GUIContent supportSSRTransparentContent = EditorGUIUtility.TrTextContent("Transparent Screen Space Reflection", "When enabled, HDRP executes additional steps to achieve screen space reflection (SSR) on transparent objects."); + public static readonly GUIContent supportSSRTransparentContent = EditorGUIUtility.TrTextContent("Transparent receive SSR", "When enabled, HDRP executes additional steps to achieve screen space reflection (SSR) on transparent objects."); public static readonly GUIContent supportSSAOContent = EditorGUIUtility.TrTextContent("Screen Space Ambient Occlusion", "When enabled, HDRP allocates memory for processing screen space ambient occlusion (SSAO). This allows you to use SSAO in your Unity Project."); public static readonly GUIContent supportSSGIContent = EditorGUIUtility.TrTextContent("Screen Space Global Illumination", "When enabled, HDRP allocates memory for processing screen space global illumination (SSGI). This allows you to use SSGI in your Unity Project."); public static readonly GUIContent supportedSSSContent = EditorGUIUtility.TrTextContent("Subsurface Scattering", "When enabled, HDRP allocates memory for processing subsurface scattering (SSS). This allows you to use SSS in your Unity Project."); 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 ab43e5fc1f5..262d9e8356b 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 @@ -143,8 +143,8 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT label: "Reflections", error: "Screen Space Reflections are disabled in the current HDRP asset. You will not be able to toggle ray traced reflections though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Screen Space Reflections", messageType: MessageType.Info); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( - label: "Transparent Reflections", - error: "Transparent Screen Space Reflections are disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Transparent Screen Space Reflections", messageType: MessageType.Info); + label: "Transparent receive SSR", + error: "The Transparent receive SSR option is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Transparent receive SSR ", messageType: MessageType.Info); public static readonly ConfigStyle dxrGI = new ConfigStyle( label: "Global Illumination", error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination though your volume components. You can enable the feature in the HDRP asset under Lighting -> Screen Space Global Illumination", messageType: MessageType.Info); 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 67c67dd793c..6c0dd1d0af8 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 @@ -247,8 +247,8 @@ public enum FrameSettingsField /// When enabled, Cameras using these Frame Settings calculate Screen Space Reflections. [FrameSettingsField(1, displayedName: "Screen Space Reflection", tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Reflections (Depends on \"Screen Space Reflection\" in current HDRP Asset).")] SSR = 23, - /// When enabled, Cameras using these Frame Settings calculate Transparent Screen Space Reflections. - [FrameSettingsField(1, displayedName: "On Transparent", customOrderInGroup: 25, positiveDependencies: new[] { SSR }, tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Reflections on transparent objects.")] + /// When enabled, Cameras using these Frame Settings calculate Screen Space Reflections on transparent objects. + [FrameSettingsField(1, displayedName: "Transparent receive SSR", customOrderInGroup: 25, positiveDependencies: new[] { SSR }, tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Reflections on transparent objects.")] TransparentSSR = 94, /// When enabled, Cameras using these Frame Settings calculate Screen Space Ambient Occlusion. [FrameSettingsField(1, displayedName: "Screen Space Ambient Occlusion", tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Ambient Occlusion (Depends on \"Screen Space Ambient Occlusion\" in current HDRP Asset).")] From 3f1ebdbcc20dddd5f2b924021d9ab806a6555af8 Mon Sep 17 00:00:00 2001 From: FrancescoC-Unity Date: Thu, 22 Oct 2020 18:26:08 +0200 Subject: [PATCH 2/5] 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 0149f6d0fc7..8a1879d7c4a 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -28,6 +28,7 @@ The version number for this package has increased due to a version update of a r ### Changed - Combined occlusion meshes into one to reduce draw calls and state changes with XR single-pass. +- Standardized naming for the option regarding Transparent objects being able to receive Screen Space Reflections. ## [10.1.0] - 2020-10-12 From c9813e6dfb867af97d4919a48d9807a62eb80cb7 Mon Sep 17 00:00:00 2001 From: FrancescoC-Unity Date: Fri, 23 Oct 2020 11:07:38 +0200 Subject: [PATCH 3/5] Fix typos --- .../Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs | 2 +- .../Editor/Wizard/HDWizard.Window.cs | 8 ++++---- .../Runtime/RenderPipeline/Settings/FrameSettings.cs | 2 +- 3 files changed, 6 insertions(+), 6 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 784aa9d9017..c7d413efef9 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 @@ -85,7 +85,7 @@ public class GeneralSection public static readonly GUIContent supportShadowMaskContent = EditorGUIUtility.TrTextContent("Shadowmask", "When enabled, HDRP allocates Shader variants and memory for processing shadow masks. This allows you to use shadow masks in your Unity Project."); public static readonly GUIContent supportSSRContent = EditorGUIUtility.TrTextContent("Screen Space Reflection", "When enabled, HDRP allocates memory for processing screen space reflection (SSR). This allows you to use SSR in your Unity Project."); public static readonly GUIContent planarResolutionTitle = EditorGUIUtility.TrTextContent("Planar Resolution Tiers"); - public static readonly GUIContent supportSSRTransparentContent = EditorGUIUtility.TrTextContent("Transparent receive SSR", "When enabled, HDRP executes additional steps to achieve screen space reflection (SSR) on transparent objects."); + public static readonly GUIContent supportSSRTransparentContent = EditorGUIUtility.TrTextContent("Transparents receive SSR", "When enabled, HDRP executes additional steps to achieve screen space reflection (SSR) on transparent objects."); public static readonly GUIContent supportSSAOContent = EditorGUIUtility.TrTextContent("Screen Space Ambient Occlusion", "When enabled, HDRP allocates memory for processing screen space ambient occlusion (SSAO). This allows you to use SSAO in your Unity Project."); public static readonly GUIContent supportSSGIContent = EditorGUIUtility.TrTextContent("Screen Space Global Illumination", "When enabled, HDRP allocates memory for processing screen space global illumination (SSGI). This allows you to use SSGI in your Unity Project."); public static readonly GUIContent supportedSSSContent = EditorGUIUtility.TrTextContent("Subsurface Scattering", "When enabled, HDRP allocates memory for processing subsurface scattering (SSS). This allows you to use SSS in your Unity Project."); 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 262d9e8356b..55f897962c0 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 @@ -141,13 +141,13 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT error: "Screen Space Shadows are disabled in the current HDRP asset. You will not be able to toggle ray traced shadows on the lights in your scene. You can enable the feature in the HDRP asset under Lighting -> Shadows -> Screen Space Shadows", messageType: MessageType.Info); public static readonly ConfigStyle dxrReflections = new ConfigStyle( label: "Reflections", - error: "Screen Space Reflections are disabled in the current HDRP asset. You will not be able to toggle ray traced reflections though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Screen Space Reflections", messageType: MessageType.Info); + error: "Screen Space Reflections are disabled in the current HDRP asset. You will not be able to toggle ray traced reflections through your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Screen Space Reflections", messageType: MessageType.Info); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( - label: "Transparent receive SSR", - error: "The Transparent receive SSR option is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Transparent receive SSR ", messageType: MessageType.Info); + label: "Transparents receive SSR", + error: "The Transparents receive SSR option is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects through your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Transparent receive SSR ", messageType: MessageType.Info); public static readonly ConfigStyle dxrGI = new ConfigStyle( label: "Global Illumination", - error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination though your volume components. You can enable the feature in the HDRP asset under Lighting -> Screen Space Global Illumination", messageType: MessageType.Info); + error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination through your volume components. You can enable the feature in the HDRP asset under Lighting -> 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/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs index 6c0dd1d0af8..1bd6711efe7 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 @@ -248,7 +248,7 @@ public enum FrameSettingsField [FrameSettingsField(1, displayedName: "Screen Space Reflection", tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Reflections (Depends on \"Screen Space Reflection\" in current HDRP Asset).")] SSR = 23, /// When enabled, Cameras using these Frame Settings calculate Screen Space Reflections on transparent objects. - [FrameSettingsField(1, displayedName: "Transparent receive SSR", customOrderInGroup: 25, positiveDependencies: new[] { SSR }, tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Reflections on transparent objects.")] + [FrameSettingsField(1, displayedName: "Transparents receive SSR", customOrderInGroup: 25, positiveDependencies: new[] { SSR }, tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Reflections on transparent objects.")] TransparentSSR = 94, /// When enabled, Cameras using these Frame Settings calculate Screen Space Ambient Occlusion. [FrameSettingsField(1, displayedName: "Screen Space Ambient Occlusion", tooltip: "When enabled, Cameras using these Frame Settings calculate Screen Space Ambient Occlusion (Depends on \"Screen Space Ambient Occlusion\" in current HDRP Asset).")] From 835c730c97015a9d0e4a90d9b9ad5f7c72d87aeb Mon Sep 17 00:00:00 2001 From: JulienIgnace-Unity Date: Fri, 23 Oct 2020 16:02:46 +0200 Subject: [PATCH 4/5] Update HDWizard.Window.cs typo --- .../Editor/Wizard/HDWizard.Window.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 c9c71057842..55a2e13a628 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 @@ -150,11 +150,11 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT 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); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( - label: "Transparent receive SSR (Asset)", - error: "Transparent receive SSR 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 Transparent receive SSR", messageType: MessageType.Warning); + label: "Transparents receive SSR (Asset)", + error: "Transparents receive SSR 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 Transparent receive SSR", messageType: MessageType.Warning); public static readonly ConfigStyle dxrTransparentReflectionsFS = new ConfigStyle( - label: "Transparent receive SSR (Default Camera Frame Setting)", - error: "Transparent receive SSR 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); + label: "Transparents receive SSR (Default Camera Frame Setting)", + error: "Transparents receive SSR 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); 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); From 678af0605cfc813cc2e8c386067e46b512fd9194 Mon Sep 17 00:00:00 2001 From: JulienIgnace-Unity Date: Fri, 23 Oct 2020 16:04:39 +0200 Subject: [PATCH 5/5] Update HDWizard.Window.cs typo 2 --- .../Editor/Wizard/HDWizard.Window.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 55a2e13a628..931f6f43f01 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 @@ -151,7 +151,7 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT 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); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( label: "Transparents receive SSR (Asset)", - error: "Transparents receive SSR 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 Transparent receive SSR", messageType: MessageType.Warning); + error: "Transparents receive SSR 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: "Transparents receive SSR (Default Camera Frame Setting)", error: "Transparents receive SSR 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);