From 7c53adb2010ebb6db8b503c86a53cee84300ad5b Mon Sep 17 00:00:00 2001 From: Arttu Peltonen Date: Wed, 25 Aug 2021 11:28:37 +0300 Subject: [PATCH 1/2] Make shadow cascade debug colors match editor UI colors. - Fix apparent UI color typo. --- .../Editor/Lighting/Shadow/ShadowCascadeGUI.cs | 3 ++- com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl | 7 +++++++ .../Runtime/Lighting/LightLoop/LightLoop.hlsl | 8 ++++---- .../ShaderLibrary/Debug/Debugging3D.hlsl | 9 +++++---- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/Lighting/Shadow/ShadowCascadeGUI.cs b/com.unity.render-pipelines.core/Editor/Lighting/Shadow/ShadowCascadeGUI.cs index abca734f945..eb403e23890 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/Shadow/ShadowCascadeGUI.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/Shadow/ShadowCascadeGUI.cs @@ -16,10 +16,11 @@ public static class ShadowCascadeGUI private const float kSliderbarMargin = 2.0f; private const float kSliderbarHeight = 28.0f; + // Keep in sync with the ones in Debug.hlsl private static readonly Color[] kCascadeColors = { new Color(0.5f, 0.5f, 0.7f, 1.0f), - new Color(0.5f, 7, 0.5f, 1.0f), + new Color(0.5f, 0.7f, 0.5f, 1.0f), new Color(0.7f, 0.7f, 0.5f, 1.0f), new Color(0.7f, 0.5f, 0.5f, 1.0f), }; diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl index f489c6fbbed..38956dc132b 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl @@ -16,6 +16,13 @@ #define kDebugColorBrightRed float4(255.0 / 255.0, 67.0 / 255.0, 51.0 / 255.0, 1.0) // #FF4333 #define kDebugColorDarkRed float4(132.0 / 255.0, 10.0 / 255.0, 54.0 / 255.0, 1.0) // #840A36 +// Shadow cascade debug colors. Keep in sync with the ones in ShadowCascadeGUI.cs. +// Note: These colors are not 1:1 match to editor UI, in order to provide better contrast in the viewport. +#define kDebugColorShadowCascade0 float4(0.4, 0.4, 0.9, 1.0) +#define kDebugColorShadowCascade1 float4(0.4, 0.9, 0.4, 1.0) +#define kDebugColorShadowCascade2 float4(0.9, 0.9, 0.4, 1.0) +#define kDebugColorShadowCascade3 float4(0.9, 0.4, 0.4, 1.0) + // UX-verified colorblind-optimized "heat color gradient" static const float4 kDebugColorGradient[DEBUG_COLORS_COUNT] = { kDebugColorBlack, kDebugColorLightPurple, kDebugColorDeepBlue, kDebugColorSkyBlue, kDebugColorLightBlue, kDebugColorTeal, kDebugColorBrightGreen, kDebugColorBrightYellow, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl index d7dffad8c58..337106ac8d0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl @@ -116,10 +116,10 @@ void ApplyDebug(LightLoopContext context, PositionInputs posInput, BSDFData bsdf lightLoopOutput.specularLighting = float3(0.0, 0.0, 0.0); const float3 s_CascadeColors[] = { - float3(0.5, 0.5, 0.7), - float3(0.5, 0.7, 0.5), - float3(0.7, 0.7, 0.5), - float3(0.7, 0.5, 0.5), + kDebugColorShadowCascade0.rgb, + kDebugColorShadowCascade1.rgb, + kDebugColorShadowCascade2.rgb, + kDebugColorShadowCascade3.rgb, float3(1.0, 1.0, 1.0) }; diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging3D.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging3D.hlsl index 0b98386e473..a9df611b011 100644 --- a/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging3D.hlsl +++ b/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging3D.hlsl @@ -198,12 +198,13 @@ half3 CalculateDebugShadowCascadeColor(in InputData inputData) { float3 positionWS = inputData.positionWS; half cascadeIndex = ComputeCascadeIndex(positionWS); + switch (uint(cascadeIndex)) { - case 0: return kDebugColorBrightRed.rgb; - case 1: return kDebugColorDarkYellow.rgb; - case 2: return kDebugColorSkyBlue.rgb; - case 3: return kDebugColorBrightGreen.rgb; + case 0: return kDebugColorShadowCascade0.rgb; + case 1: return kDebugColorShadowCascade1.rgb; + case 2: return kDebugColorShadowCascade2.rgb; + case 3: return kDebugColorShadowCascade3.rgb; default: return kDebugColorBlack.rgb; } } From bbd8010dc61259576805b2821b15645bd0094d0f Mon Sep 17 00:00:00 2001 From: Arttu Peltonen Date: Fri, 27 Aug 2021 10:12:23 +0300 Subject: [PATCH 2/2] Update HDRP test images for 2315_Shadow_Cascades. --- .../Linear/LinuxEditor/Vulkan/None/2315_Shadow_Cascades.png | 4 ++-- .../Linear/OSXEditor/Metal/None/2315_Shadow_Cascades.png | 4 ++-- .../WindowsEditor/Direct3D11/None/2315_Shadow_Cascades.png | 4 ++-- .../WindowsEditor/Direct3D12/None/2315_Shadow_Cascades.png | 4 ++-- .../Linear/WindowsEditor/Vulkan/None/2315_Shadow_Cascades.png | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/2315_Shadow_Cascades.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/2315_Shadow_Cascades.png index 127dbb4feb4..8189006e97d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/2315_Shadow_Cascades.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/2315_Shadow_Cascades.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3f866f78bf5d234a9b9f202560b40711822229d23917aabf164b97e2f3e4de9 -size 53022 +oid sha256:659e93247fc8c7a0feb470e4663421caf3577d37e0f2b62d882a8347e82a608c +size 53646 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2315_Shadow_Cascades.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2315_Shadow_Cascades.png index 995b5bbbf21..8189006e97d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2315_Shadow_Cascades.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/2315_Shadow_Cascades.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ae48ded4339d7fa577f2c2cebb78ee32d740b4a98569992953c12dc08b6276 -size 52374 +oid sha256:659e93247fc8c7a0feb470e4663421caf3577d37e0f2b62d882a8347e82a608c +size 53646 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2315_Shadow_Cascades.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2315_Shadow_Cascades.png index 13dcb7fac97..8189006e97d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2315_Shadow_Cascades.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/2315_Shadow_Cascades.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b87846c6b8a4a1bfcc04688df7c252415e1186386e43a21dd44ab5345a91874e -size 52978 +oid sha256:659e93247fc8c7a0feb470e4663421caf3577d37e0f2b62d882a8347e82a608c +size 53646 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/2315_Shadow_Cascades.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/2315_Shadow_Cascades.png index b9fa500c899..8189006e97d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/2315_Shadow_Cascades.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/2315_Shadow_Cascades.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19cfbac0b21d06b1376b25d76fee37e8dda2f36ffd20d5abbe02b85bd5e9eae8 -size 52976 +oid sha256:659e93247fc8c7a0feb470e4663421caf3577d37e0f2b62d882a8347e82a608c +size 53646 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2315_Shadow_Cascades.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2315_Shadow_Cascades.png index 127dbb4feb4..8189006e97d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2315_Shadow_Cascades.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/2315_Shadow_Cascades.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3f866f78bf5d234a9b9f202560b40711822229d23917aabf164b97e2f3e4de9 -size 53022 +oid sha256:659e93247fc8c7a0feb470e4663421caf3577d37e0f2b62d882a8347e82a608c +size 53646