Skip to content

Commit 5fff27e

Browse files
sebastienlagardesebastienlagarde
committed
2 parents a7b3a4f + 36184e4 commit 5fff27e

25 files changed

+109
-78
lines changed

‎Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -128,37 +128,39 @@ void SynchronizeLayerProperties(int layerIndex)
128128

129129
if(!exclusionList.Contains(propertyName))
130130
{
131-
if (material.HasProperty(layerPropertyName))
132-
{
133-
ShaderUtil.ShaderPropertyType type = ShaderUtil.GetPropertyType(layerShader, i);
134-
switch (type)
135-
{
136-
case ShaderUtil.ShaderPropertyType.Color:
137-
{
138-
material.SetColor(layerPropertyName, layerMaterial.GetColor(propertyName));
139-
break;
140-
}
141-
case ShaderUtil.ShaderPropertyType.Float:
142-
case ShaderUtil.ShaderPropertyType.Range:
143-
{
144-
material.SetFloat(layerPropertyName, layerMaterial.GetFloat(propertyName));
145-
break;
146-
}
147-
case ShaderUtil.ShaderPropertyType.Vector:
148-
{
149-
material.SetVector(layerPropertyName, layerMaterial.GetVector(propertyName));
150-
break;
151-
}
152-
case ShaderUtil.ShaderPropertyType.TexEnv:
153-
{
154-
material.SetTexture(layerPropertyName, layerMaterial.GetTexture(propertyName));
155-
break;
156-
}
157-
}
158-
}
159-
}
160-
}
161-
}
131+
if (material.HasProperty(layerPropertyName))
132+
{
133+
ShaderUtil.ShaderPropertyType type = ShaderUtil.GetPropertyType(layerShader, i);
134+
switch (type)
135+
{
136+
case ShaderUtil.ShaderPropertyType.Color:
137+
{
138+
material.SetColor(layerPropertyName, layerMaterial.GetColor(propertyName));
139+
break;
140+
}
141+
case ShaderUtil.ShaderPropertyType.Float:
142+
case ShaderUtil.ShaderPropertyType.Range:
143+
{
144+
material.SetFloat(layerPropertyName, layerMaterial.GetFloat(propertyName));
145+
break;
146+
}
147+
case ShaderUtil.ShaderPropertyType.Vector:
148+
{
149+
material.SetVector(layerPropertyName, layerMaterial.GetVector(propertyName));
150+
break;
151+
}
152+
case ShaderUtil.ShaderPropertyType.TexEnv:
153+
{
154+
material.SetTexture(layerPropertyName, layerMaterial.GetTexture(propertyName));
155+
material.SetTextureOffset(layerPropertyName, layerMaterial.GetTextureOffset(propertyName));
156+
material.SetTextureScale(layerPropertyName, layerMaterial.GetTextureScale(propertyName));
157+
break;
158+
}
159+
}
160+
}
161+
}
162+
}
163+
}
162164
}
163165

164166
void InitializeMaterialLayers(AssetImporter materialImporter)
@@ -372,6 +374,7 @@ bool DoLayerGUI(AssetImporter materialImporter, int layerIndex)
372374
m_MaterialEditor.ShaderProperty(layerUVBase[layerIndex], styles.UVBaseText);
373375
if (EditorGUI.EndChangeCheck())
374376
{
377+
SynchronizeLayerProperties(layerIndex);
375378
result = true;
376379
}
377380
if (((LayerUVBaseMapping)layerUVBase[layerIndex].floatValue == LayerUVBaseMapping.Planar) ||
@@ -387,6 +390,7 @@ bool DoLayerGUI(AssetImporter materialImporter, int layerIndex)
387390
m_MaterialEditor.ShaderProperty(layerUVDetail[layerIndex], styles.UVDetailText);
388391
if (EditorGUI.EndChangeCheck())
389392
{
393+
SynchronizeLayerProperties(layerIndex);
390394
result = true;
391395
}
392396
}

‎Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Lit.shader

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Shader "HDRenderLoop/Lit"
1818
_NormalMap("NormalMap", 2D) = "bump" {}
1919

2020
_HeightMap("HeightMap", 2D) = "black" {}
21-
_HeightScale("Height Scale", Float) = 1
21+
_HeightScale("Height Scale", Float) = 0.01
2222
_HeightBias("Height Bias", Float) = 0
2323

