Added remapping for distortion blur

7 年前 · 5cf7b5ab
--- a/SampleScenes/HDTest/DistortionTest.unity
+++ b/SampleScenes/HDTest/DistortionTest.unity
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 147174886}
  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &177079844
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 177079845}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &177079845
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 177079844}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 942108433}
+  - {fileID: 235481690}
+  m_Father: {fileID: 1885303981}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &235481689
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 235481690}
+  - component: {fileID: 235481692}
+  - component: {fileID: 235481691}
+  m_Layer: 0
+  m_Name: Glass Wall
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &235481690
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 235481689}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.5, y: -1.234, z: 3.0255}
+  m_LocalScale: {x: 6.6254535, y: 0.24481012, z: 1.9489517}
+  m_Children: []
+  m_Father: {fileID: 177079845}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &235481691
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 235481689}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 794a18d1b259ac9408ce57d9b3d5a3ca, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &235481692
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 235481689}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &278529592
 GameObject:
  m_ObjectHideFlags: 0
 Transform:
  m_PrefabParentObject: {fileID: 485392, guid: e641a36bceddbf24a89656e94dafb3e5, type: 2}
  m_PrefabInternal: {fileID: 937327556}
+--- !u!1 &942108432
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 942108433}
+  - component: {fileID: 942108435}
+  - component: {fileID: 942108434}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &942108433
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 942108432}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.5, y: -1.234, z: 4.5}
+  m_LocalScale: {x: 6.62545, y: 0.24481362, z: 1}
+  m_Children: []
+  m_Father: {fileID: 177079845}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &942108434
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 942108432}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &942108435
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 942108432}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &976682718
 GameObject:
  m_ObjectHideFlags: 0
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
-  randomSeed: 1560364404
+  randomSeed: 6554626
  InitialModule:
    serializedVersion: 3
    enabled: 1
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
-  randomSeed: -1645116155
+  randomSeed: 1544179800
  InitialModule:
    serializedVersion: 3
    enabled: 1
  - {fileID: 843855759}
  - {fileID: 1784930792}
  - {fileID: 1329538759}
+  - {fileID: 177079845}
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/SampleScenes/HDTest/GraphicTest/Common/CustomTexture/DistortionMap.shader
+++ b/SampleScenes/HDTest/GraphicTest/Common/CustomTexture/DistortionMap.shader
    {
        _Size("Size", Float) = 1
        _DistortionAmplitude("Distortion Amplitude", Float) = 1
-        _BlurMinAmplitude("Blur Min Amplitude", Range(0, 1)) = 0
-        _BlurMaxAmplitude("Blur Max Amplitude", Range(0, 1)) = 1
        _NoiseAmplitude("Noise Amplitude", Range(0, 1)) = 0.5
        _NoiseLacunarity("Noise Lacunarity", Range(0, 10)) = 2
    }

    float _Size;
    float _DistortionAmplitude;
-    float _BlurMinAmplitude;
-    float _BlurMaxAmplitude;
    float _NoiseAmplitude;
    float _NoiseLacunarity;

                float3 s = fbm2x3(p, _NoiseAmplitude, _NoiseLacunarity * (_SinTime.w * 0.1 + 1.0));

                float2 distortion = s.xy * _DistortionAmplitude;
-                float blur = s.z * (_BlurMaxAmplitude - _BlurMinAmplitude) + _BlurMinAmplitude;
+                float blur = s.z;

                return float4(distortion, blur, 1.0);
            }

                float2 distortion = sin(n3.xy * s) * _DistortionAmplitude;
                
-                float blur = (min(t, 1-t) * 2) * (_BlurMaxAmplitude - _BlurMinAmplitude) + _BlurMinAmplitude;
+                float blur = (min(t, 1-t) * 2);

                return float4(distortion, blur, 1.0);
            }

                float2 distortion = sdfVoronoiGrad(uv);

-                float blur = v * (_BlurMaxAmplitude - _BlurMinAmplitude) + _BlurMinAmplitude;
+                float blur = v;

                return float4(distortion, blur, 1.0);
            }
--- a/SampleScenes/HDTest/GraphicTest/Common/CustomTexture/DistortionMap_Voronoi.asset
+++ b/SampleScenes/HDTest/GraphicTest/Common/CustomTexture/DistortionMap_Voronoi.asset
  m_ForcedFallbackFormat: 4
  m_DownscaleFallback: 0
  m_Width: 1024
