Skip to content

Commit fddab1f

Browse files
Fixed vertex color mask for LayeredLit shader.
1 parent 6bd637f commit fddab1f

File tree

4 files changed

+211
-132
lines changed

4 files changed

+211
-132
lines changed

Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/LayeredLit.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Shader "HDRenderLoop/LayeredLit"
188188
#pragma shader_feature _EMISSIVE_COLOR_MAP
189189
#pragma shader_feature _HEIGHTMAP
190190
#pragma shader_feature _DETAIL_MAP
191-
#pragma shader_feature _LAYER_VERTEX_COLOR
191+
#pragma shader_feature _LAYER_MASK_VERTEX_COLOR
192192
#pragma shader_feature _ _LAYEREDLIT_3_LAYERS _LAYEREDLIT_4_LAYERS
193193

194194
#pragma multi_compile LIGHTMAP_OFF LIGHTMAP_ON

Assets/TestScenes/HDTest/LayeredLitTest.unity

Lines changed: 125 additions & 125 deletions
Large diffs are not rendered by default.

Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Layered/Layered.mat

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ Material:
88
m_PrefabInternal: {fileID: 0}
99
m_Name: Layered
1010
m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
11-
m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
12-
_EMISSION _LAYEREDLIT_4_LAYER _LAYEREDLIT_4_LAYERS _LAYERMASKMAP _LAYER_MAPPING_PLANAR0
13-
_LAYER_MAPPING_PLANAR_0 _LAYER_MAPPING_PLANAR_1 _LAYER_MAPPING_PLANAR_2 _LAYER_MAPPING_PLANAR_3
14-
_LAYER_MASK_VERTEX_COLOR _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
11+
m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
12+
_DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYER _LAYEREDLIT_4_LAYERS
13+
_LAYERMASKMAP _LAYER_MAPPING_PLANAR0 _LAYER_MAPPING_PLANAR_0 _LAYER_MAPPING_PLANAR_1
14+
_LAYER_MAPPING_PLANAR_2 _LAYER_MAPPING_PLANAR_3 _LAYER_MASK_VERTEX_COLOR _MASKMAP
15+
_NORMALMAP _NORMALMAP_TANGENT_SPACE
1516
m_LightmapFlags: 1
1617
m_CustomRenderQueue: -1
1718
stringTagMap: {}
@@ -50,10 +51,42 @@ Material:
5051
m_Texture: {fileID: 0}
5152
m_Scale: {x: 1, y: 1}
5253
m_Offset: {x: 0, y: 0}
54+
- _DetailMap0:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _DetailMap1:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
- _DetailMap2:
63+
m_Texture: {fileID: 0}
64+
m_Scale: {x: 1, y: 1}
65+
m_Offset: {x: 0, y: 0}
66+
- _DetailMap3:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
5370
- _DetailMask:
5471
m_Texture: {fileID: 0}
5572
m_Scale: {x: 1, y: 1}
5673
m_Offset: {x: 0, y: 0}
74+
- _DetailMask0:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
- _DetailMask1:
79+
m_Texture: {fileID: 0}
80+
m_Scale: {x: 1, y: 1}
81+
m_Offset: {x: 0, y: 0}
82+
- _DetailMask2:
83+
m_Texture: {fileID: 0}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- _DetailMask3:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
5790
- _DetailNormalMap:
5891
m_Texture: {fileID: 0}
5992
m_Scale: {x: 1, y: 1}
@@ -202,12 +235,33 @@ Material:
202235
- _BumpScale: 1
203236
- _CullMode: 2
204237
- _Cutoff: 0.5
238+
- _DetailAOScale0: 1
239+
- _DetailAOScale1: 1
240+
- _DetailAOScale2: 1
241+
- _DetailAOScale3: 1
242+
- _DetailAlbedoScale0: 1
243+
- _DetailAlbedoScale1: 1
244+
- _DetailAlbedoScale2: 1
245+
- _DetailAlbedoScale3: 1
246+
- _DetailHeightScale0: 1
247+
- _DetailHeightScale1: 1
248+
- _DetailHeightScale2: 1
249+
- _DetailHeightScale3: 1
250+
- _DetailMapMode: 0
205251
- _DetailNormalMapScale: 1
252+
- _DetailNormalScale0: 1
253+
- _DetailNormalScale1: 1
254+
- _DetailNormalScale2: 1
255+
- _DetailNormalScale3: 1
256+
- _DetailSmoothnessScale0: 1
257+
- _DetailSmoothnessScale1: 1
258+
- _DetailSmoothnessScale2: 1
259+
- _DetailSmoothnessScale3: 1
206260
- _DistortionDepthTest: 0
207261
- _DistortionOnly: 0
208262
- _DoubleSidedMode: 0
209263
- _DstBlend: 0
210-
- _EmissiveColorMode: 1
264+
- _EmissiveColorMode: 0
211265
- _EmissiveIntensity: 0
212266
- _EmissiveIntensity0: 0
213267
- _EmissiveIntensity1: 0
@@ -266,6 +320,25 @@ Material:
266320
- _SrcBlend: 1
267321
- _SubSurfaceRadius: 0
268322
- _SurfaceType: 0
323+
- _TexWorldScale: 1
324+
- _TexWorldScale0: 1
325+
- _TexWorldScale1: 1
326+
- _TexWorldScale2: 1
327+
- _TexWorldScale3: 1
328+
- _UVBase: 0
329+
- _UVBase0: 0
330+
- _UVBase1: 0
331+
- _UVBase2: 0
332+
- _UVBase3: 0
333+
- _UVDetail: 0
334+
- _UVDetail0: 0
335+
- _UVDetail1: 0
336+
- _UVDetail2: 0
337+
- _UVDetail3: 0
338+
- _UVDetailsMappingMask0: 0
339+
- _UVDetailsMappingMask1: 0
340+
- _UVDetailsMappingMask2: 0
341+
- _UVDetailsMappingMask3: 0
269342
- _UVSec: 0
270343
- _ZWrite: 1
271344
m_Colors:
@@ -281,3 +354,9 @@ Material:
281354
- _EmissiveColor1: {r: 0, g: 0, b: 0, a: 1}
282355
- _EmissiveColor2: {r: 0, g: 0, b: 0, a: 1}
283356
- _EmissiveColor3: {r: 0, g: 0, b: 0, a: 1}
357+
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
358+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
359+
- _UVMappingMask0: {r: 1, g: 0, b: 0, a: 0}
360+
- _UVMappingMask1: {r: 1, g: 0, b: 0, a: 0}
361+
- _UVMappingMask2: {r: 1, g: 0, b: 0, a: 0}
362+
- _UVMappingMask3: {r: 1, g: 0, b: 0, a: 0}

Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Layered/Layered.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)