2424
_TangentMap("TangentMap", 2D) = "bump" {}
@@ -29,7 +29,7 @@ Shader "HDRenderLoop/Lit"
2929
_DetailMask("DetailMask", 2D) = "white" {}
3030
_DetailAlbedoScale("_DetailAlbedoScale", Range(-2.0, 2.0)) = 1
3131
_DetailNormalScale("_DetailNormalScale", Range(0.0, 2.0)) = 1
32-
_DetailSmoothnessScale("_DetailSmoothnessScale", Range(-2.0, 2.0)) = 1
32+
_DetailSmoothnessScale("_DetailSmoothnessScale", Range(-2.0, 2.0)) = 0.01
3333
_DetailHeightScale("_DetailHeightScale", Range(-2.0, 2.0)) = 1
3434
_DetailAOScale("_DetailAOScale", Range(-2.0, 2.0)) = 1
3535

‎Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitSurfaceData.hlsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ float ADD_IDX(GetSurfaceData)(FragInput input, LayerTexCoord layerTexCoord, out
156156
#else
157157
surfaceData.perceptualSmoothness = 1.0;
158158
#endif
159-
surfaceData.perceptualSmoothness *= _Smoothness;
159+
surfaceData.perceptualSmoothness *= ADD_IDX(_Smoothness);
160160
#ifdef _DETAIL_MAP
161161
surfaceData.perceptualSmoothness *= LerpWhiteTo(2.0 * saturate(detailSmoothness * ADD_IDX(_DetailSmoothnessScale)), detailMask);
162162
#endif
@@ -169,7 +169,7 @@ float ADD_IDX(GetSurfaceData)(FragInput input, LayerTexCoord layerTexCoord, out
169169
surfaceData.metallic = 1.0;
170170
surfaceData.ambientOcclusion = 1.0;
171171
#endif
172-
surfaceData.metallic *= _Metallic;
172+
surfaceData.metallic *= ADD_IDX(_Metallic);
173173

174174
// This part of the code is not used in case of layered shader but we keep the same macro system for simplicity
175175
#if !defined(LAYERED_LIT_SHADER)
@@ -194,7 +194,7 @@ float ADD_IDX(GetSurfaceData)(FragInput input, LayerTexCoord layerTexCoord, out
194194
#else
195195
surfaceData.anisotropy = 1.0;
196196
#endif
197-
surfaceData.anisotropy *= _Anisotropy;
197+
surfaceData.anisotropy *= ADD_IDX(_Anisotropy);
198198

199199
surfaceData.specular = 0.04;
200200

‎Assets/TestScenes/HDTest/GlobalIlluminationTest.unity

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RenderSettings:
3737
m_ReflectionIntensity: 1
3838
m_CustomReflection: {fileID: 0}
3939
m_Sun: {fileID: 0}
40-
m_IndirectSpecularColor: {r: 0.5456174, g: 0.39782104, b: 0.24038851, a: 1}
40+
m_IndirectSpecularColor: {r: 0.6238628, g: 0.56322443, b: 0.5425187, a: 1}
4141
--- !u!157 &3
4242
LightmapSettings:
4343
m_ObjectHideFlags: 0
@@ -454,6 +454,7 @@ GameObject:
454454
m_Component:
455455
- component: {fileID: 565152815}
456456
- component: {fileID: 565152816}
457+
- component: {fileID: 565152817}
457458
m_Layer: 0
458459
m_Name: Spotlight
459460
m_TagString: Untagged
@@ -508,6 +509,25 @@ Light:
508509
m_BounceIntensity: 1
509510
m_ShadowRadius: 0
510511
m_ShadowAngle: 0
512+
--- !u!114 &565152817
513+
MonoBehaviour:
514+
m_ObjectHideFlags: 0
515+
m_PrefabParentObject: {fileID: 0}
516+
m_PrefabInternal: {fileID: 0}
517+
m_GameObject: {fileID: 565152814}
518+
m_Enabled: 1
519+
m_EditorHideFlags: 0
520+
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
521+
m_Name:
522+
m_EditorClassIdentifier:
523+
shadowResolution: 512
524+
shadowDimmer: 1
525+
affectDiffuse: 1
526+
affectSpecular: 1
527+
archetype: 0
528+
isDoubleSided: 0
529+
areaLightLength: 0
530+
areaLightWidth: 0
511531
--- !u!1 &841702834
512532
GameObject:
513533
m_ObjectHideFlags: 0
@@ -963,7 +983,7 @@ MonoBehaviour:
963983
shadowDimmer: 1
964984
affectDiffuse: 1
965985
affectSpecular: 1
966-
treatAsAreaLight: 0
986+
archetype: 0
967987
isDoubleSided: 0
968988
areaLightLength: 0
969989
areaLightWidth: 0
@@ -1379,7 +1399,7 @@ Transform:
13791399
m_PrefabInternal: {fileID: 0}
13801400
m_GameObject: {fileID: 1543726725}
13811401
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1382-
m_LocalPosition: {x: -6.33, y: 0.428, z: -5.0499997}
1402+
m_LocalPosition: {x: -6.33, y: 0.428, z: -4.84}
13831403
m_LocalScale: {x: 1.6119599, y: 1.6119599, z: 1.6119599}
13841404
m_Children: []
13851405
m_Father: {fileID: 1027688891}

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Detail_Checker.tga

0 Bytes
Binary file not shown.

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_BlendColor.mat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Material:
1212
_DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYER _LAYEREDLIT_4_LAYERS
1313
_LAYERMASKMAP _LAYER_MAPPING_PLANAR0 _LAYER_MAPPING_PLANAR_0 _LAYER_MAPPING_PLANAR_1
1414
_LAYER_MAPPING_PLANAR_2 _LAYER_MAPPING_PLANAR_3 _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
15-
_REQUIRE_UV3
1615
m_LightmapFlags: 1
1716
m_CustomRenderQueue: -1
1817
stringTagMap: {}
18+
disabledShaderPasses: []
1919
m_SavedProperties:
2020
serializedVersion: 3
2121
m_TexEnvs:
@@ -312,9 +312,9 @@ Material:
312312
- _Parallax: 0.02
313313
- _Smoothness: 0.5
314314
- _Smoothness0: 0.5
315-
- _Smoothness1: 0.5
315+
- _Smoothness1: 0.2
316316
- _Smoothness2: 0.5
317-
- _Smoothness3: 0.5
317+
- _Smoothness3: 0.4
318318
- _SmoothnessTextureChannel: 0
319319
- _SpecularHighlights: 1
320320
- _SrcBlend: 1

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_BlendColor.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.

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Planar.mat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Material:
1010
m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
1111
m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
1212
_DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
13-
_REQUIRE_UV3
1413
m_LightmapFlags: 1
1514
m_CustomRenderQueue: -1
1615
stringTagMap: {}
16+
disabledShaderPasses: []
1717
m_SavedProperties:
1818
serializedVersion: 3
1919
m_TexEnvs:
@@ -43,8 +43,8 @@ Material:
4343
m_Offset: {x: 0, y: 0}
4444
- _DetailMap0:
4545
m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
46-
m_Scale: {x: 1, y: 1}
47-
m_Offset: {x: 0, y: 0}
46+
m_Scale: {x: 2, y: 2}
47+
m_Offset: {x: 0.25, y: 0}
4848
- _DetailMap1:
4949
m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
5050
m_Scale: {x: 1, y: 1}

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Planar.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.

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Triplanar.mat

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ Material:
1010
m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
1111
m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
1212
_DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MAPPING_TRIPLANAR_0 _LAYER_MASK_VERTEX_COLOR
13-
_NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
13+
_NORMALMAP_TANGENT_SPACE
1414
m_LightmapFlags: 1
1515
m_CustomRenderQueue: -1
1616
stringTagMap: {}
17+
disabledShaderPasses: []
1718
m_SavedProperties:
1819
serializedVersion: 3
1920
m_TexEnvs:
@@ -43,8 +44,8 @@ Material:
4344
m_Offset: {x: 0, y: 0}
4445
- _DetailMap0:
4546
m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
46-
m_Scale: {x: 1, y: 1}
47-
m_Offset: {x: 0, y: 0}
47+
m_Scale: {x: 2, y: 2}
48+
m_Offset: {x: 0.25, y: 0}
4849
- _DetailMap1:
4950
m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
5051
m_Scale: {x: 1, y: 1}

0 commit comments

Comments
 (0)