-  m_Height: 1024
+  m_Height: 512
  m_AntiAliasing: 1
  m_DepthFormat: 0
  m_ColorFormat: 11
    m_WrapW: 1
  m_Dimension: 2
  m_VolumeDepth: 1
-  m_Material: {fileID: 2100000, guid: 8ac64f99a42c6e64ebae3fc8bb262751, type: 2}
+  m_Material: {fileID: 2100000, guid: b555ea09a7c584740be0313f42a6c6af, type: 2}
-  m_InitMaterial: {fileID: 2100000, guid: 8ac64f99a42c6e64ebae3fc8bb262751, type: 2}
+  m_InitMaterial: {fileID: 2100000, guid: b555ea09a7c584740be0313f42a6c6af, type: 2}
  m_InitColor: {r: 1, g: 0, b: 0, a: 0}
  m_InitTexture: {fileID: 2800000, guid: 8abdc3adb95657847a5a8f760fdfc843, type: 3}
  m_UpdateMode: 1
--- a/SampleScenes/HDTest/GraphicTest/Common/CustomTexture/Mat_DistortionMap_Voronoi.mat
+++ b/SampleScenes/HDTest/GraphicTest/Common/CustomTexture/Mat_DistortionMap_Voronoi.mat
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  m_Name: Mat_DistortionMap_Ripple
+  m_Name: Mat_DistortionMap_Voronoi
  m_Shader: {fileID: 4800000, guid: 6a35625f46490314eb2456e4538d20ec, type: 3}
  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF
    _DISTORTIONDEPTHTEST_OFF _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _DOUBLESIDEDENABLE_OFF
    - _Anisotropy: 0
    - _BlendMode: 0
    - _BlurAmplitude: 1
-    - _BlurMaxAmplitude: 0.93
+    - _BlurMaxAmplitude: 1
    - _BlurMinAmplitude: 0
    - _CoatCoverage: 1
    - _CoatIOR: 0.5
    - _DetailNormalScale: 1
    - _DetailSmoothnessScale: 1
    - _DistorsionAmplitude: 52
-    - _DistortionAmplitude: 50.98
+    - _DistortionAmplitude: 5.54
    - _DistortionDepthTest: 0
    - _DistortionEnable: 0
    - _DistortionOnly: 0
    - _RefractionMode: 0
    - _ShiverDirectionality: 0.5
    - _ShiverDrag: 0.2
-    - _Size: 2.27
+    - _Size: 4.48
    - _Smoothness: 1
    - _SmoothnessRemapMax: 1
    - _SmoothnessRemapMin: 0
--- a/SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat
+++ b/SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat
  m_Name: Mat_Distorsion_Lit_2DNoise
  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
-    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTIONONLY_OFF
-    _DISTORTION_ON _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON
+    _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
    RenderType: Transparent
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - Forward
+  - DepthOnly
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBuffer
+  - GBufferWithPrepass
+  - TransparentDepthPrepass
+  - META
+  - SHADOWCASTER
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _DistortionBlendOp: 0
    - _DistortionBlurBlendMode: 0
    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
    - _DistortionBlurScale: 1
    - _DistortionBlurSrcBlend: 1
    - _DistortionDepthTest: 0
-    - _DistortionOnly: 0
-    - _DistortionScale: 1
+    - _DistortionOnly: 1
+    - _DistortionScale: 0.66
    - _DistortionSrcBlend: 1
    - _DistortionStencilRef: 4
    - _DoubleSidedEnable: 0
--- a/SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Only_Ripple.mat
+++ b/SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Only_Ripple.mat
    - _DistortionBlendOp: 21
    - _DistortionBlurBlendMode: 0
    - _DistortionBlurDstBlend: 1
-    - _DistortionBlurScale: 0.57
+    - _DistortionBlurRemapMax: 0.58173394
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 0.71
    - _DistortionBlurSrcBlend: 1
    - _DistortionDepthTest: 1
    - _DistortionDstBlend: 1
