Remove detail related properties.

7 年前 · 59ed7708
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/LayeredLit/TerrainLitUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/LayeredLit/TerrainLitUI.cs

                CoreUtils.SetKeyword(material, "_MASKMAP" + i, material.GetTexture(kMaskMap + i));

-                CoreUtils.SetKeyword(material, "_DETAIL_MAP" + i, material.GetTexture(kDetailMap + i));
-
                CoreUtils.SetKeyword(material, "_HEIGHTMAP" + i, material.GetTexture(kHeightMap + i));

                CoreUtils.SetKeyword(material, "_SUBSURFACE_MASK_MAP" + i, material.GetTexture(kSubsurfaceMaskMap + i));
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/TerrainLit.shader
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/TerrainLit.shader
    {
        [HideInInspector] _Control("Control (RGBA)", 2D) = "red" {}

+        [HideInInspector] _Splat0("Layer 0", 2D) = "white" {}
+        [HideInInspector] _Splat1("Layer 1", 2D) = "white" {}
+        [HideInInspector] _Splat2("Layer 2", 2D) = "white" {}
+        [HideInInspector] _Splat3("Layer 3", 2D) = "white" {}
+
        // TODO: route values from terrain layers. enable _DENSITY_MODE if any of these enabled.
        [HideInInspector] [ToggleUI] _OpacityAsDensity0("_OpacityAsDensity0", Float) = 0.0
        [HideInInspector] [ToggleUI] _OpacityAsDensity1("_OpacityAsDensity1", Float) = 0.0
        _BaseColor1("BaseColor1", Color) = (1, 1, 1, 1)
        _BaseColor2("BaseColor2", Color) = (1, 1, 1, 1)
        _BaseColor3("BaseColor3", Color) = (1, 1, 1, 1)
-
-        _BaseColorMap0("BaseColorMap0", 2D) = "white" {}
-        _BaseColorMap1("BaseColorMap1", 2D) = "white" {}
-        _BaseColorMap2("BaseColorMap2", 2D) = "white" {}
-        _BaseColorMap3("BaseColorMap3", 2D) = "white" {}

        _Metallic0("Metallic0", Range(0.0, 1.0)) = 0
        _Metallic1("Metallic1", Range(0.0, 1.0)) = 0
        _HeightPoMAmplitude2("Height Amplitude2", Float) = 2.0 // In centimeters
        _HeightPoMAmplitude3("Height Amplitude3", Float) = 2.0 // In centimeters

-        _DetailMap0("DetailMap0", 2D) = "black" {}
-        _DetailMap1("DetailMap1", 2D) = "black" {}
-        _DetailMap2("DetailMap2", 2D) = "black" {}
-        _DetailMap3("DetailMap3", 2D) = "black" {}
-
-        _DetailAlbedoScale0("_DetailAlbedoScale0", Range(0.0, 2.0)) = 1
-        _DetailAlbedoScale1("_DetailAlbedoScale1", Range(0.0, 2.0)) = 1
-        _DetailAlbedoScale2("_DetailAlbedoScale2", Range(0.0, 2.0)) = 1
-        _DetailAlbedoScale3("_DetailAlbedoScale3", Range(0.0, 2.0)) = 1
-
-        _DetailNormalScale0("_DetailNormalScale0", Range(0.0, 2.0)) = 1
-        _DetailNormalScale1("_DetailNormalScale1", Range(0.0, 2.0)) = 1
-        _DetailNormalScale2("_DetailNormalScale2", Range(0.0, 2.0)) = 1
-        _DetailNormalScale3("_DetailNormalScale3", Range(0.0, 2.0)) = 1
-
-        _DetailSmoothnessScale0("_DetailSmoothnessScale0", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale1("_DetailSmoothnessScale1", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(0.0, 2.0)) = 1
-
        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace0("NormalMap space", Float) = 0
        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace1("NormalMap space", Float) = 0
        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace2("NormalMap space", Float) = 0

        _HeightTransition("Height Transition", Range(0, 1.0)) = 0.0

-        [ToggleUI] _UseDensityMode("Use Density mode", Float) = 0.0
        [ToggleUI] _UseMainLayerInfluence("UseMainLayerInfluence", Float) = 0.0

        _InheritBaseNormal1("_InheritBaseNormal1", Range(0, 1.0)) = 0.0
        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase2("UV Set for base2", Float) = 0
        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase3("UV Set for base3", Float) = 0

-        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail0("UV Set for detail0", Float) = 0
-        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail1("UV Set for detail1", Float) = 0
-        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail2("UV Set for detail2", Float) = 0
-        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail3("UV Set for detail3", Float) = 0
-
-        [HideInInspector] _UVDetailsMappingMask0("_UVDetailsMappingMask0", Color) = (1, 0, 0, 0)
-        [HideInInspector] _UVDetailsMappingMask1("_UVDetailsMappingMask1", Color) = (1, 0, 0, 0)
-        [HideInInspector] _UVDetailsMappingMask2("_UVDetailsMappingMask2", Color) = (1, 0, 0, 0)
-        [HideInInspector] _UVDetailsMappingMask3("_UVDetailsMappingMask3", Color) = (1, 0, 0, 0)
-
-        [ToggleUI] _LinkDetailsWithBase0("LinkDetailsWithBase0", Float) = 1.0
-        [ToggleUI] _LinkDetailsWithBase1("LinkDetailsWithBase1", Float) = 1.0
-        [ToggleUI] _LinkDetailsWithBase2("LinkDetailsWithBase2", Float) = 1.0
-        [ToggleUI] _LinkDetailsWithBase3("LinkDetailsWithBase3", Float) = 1.0
-
        // HACK: GI Baking system relies on some properties existing in the shader ("_MainTex", "_Cutoff" and "_Color") for opacity handling, so we need to store our version of those parameters in the hard-coded name the GI baking system recognizes.
        _MainTex("Albedo", 2D) = "white" {}
        _Color("Color", Color) = (1,1,1,1)
    #pragma shader_feature _BENTNORMALMAP3
    #pragma shader_feature _EMISSIVE_COLOR_MAP
    #pragma shader_feature _ENABLESPECULAROCCLUSION
-    #pragma shader_feature _DETAIL_MAP0
-    #pragma shader_feature _DETAIL_MAP1
-    #pragma shader_feature _DETAIL_MAP2
-    #pragma shader_feature _DETAIL_MAP3
    #pragma shader_feature _HEIGHTMAP0
    #pragma shader_feature _HEIGHTMAP1
    #pragma shader_feature _HEIGHTMAP2
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/TerrainLitData.hlsl
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/TerrainLitData.hlsl

 #define LAYERS_HEIGHTMAP_ENABLE (defined(_HEIGHTMAP0) || defined(_HEIGHTMAP1) || (_LAYER_COUNT > 2 && defined(_HEIGHTMAP2)) || (_LAYER_COUNT > 3 && defined(_HEIGHTMAP3)))

+TEXTURE2D(_Splat0);
+float4 _Splat0_ST;
+TEXTURE2D(_Splat1);
+float4 _Splat1_ST;
+TEXTURE2D(_Splat2);
+float4 _Splat2_ST;
+TEXTURE2D(_Splat3);
+float4 _Splat3_ST;
+SAMPLER(sampler_Splat0);
+
 // Number of sampler are limited, we need to share sampler as much as possible with lit material
 // for this we put the constraint that the sampler are the same in a layered material for all textures of the same type
 // then we take the sampler matching the first textures use of this type
    #endif
 #endif

-#if defined(_DETAIL_MAP0)
-#define SAMPLER_DETAILMAP_IDX sampler_DetailMap0
-#elif defined(_DETAIL_MAP1)
-#define SAMPLER_DETAILMAP_IDX sampler_DetailMap1
-#elif defined(_DETAIL_MAP2)
-#define SAMPLER_DETAILMAP_IDX sampler_DetailMap2
-#else
-#define SAMPLER_DETAILMAP_IDX sampler_DetailMap3
-#endif
-
 #if defined(_MASKMAP0)
 #define SAMPLER_MASKMAP_IDX sampler_MaskMap0
 #elif defined(_MASKMAP1)
 // Define a helper macro

 #define ADD_ZERO_IDX(Name) Name##0
+#define _BaseColorMap _Splat
+#define sampler_BaseColorMap sampler_Splat

 // include LitDataInternal multiple time to define the variation of GetSurfaceData for each layer
 #define LAYER_INDEX 0
 #endif
 #ifdef _NORMALMAP_TANGENT_SPACE0
 #define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _DETAIL_MAP0
-#define _DETAIL_MAP_IDX
 #endif
 #ifdef _SUBSURFACE_MASK_MAP0
 #define _SUBSURFACE_MASK_MAP_IDX
 #undef ADD_IDX
 #undef _NORMALMAP_IDX
 #undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _DETAIL_MAP_IDX
 #undef _SUBSURFACE_MASK_MAP_IDX
 #undef _THICKNESSMAP_IDX
 #undef _MASKMAP_IDX
 #endif
 #ifdef _NORMALMAP_TANGENT_SPACE1
 #define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _DETAIL_MAP1
-#define _DETAIL_MAP_IDX
 #endif
 #ifdef _SUBSURFACE_MASK_MAP1
 #define _SUBSURFACE_MASK_MAP_IDX
 #undef ADD_IDX
 #undef _NORMALMAP_IDX
 #undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _DETAIL_MAP_IDX
 #undef _SUBSURFACE_MASK_MAP_IDX
 #undef _THICKNESSMAP_IDX
 #undef _MASKMAP_IDX
 #endif
 #ifdef _NORMALMAP_TANGENT_SPACE2
 #define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _DETAIL_MAP2
-#define _DETAIL_MAP_IDX
 #endif
 #ifdef _SUBSURFACE_MASK_MAP2
 #define _SUBSURFACE_MASK_MAP_IDX
 #undef ADD_IDX
 #undef _NORMALMAP_IDX
 #undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _DETAIL_MAP_IDX
 #undef _SUBSURFACE_MASK_MAP_IDX
 #undef _THICKNESSMAP_IDX
 #undef _MASKMAP_IDX
 #endif
 #ifdef _NORMALMAP_TANGENT_SPACE3
 #define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _DETAIL_MAP3
-#define _DETAIL_MAP_IDX
 #endif
 #ifdef _SUBSURFACE_MASK_MAP3
 #define _SUBSURFACE_MASK_MAP_IDX
 #undef ADD_IDX
 #undef _NORMALMAP_IDX
 #undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _DETAIL_MAP_IDX
 #undef _SUBSURFACE_MASK_MAP_IDX
 #undef _THICKNESSMAP_IDX
 #undef _MASKMAP_IDX
    // Note: Blend mask have its dedicated mapping and tiling.
    // To share code, we simply call the regular code from the main layer for it then save the result, then do regular call for all layers.
    ComputeLayerTexCoord0(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMaskBlendMask, _UVMappingMaskBlendMask,
-                            float2(1, 1), float2(0, 0), float2(0.0, 0.0), float2(0.0, 0.0), 1.0, false,
+                            float2(1, 1), float2(0, 0), float2(0, 0), float2(0, 0), 1.0, false,
                            positionWS, _TexWorldScaleBlendMask,
                            mappingType, layerTexCoord);

    mappingType = UV_MAPPING_TRIPLANAR;
 #endif

-    ComputeLayerTexCoord0(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask0, _UVDetailsMappingMask0,
-                            _BaseColorMap0_ST.xy, _BaseColorMap0_ST.zw, _DetailMap0_ST.xy, _DetailMap0_ST.zw, 1.0
+    ComputeLayerTexCoord0(  texCoord0, texCoord1, texCoord2, texCoord3, float4(1, 0, 0, 0), float4(0, 0, 0, 0),
+                            _Splat0_ST.xy, _Splat0_ST.zw, float2(0, 0), float2(0, 0), 1.0
-                            , _LinkDetailsWithBase0
+                            , 0
                            , positionWS, _TexWorldScale0,
                            mappingType, layerTexCoord);

 #elif defined(_LAYER_MAPPING_TRIPLANAR1)
    mappingType = UV_MAPPING_TRIPLANAR;
 #endif
-    ComputeLayerTexCoord1(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask1, _UVDetailsMappingMask1,
-                            _BaseColorMap1_ST.xy, _BaseColorMap1_ST.zw, _DetailMap1_ST.xy, _DetailMap1_ST.zw, tileObjectScale, _LinkDetailsWithBase1,
+    ComputeLayerTexCoord1(  texCoord0, texCoord1, texCoord2, texCoord3, float4(1, 0, 0, 0), float4(0, 0, 0, 0),
+                            _Splat1_ST.xy, _Splat1_ST.zw, float2(0, 0), float2(0, 0), tileObjectScale, 0,
                            positionWS, _TexWorldScale1,
                            mappingType, layerTexCoord);

 #elif defined(_LAYER_MAPPING_TRIPLANAR2)
    mappingType = UV_MAPPING_TRIPLANAR;
 #endif
-    ComputeLayerTexCoord2(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask2, _UVDetailsMappingMask2,
-                            _BaseColorMap2_ST.xy, _BaseColorMap2_ST.zw, _DetailMap2_ST.xy, _DetailMap2_ST.zw, tileObjectScale, _LinkDetailsWithBase2,
+    ComputeLayerTexCoord2(  texCoord0, texCoord1, texCoord2, texCoord3, float4(1, 0, 0, 0), float4(0, 0, 0, 0),
+                            _Splat2_ST.xy, _Splat2_ST.zw, float2(0, 0), float2(0, 0), tileObjectScale, 0,
                            positionWS, _TexWorldScale2,
                            mappingType, layerTexCoord);

 #elif defined(_LAYER_MAPPING_TRIPLANAR3)
    mappingType = UV_MAPPING_TRIPLANAR;
 #endif
-    ComputeLayerTexCoord3(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask3, _UVDetailsMappingMask3,
-                            _BaseColorMap3_ST.xy, _BaseColorMap3_ST.zw, _DetailMap3_ST.xy, _DetailMap3_ST.zw, tileObjectScale, _LinkDetailsWithBase3,
+    ComputeLayerTexCoord3(  texCoord0, texCoord1, texCoord2, texCoord3, float4(1, 0, 0, 0), float4(0, 0, 0, 0),
+                            _Splat3_ST.xy, _Splat3_ST.zw, float2(0, 0), float2(0, 0), tileObjectScale, 0,
                            positionWS, _TexWorldScale3,
                            mappingType, layerTexCoord);
 }

    // We want to calculate the mean color of the texture. For this we will sample a low mipmap
    float textureBias = 15.0; // Use maximum bias
-    float3 baseMeanColor0 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_BaseColorMap0, sampler_BaseColorMap0, layerTexCoord.base0, textureBias).rgb *_BaseColor0.rgb;
-    float3 baseMeanColor1 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_BaseColorMap1, sampler_BaseColorMap0, layerTexCoord.base1, textureBias).rgb *_BaseColor1.rgb;
-    float3 baseMeanColor2 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_BaseColorMap2, sampler_BaseColorMap0, layerTexCoord.base2, textureBias).rgb *_BaseColor2.rgb;
-    float3 baseMeanColor3 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_BaseColorMap3, sampler_BaseColorMap0, layerTexCoord.base3, textureBias).rgb *_BaseColor3.rgb;
+    float3 baseMeanColor0 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_Splat0, sampler_Splat0, layerTexCoord.base0, textureBias).rgb *_BaseColor0.rgb;
+    float3 baseMeanColor1 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_Splat1, sampler_Splat0, layerTexCoord.base1, textureBias).rgb *_BaseColor1.rgb;
+    float3 baseMeanColor2 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_Splat2, sampler_Splat0, layerTexCoord.base2, textureBias).rgb *_BaseColor2.rgb;
+    float3 baseMeanColor3 = SAMPLE_UVMAPPING_TEXTURE2D_BIAS(_Splat3, sampler_Splat0, layerTexCoord.base3, textureBias).rgb *_BaseColor3.rgb;

    float3 meanColor = BlendLayeredVector3(baseMeanColor0, baseMeanColor1, baseMeanColor2, baseMeanColor3, weights);