Skip to content

Commit 5044c62

Browse files
JulienIgnace-UnityJulienIgnace-Unity
committed
Synchronized properly texture scale/offset for layeredLit.
1 parent 3901c52 commit 5044c62

13 files changed

+64
-58
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/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}

‎Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Triplanar.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_UV0.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_UV0.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_UV1.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_UV1.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_UV3.mat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Material:
88
m_PrefabInternal: {fileID: 0}
99
m_Name: Layered_Layer0_UV3
1010
m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
11-
m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
11+
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:
@@ -42,11 +42,11 @@ Material:
4242
m_Scale: {x: 1, y: 1}
4343
m_Offset: {x: 0, y: 0}
4444
- _DetailMap0:
45-
m_Texture: {fileID: 0}
46-
m_Scale: {x: 1, y: 1}
47-
m_Offset: {x: 0, y: 0}
45+
m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
46+
m_Scale: {x: 2, y: 2}
47+
m_Offset: {x: 0.25, y: 0}
4848
- _DetailMap1:
49-
m_Texture: {fileID: 0}
49+
m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
5050
m_Scale: {x: 1, y: 1}
5151
m_Offset: {x: 0, y: 0}
5252
- _DetailMap2:

0 commit comments

Comments
 (0)