-    - _DistortionScale: 1.54
+    - _DistortionScale: 0.92
    - _DistortionSrcBlend: 1
    - _DistortionStencilRef: 4
    - _DoubleSidedEnable: 0
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
            public static GUIContent normalMapSpaceWarning = new GUIContent("Object space normal can't be use with triplanar mapping.");

            // Transparency
-            public static string TransparencyInputsText = "Transparency Inputs";
            public static string refractionModeText = "Refraction Mode";
            public static GUIContent refractionIORText = new GUIContent("Indice of refraction", "Indice of refraction");
            public static GUIContent refractionThicknessText = new GUIContent("Refraction Thickness", "Thickness for rough refraction");
                && refractionMode != null)
            {
                EditorGUILayout.Space();
-                EditorGUILayout.LabelField(Styles.TransparencyInputsText, EditorStyles.boldLabel);
+                EditorGUILayout.LabelField(StylesBaseUnlit.TransparencyInputsText, EditorStyles.boldLabel);
-                m_MaterialEditor.ShaderProperty(refractionMode, Styles.refractionModeText);
-                var mode = (Lit.RefractionMode)refractionMode.floatValue;
-                if (mode != Lit.RefractionMode.None)
+                if (refractionMode != null)
-                    m_MaterialEditor.ShaderProperty(ior, Styles.refractionIORText);
+                    m_MaterialEditor.ShaderProperty(refractionMode, Styles.refractionModeText);
+                    var mode = (Lit.RefractionMode)refractionMode.floatValue;
+                    if (mode != Lit.RefractionMode.None)
+                    {
+                        ++EditorGUI.indentLevel;
-                    if (mode != Lit.RefractionMode.ThinPlane)
-                    {
-                        if (thicknessMap.textureValue == null)
-                            m_MaterialEditor.ShaderProperty(thickness, Styles.refractionThicknessText);
-                        m_MaterialEditor.TexturePropertySingleLine(Styles.refractionThicknessMapText, thicknessMap);
+                        m_MaterialEditor.ShaderProperty(ior, Styles.refractionIORText);
+                        if (mode != Lit.RefractionMode.ThinPlane)
+                        {
+                            if (thicknessMap.textureValue == null)
+                                m_MaterialEditor.ShaderProperty(thickness, Styles.refractionThicknessText);
+                            m_MaterialEditor.TexturePropertySingleLine(Styles.refractionThicknessMapText, thicknessMap);
+
+                            ++EditorGUI.indentLevel;
+                            m_MaterialEditor.ShaderProperty(thicknessMultiplier, Styles.refractionThicknessMultiplierText);
+                            --EditorGUI.indentLevel;
+                        }
+
+                        m_MaterialEditor.ShaderProperty(transmittanceColor, Styles.transmittanceColorText);
-                        m_MaterialEditor.ShaderProperty(thicknessMultiplier, Styles.refractionThicknessMultiplierText);
+                        m_MaterialEditor.ShaderProperty(atDistance, Styles.atDistanceText);
+                        --EditorGUI.indentLevel;
+
-
-                    m_MaterialEditor.ShaderProperty(transmittanceColor, Styles.transmittanceColorText);
-                    ++EditorGUI.indentLevel;
-                    m_MaterialEditor.ShaderProperty(atDistance, Styles.atDistanceText);
-                    --EditorGUI.indentLevel;
+
+                DoDistortionInputsGUI();
+
                --EditorGUI.indentLevel;
            }
        }
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
        [HideInInspector] _DistortionBlurBlendMode("Distortion Blur Blend Mode", Int) = 0
        _DistortionScale("Distortion Scale", Float) = 1
        _DistortionBlurScale("Distortion Blur Scale", Float) = 1
+        _DistortionBlurRemapMin("DistortionBlurRemapMin", Float) = 0.0
+        _DistortionBlurRemapMax("DistortionBlurRemapMax", Float) = 1.0

        [ToggleOff]  _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0
        _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
 #if (SHADERPASS == SHADERPASS_DISTORTION)
    float3 distortion = SAMPLE_TEXTURE2D(_DistortionVectorMap, sampler_DistortionVectorMap, input.texCoord0).rgb;
    builtinData.distortion = distortion.rg * _DistortionScale;
-    builtinData.distortionBlur = clamp(distortion.b * _DistortionBlurScale, 0.0, 1.0);
+    builtinData.distortionBlur = clamp(distortion.b * _DistortionBlurScale, 0.0, 1.0) * (_DistortionBlurRemapMax - _DistortionBlurRemapMin) + _DistortionBlurRemapMin;
 #else
    builtinData.distortion = float2(0.0, 0.0);
    builtinData.distortionBlur = 0.0;
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
 float4 _DoubleSidedConstants;
 float _DistortionScale;
 float _DistortionBlurScale;
+float _DistortionBlurRemapMin;
+float _DistortionBlurRemapMax;

 float _PPDMaxSamples;
 float _PPDMinSamples;
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
    {
        protected static class StylesBaseUnlit
        {
+            public static string TransparencyInputsText = "Transparency Inputs";
            public static string optionText = "Surface options";
            public static string surfaceTypeText = "Surface Type";
            public static string blendModeText = "Blend Mode";
            public static GUIContent distortionBlendModeText = new GUIContent("Distortion Blend Mode", "Distortion Blend Mode"); 
            public static GUIContent distortionScaleText = new GUIContent("Distortion Scale", "Distortion Scale");
            public static GUIContent distortionBlurScaleText = new GUIContent("Distortion Blur Scale", "Distortion Blur Scale");
+            public static GUIContent distortionBlurRemappingText = new GUIContent("Distortion Blur Remapping", "Distortion Blur Remapping");

            public static string advancedText = "Advanced Options";
        }
        protected const string kDistortionScale = "_DistortionScale";
        protected MaterialProperty distortionBlurScale = null;
        protected const string kDistortionBlurScale = "_DistortionBlurScale";
+        protected MaterialProperty distortionBlurRemapMin = null;
+        protected const string kDistortionBlurRemapMin = "_DistortionBlurRemapMin";
+        protected MaterialProperty distortionBlurRemapMax = null;
+        protected const string kDistortionBlurRemapMax = "_DistortionBlurRemapMax";

        // See comment in LitProperties.hlsl
        const string kEmissionColor = "_EmissionColor";
            distortionBlendMode = FindProperty(kDistortionBlendMode, props, false);
            distortionScale = FindProperty(kDistortionScale, props, false);
            distortionBlurScale = FindProperty(kDistortionBlurScale, props, false);
+            distortionBlurRemapMin = FindProperty(kDistortionBlurRemapMin, props, false);
+            distortionBlurRemapMax = FindProperty(kDistortionBlurRemapMax, props, false);
        }

        void SurfaceTypePopup()
            if ((SurfaceType)surfaceType.floatValue == SurfaceType.Transparent)
            {
                BlendModePopup();
-
-                if (distortionEnable != null)
-                {
-                    m_MaterialEditor.ShaderProperty(distortionEnable, StylesBaseUnlit.distortionEnableText);
-
-                    if (distortionEnable.floatValue == 1.0f)
-                    {
-                        EditorGUI.indentLevel++;
-                        m_MaterialEditor.ShaderProperty(distortionBlendMode, StylesBaseUnlit.distortionBlendModeText);
-                        m_MaterialEditor.TexturePropertySingleLine(StylesBaseUnlit.distortionVectorMapText, distortionVectorMap);
-                        m_MaterialEditor.ShaderProperty(distortionOnly, StylesBaseUnlit.distortionOnlyText);
-                        m_MaterialEditor.ShaderProperty(distortionDepthTest, StylesBaseUnlit.distortionDepthTestText);
-                        m_MaterialEditor.ShaderProperty(distortionScale, StylesBaseUnlit.distortionScaleText);
-                        m_MaterialEditor.ShaderProperty(distortionBlurScale, StylesBaseUnlit.distortionBlurScaleText);
-                        EditorGUI.indentLevel--;
-                    }
-                }
            }
            m_MaterialEditor.ShaderProperty(alphaCutoffEnable, StylesBaseUnlit.alphaCutoffEnableText);
            if (alphaCutoffEnable.floatValue == 1.0f)
            m_MaterialEditor.ShaderProperty(doubleSidedEnable, StylesBaseUnlit.doubleSidedEnableText);

            EditorGUI.indentLevel--;
+        }
+
+        protected void DoDistortionInputsGUI()
+        {
+            if (distortionEnable != null)
+            {
+                m_MaterialEditor.ShaderProperty(distortionEnable, StylesBaseUnlit.distortionEnableText);
+
+                if (distortionEnable.floatValue == 1.0f)
+                {
+                    EditorGUI.indentLevel++;
+                    m_MaterialEditor.ShaderProperty(distortionBlendMode, StylesBaseUnlit.distortionBlendModeText);
+                    m_MaterialEditor.ShaderProperty(distortionOnly, StylesBaseUnlit.distortionOnlyText);
+                    m_MaterialEditor.ShaderProperty(distortionDepthTest, StylesBaseUnlit.distortionDepthTestText);
+
+                    EditorGUI.indentLevel++;
+                    m_MaterialEditor.TexturePropertySingleLine(StylesBaseUnlit.distortionVectorMapText, distortionVectorMap);
+                    EditorGUI.indentLevel++;
+                    m_MaterialEditor.ShaderProperty(distortionScale, StylesBaseUnlit.distortionScaleText);
+                    m_MaterialEditor.ShaderProperty(distortionBlurScale, StylesBaseUnlit.distortionBlurScaleText);
+                    float remapMin = distortionBlurRemapMin.floatValue;
+                    float remapMax = distortionBlurRemapMax.floatValue;
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.MinMaxSlider(StylesBaseUnlit.distortionBlurRemappingText, ref remapMin, ref remapMax, 0.0f, 1.0f);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        distortionBlurRemapMin.floatValue = remapMin;
+                        distortionBlurRemapMax.floatValue = remapMax;
+                    }
+                    EditorGUI.indentLevel--;
+
+                    EditorGUI.indentLevel--;
+
+                    EditorGUI.indentLevel--;
+                }
+            }
        }

        static public void SetKeyword(Material m, string keyword, bool state)
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/UnlitUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/UnlitUI.cs

            m_MaterialEditor.TexturePropertySingleLine(Styles.emissiveText, emissiveColorMap, emissiveColor);
            m_MaterialEditor.ShaderProperty(emissiveIntensity, Styles.emissiveIntensityText);
+
+            var surfaceTypeValue = (SurfaceType)surfaceType.floatValue;
+            if (surfaceTypeValue == SurfaceType.Transparent)
+            {
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField(StylesBaseUnlit.TransparencyInputsText, EditorStyles.boldLabel);
+                ++EditorGUI.indentLevel;
+
+                DoDistortionInputsGUI();
+
+                --EditorGUI.indentLevel;
+            }
        }

        protected override void VertexAnimationPropertiesGUI()
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader
        [HideInInspector] _DistortionBlurBlendMode("Distortion Blur Blend Mode", Int) = 0
        _DistortionScale("Distortion Scale", Float) = 1
        _DistortionBlurScale("Distortion Blur Scale", Float) = 1
+        _DistortionBlurRemapMin("DistortionBlurRemapMin", Float) = 0.0
+        _DistortionBlurRemapMax("DistortionBlurRemapMax", Float) = 1.0

        [ToggleOff]  _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0
        _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitData.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitData.hlsl
 #if (SHADERPASS == SHADERPASS_DISTORTION)
    float3 distortion = SAMPLE_TEXTURE2D(_DistortionVectorMap, sampler_DistortionVectorMap, input.texCoord0).rgb;
    builtinData.distortion = distortion.rg * _DistortionScale;
-    builtinData.distortionBlur = clamp(distortion.b * _DistortionBlurScale, 0.0, 1.0);
+    builtinData.distortionBlur = clamp(distortion.b * _DistortionBlurScale, 0.0, 1.0) * (_DistortionBlurRemapMax - _DistortionBlurRemapMin) + _DistortionBlurRemapMin;
 #else
    builtinData.distortion = float2(0.0, 0.0);
    builtinData.distortionBlur = 0.0;
--- a/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitProperties.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitProperties.hlsl
-float4  _Color;
+float4  _Color;
 TEXTURE2D(_ColorMap);
 SAMPLER2D(sampler_ColorMap);

 float _AlphaCutoff;
 float _DistortionScale;
 float _DistortionBlurScale;
+float _DistortionBlurRemapMin;
+float _DistortionBlurRemapMax;

 // Caution: C# code in BaseLitUI.cs call LightmapEmissionFlagsProperty() which assume that there is an existing "_EmissionColor"
 // value that exist to identify if the GI emission need to be enabled.