diff --git a/TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset b/TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 00000000000..91791f36dfa --- /dev/null +++ b/TestProjects/SRP_SmokeTest/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 2 diff --git a/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat new file mode 100644 index 00000000000..984fb14e1e7 --- /dev/null +++ b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/LitInstanced.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LitInstanced + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat new file mode 100644 index 00000000000..4bebec739eb --- /dev/null +++ b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/SimpleLitInstanced.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SimpleLitInstanced + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat new file mode 100644 index 00000000000..2140cf26c2d --- /dev/null +++ b/TestProjects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Instanced/UnlitInstanced.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UnlitInstanced + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset b/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/ShaderGraph/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat new file mode 100644 index 00000000000..95f5531fa7f --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Lit.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2548804055186137174 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lit + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat new file mode 100644 index 00000000000..4c3b3fbceb9 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/SimpleLit.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2548804055186137174 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SimpleLit + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat new file mode 100644 index 00000000000..81f0b46b02d --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Materials/Unlit.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2548804055186137174 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unlit + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat new file mode 100644 index 00000000000..984fb14e1e7 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/LitInstanced.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LitInstanced + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat new file mode 100644 index 00000000000..4bebec739eb --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering/SimpleLitInstanced.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-646386980306967801 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SimpleLitInstanced + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 00000000000..91791f36dfa --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat index 0e39b649984..497be713fba 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/001_SimpleCube.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.97058815, g: 0.97058815, b: 0.97058815, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat index 938014eed21..b24c6a22175 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat index 03bcd57373a..81caf9eabc0 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_green.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &231368138080592282 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,4 +117,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat index c30e578a290..4eb4861cce1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Cornell Box_red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat index 69209758c40..069692214fd 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Gray Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat index 8ba64189d2c..62595123d00 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -13,7 +13,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -100,3 +100,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat index a47ffab1415..6e3e5eb099c 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/LW_Material.mat @@ -13,7 +13,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +108,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat index 8a3f866a1ad..99cef7f9f99 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/Red Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat index cfb2a9353af..2c4a24d27b0 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Materials/red_paint.mat @@ -13,7 +13,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat index 06b62ba0a69..a587867d969 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat index af372519243..56b8ae69150 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat index c3983a22b24..864d055253f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat index 73fb4efe541..b07e136176a 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat index 259eea2234a..b52f3a837b4 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,6 +99,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &214017953261494582 MonoBehaviour: m_ObjectHideFlags: 11 @@ -108,8 +109,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat index 18c576fdb5e..837b213acd1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat index a30232de434..9e3ce888d22 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip/002_CameraClip_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat index 134a987da21..f7ea805a601 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat index e84cf27eff1..5f622419ffb 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -86,6 +86,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &4901046320368005149 MonoBehaviour: m_ObjectHideFlags: 11 @@ -95,8 +96,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat index 928e6ee6bf5..f5238a1fa02 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1148464917096585531 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat index 3540628ed48..d873b66b9c1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_03_Specular.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat index 27320d3331e..65e96bae030 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_04_Normal.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.182} + m_BuildTextureStacks: [] --- !u!114 &5624294885565558276 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat index bddcd7c773f..fd417fe2723 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_05_Emission.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat index 4ffb6d3fcd9..381c1761081 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_06_All.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0.07386969, g: 0.11979348, b: 0.18867922, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6615595408240019016 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat index 6a1ab338587..691d7fb6147 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat index 1f4677df388..c3e98114a0c 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat index 4cce736cd04..fdbe0778ce8 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat index 40fa596d36f..1b65cb8019e 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat index f58a46b6c07..6d0964420f4 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2195807599642219274 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat index 81ccd1813ea..77654371cd5 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat index 623c39f1212..ab61aee5441 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4968206030522163895 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat index cee0324a62c..f7ae680926f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat index f1848e70734..11b1d75df5e 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat index dc59238c8bf..2cd36403e72 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat index ee5b3c2a6cc..862b207df4a 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat index 98f0126fe09..d508dd666ae 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat index d5040c7259d..db1a74680a9 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat index 45b8094d82a..acc49649a62 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4650732631101754418 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat index 8d0b067591e..f7b52aead4b 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5953474538914956738 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat index e11e629edb1..0bb90854e66 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat index 90d1f99e9ac..22b8f71b437 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat index 96624fcc788..95290c5063d 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4243513974690905907 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat index 63c93602da7..3cfb9f784f2 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7489248718814999123 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat index 5eb19fd4673..a0b4f6b5395 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat index a1aa020ed6a..aac487be62a 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4717768852030574692 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat index 6814289a7c1..e5cbf76bb1f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat index 759cd6b538b..87cebd73cef 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat index fdbdca454f2..266832b7167 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2378779546398475007 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat index 0f152b0f556..cea1ff24277 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked/CutoutBaked.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat new file mode 100644 index 00000000000..3535c05ddf9 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_PBR.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 013_xr_PBR + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8754966084146806372 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat new file mode 100644 index 00000000000..47865c3a26a --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/013_xr_PostFX/013_xr_Unlit.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2643792049807317967 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 013_xr_Unlit + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat index c9925f08c9c..5a5b2ad6c56 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/Smooth.mat @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat new file mode 100644 index 00000000000..3d163e7c001 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_Realtime_ReflectionProbe/Smooth_NormalMap.mat @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5159078685894839536 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Smooth_NormalMap + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 77bf3f5170a004139b83abf58a665c0e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 1 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat index c6c9bd861cf..6d4bf05c435 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth/unlit.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/UniversalGfxTestStereo/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat index fa01ec72324..6039b7d1520 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Array Element.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -111,3 +111,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat index 84a427b16e0..a4e45e6b56e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/BW Gradient.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -265,6 +265,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6722335431463595756 MonoBehaviour: m_ObjectHideFlags: 11 @@ -277,4 +278,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat index b5ba3f4413b..a2b3abeeafc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/CeramicTiles.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat index fce310bf93a..40d56ee5116 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Challenge-Brick.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2253018316625577987 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat index 938014eed21..b24c6a22175 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat index 03bcd57373a..67a623cee86 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_green.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &231368138080592282 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat index c30e578a290..4eb4861cce1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Cornell Box_red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat index 6e4e200c4e1..ecafbbfcc04 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat index d01413ecd0a..bb103aa0e8e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -121,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat index db05d819676..8e66051f444 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/IndustrialGlass.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1816354734817690348 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat index 62110d30939..14a7e7c47a0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LDpipe_targetTex.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat index 833c7599253..0970401e82d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,3 +99,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat index 80780ccb2fd..f84ae03bfa4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat new file mode 100644 index 00000000000..9a0d58b854c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseParticlesWithTexture + m_Shader: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.45641106, g: 0.45641106, b: 0.45641106, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..c1fd9611deb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27f4cb45080ed2445851bba0c20b55e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat index bff4d9b6bbb..8a97c3d0743 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -100,3 +100,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat index 55c68e449ee..d75ac91b50f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -127,3 +127,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat new file mode 100644 index 00000000000..38804f5c7e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseTransparentParticlesWithTexture + m_Shader: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..847d3f788df --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 221ebea45009ce347a01528f8fe6fbe8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat new file mode 100644 index 00000000000..b80d4249e77 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat @@ -0,0 +1,103 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: _SPECULAR_COLOR + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..de4d187f6f0 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a6b4f77725e5984c9df0e7a93a6f780 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat index 1d8d4c63eea..c5f36e53045 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -112,3 +112,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat new file mode 100644 index 00000000000..1f79dfa70f8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticles + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta new file mode 100644 index 00000000000..4f443643c08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticles.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: babb1d1fa23d919448bc937a8c7e09c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat new file mode 100644 index 00000000000..d1662866309 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat @@ -0,0 +1,134 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticlesTransparent + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta new file mode 100644 index 00000000000..015c52aac02 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparent.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3db8257d40ec1f645a466af67844deb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat new file mode 100644 index 00000000000..6991ce0f9ca --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat @@ -0,0 +1,134 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticlesTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..407d4a30b8a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 753e3d836e53e5749a43b9cb3bba372f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat new file mode 100644 index 00000000000..b752a555a69 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitParticlesWithTexture + m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..1fc4ab29c86 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fca13614753b1684fbf32090d233ac0a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat new file mode 100644 index 00000000000..025d9295611 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitTransparent + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta new file mode 100644 index 00000000000..77ec01c8ac4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparent.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de43acf2028025a4ab6647ceb80b67e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat new file mode 100644 index 00000000000..802e961ceca --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..b6d13835c48 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb1115deb18d6854590d9674aecfe7a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat new file mode 100644 index 00000000000..431db5f649f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseUnlitWithTexture + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta new file mode 100644 index 00000000000..bea12939b3c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90c53f0ca2ad9bc418ad948acf6ad972 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat new file mode 100644 index 00000000000..e8a00594861 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2083850580934482262 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_DiffuseWithTexture + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 0 + - _GlossyReflections: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 1 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta new file mode 100644 index 00000000000..efe3aff7370 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e83d54e4530e874d94c10c55171fc45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat index a47ffab1415..e588a24c5da 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_Material.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +107,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat index 34354c4d787..26635098a88 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -125,3 +125,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat new file mode 100644 index 00000000000..0fc88006963 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialParticlesWithTexture + m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..e33c9ab43a9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90af245dc1ff5df40bc9eb6dc7008dd7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat index 43fad5f8dab..cad5f6cb8cd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -108,3 +108,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat index b1b6c10c8a4..dae284e40bd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat new file mode 100644 index 00000000000..51ec8ba431a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialTransparentParticlesWithTexture + m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta new file mode 100644 index 00000000000..9cb427c2b4a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6b79eb193157de48a9f280be6b21a2f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat new file mode 100644 index 00000000000..775f7a3e19d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialTransparentWithTexture + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3050 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta new file mode 100644 index 00000000000..05a09b604bf --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12143dc7f86fad6439238d429a42ad6a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat new file mode 100644 index 00000000000..ad80eb4cc03 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat @@ -0,0 +1,110 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7983303803625555709 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LW_MaterialWithTexture + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ae15313a7f54946eaa9e4be92ab62112, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta new file mode 100644 index 00000000000..292d120236f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d560b316630b47d43ad9dd8de7c13314 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat index cae81f1fbc9..3b5a1d01fd3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Matte.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -95,6 +95,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1336921032651070000 MonoBehaviour: m_ObjectHideFlags: 11 @@ -104,8 +105,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat index f6c98d2dc17..93dd6ad8518 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/PW_WoodLog.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat index b4b89d5ce23..13d9c834d94 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4097738520251698563 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat index 646964989a0..7c817a455f7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Roofing.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat index 757f067c3e3..ac3ac689410 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/ShoreRockSand.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &329385301596340264 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat index da2ee3a76f3..f72bd82cf97 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/SyntheticColorChart.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -278,3 +278,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat index 6b7d394ce34..452ac7b3ad2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/UnlitColor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat index 2333408c7d4..b87c0cd5ea5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -278,3 +278,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat index dfebc63cebe..59ec46b67a5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -265,6 +265,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &317697389925408209 MonoBehaviour: m_ObjectHideFlags: 11 @@ -277,4 +278,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat index fbadc0489dd..d536d4d3856 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -265,6 +265,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &317697389925408209 MonoBehaviour: m_ObjectHideFlags: 11 @@ -277,4 +278,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat index e3e4b47e15a..ed31e8a66da 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/White_Mate.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -261,6 +261,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4402007217999009948 MonoBehaviour: m_ObjectHideFlags: 11 @@ -273,4 +274,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat index 34591767705..b81c6cddd36 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/bark.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat index 5e96cd828d8..da99c79544c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/herringbone_brick_floor.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat index b545604f908..1a72511f061 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_aluminium_directional.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat index 2057102592c..57c91adb48a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/metal_brushed_copper.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7345119257614298518 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat index cfb2a9353af..d1272ec618a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/red_paint.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat index 6491b1feb31..686c1bfc7c2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Materials/rocks_dirt_ground.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1263833708553139920 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat index 06b62ba0a69..a587867d969 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat index af372519243..56b8ae69150 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat index c3983a22b24..864d055253f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat index 73fb4efe541..b07e136176a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.38235295, g: 0.8722108, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat index 259eea2234a..b52f3a837b4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_Spec.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,6 +99,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &214017953261494582 MonoBehaviour: m_ObjectHideFlags: 11 @@ -108,8 +109,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat index 18c576fdb5e..837b213acd1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/CommonAssets/Meshes/PBR Spheres/PBRtest_met.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -113,3 +112,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..bfed954ef7b --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 0e10c4b85225e404d85ac0e823ba13c4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..8bff46f24ab --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 6843abefc4b734db2a73a875c9cede0a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..cb5bae25b8c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 893502eb5c8174218aee64a072c1700e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..38bf8870b98 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: ffb7ca7d7a8dff74b97724992a250c6b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/108_MoveCamera.png.meta index 5ceeb58df4a..dd98c582aa1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 13bf74666e304c54d8b3916ee9e06662 +======= +guid: a7a34602e83dc8f4b8a7c2195973f10f +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..5726fed8f16 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 0329a59cef021d641b86989dfbafc39e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta index 379ea8e401a..b229412e443 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_ClearRenderTexture.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 8571d0978163540c5bf189fed3c3abac +guid: 4e4c51cf7e96843de8df190069a15e19 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 10 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,9 +20,10 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,7 +38,7 @@ TextureImporter: wrapU: -1 wrapV: -1 wrapW: -1 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -57,14 +58,14 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - applyGammaDecoding: 0 + ignorePngGamma: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..64f337d2709 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19450d3c17b7d9610f4c49e8fa42923c7d09bdd245ebf17a833e6238689c63f1 +size 221990 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..5c83c62dd0b --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: b52bd8db5de4a3348a84737711422b11 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/108_MoveCamera.png.meta index 6ad9e38620a..dafc34cef18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 8be9e7474d2ab284e9c12cbe7016087b +======= +guid: 2a9acc3eb0e393948b9f56bb9d2591ba +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..ce0398ade5f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 963d6152bd5211b44b6df319b36aff13 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..889f478b624 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 6bde122f0bc06cf43932c4771af6a9f6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..bfde34b8f92 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 12d1fa1abd5e34d558ed53dd5459688c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/108_MoveCamera.png.meta index 57f1ba5f421..917ccaadabc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/108_MoveCamera.png.meta @@ -1,12 +1,20 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f9cbcb9d488de214ca50f96d0d393306 +======= +guid: d3960a634887a65448295035f82642fe +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 10 mipmaps: mipMapMode: 0 +<<<<<<< HEAD enableMipMap: 0 +======= + enableMipMap: 1 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +28,16 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 +<<<<<<< HEAD isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 +======= + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,7 +52,11 @@ TextureImporter: wrapU: -1 wrapV: -1 wrapW: -1 +<<<<<<< HEAD nPOTScale: 0 +======= + nPOTScale: 1 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -58,14 +76,21 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 +<<<<<<< HEAD textureCompression: 0 +======= + textureCompression: 1 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..98b12d685e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 88b9b1c01a1815d4d9f8650d1d88c15c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/108_MoveCamera.png.meta index f820fdf6e6b..570faddfce6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f94a91886ade92b42ac1700c7cd11a52 +======= +guid: 5a8b999e0a6b4bd43a65e4b32a8c6f38 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..d9ed9ad3557 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 266a12c04cd32d24c96d9d04e24f6a7c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/108_MoveCamera.png.meta index 02312daebd5..91bce3b4652 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e814060db4b45414c9894a0e777d0950 +======= +guid: 8662b048ef4ff6840997a61931a91eb5 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..2042ff807d1 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 1f7d3e8d25d7c8a439fcce6fadb4811c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..5af604247e8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 0f9d951cc92af7941a0550698a0a5a74 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/108_MoveCamera.png.meta index 499f8edf5c2..c7f2032b59d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 03033da20369c0d4788770712a2c8b7f +======= +guid: 8b70a025b73b2814bbe3be388fcdd1df +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..33464be73c5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 07b9b034bbe5d5f42ae881fa62a15237 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/108_MoveCamera.png.meta index e1b4e93eabc..97d2e5690cb 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 75db332c07db1fc408faf076f68ab933 +======= +guid: ffd5ac3485633e34e9012cc7507628a7 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..e525e09b1ca --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 4264f4bb52b9e8046a83fcffc9f758e3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta new file mode 100644 index 00000000000..665eb05664c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8985ddb931902e2499cd811a279cdf6c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..010c5f0fc7a --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: dce921b29c6ed374386c451517d2f86e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png new file mode 100644 index 00000000000..69ea99aee08 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea7f6291daf814f970b7f6e1067904d08a69c1b92acf0350e7239e0d4982ef3 +size 7106 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta new file mode 100644 index 00000000000..0466f64ec3e --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_ClearRenderTexture.png.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 99ff4abe0de5547a292066a90dc1c9dd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png new file mode 100644 index 00000000000..059e37289e6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ab4eac30c0aa63429ae5324a7f1ad857e5f75cba7064c39ee48b80dfacde6a +size 232450 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta new file mode 100644 index 00000000000..a6a69b769e8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/127_DynamicScaling_DOF.png.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 86e260cea4b4dd04e9b00db816ea0a92 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/108_MoveCamera.png.meta index 06d4648bdf5..6354602424c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5d56ea6588bdbee42a55a8293a4aba79 +======= +guid: 216a48a8fa8584c4b865b194e9eeb437 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..4603ec79b11 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: fb786d7a297974142a773592106d9556 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/108_MoveCamera.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/108_MoveCamera.png.meta index 0f7abdfdf04..d1bfeee24b6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/108_MoveCamera.png.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/108_MoveCamera.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b82e48c5eeac38a4d8b781f7717eb78c +======= +guid: 4a5c2ebc1f56fb24a806feefa58fed94 +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -57,7 +61,10 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 +<<<<<<< HEAD ignorePngGamma: 0 +======= +>>>>>>> adb3228d58... Bugfix 168283: URP shaders output incorrect alpha values (#5526) platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png new file mode 100644 index 00000000000..640b9f10ceb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300280927ab7c88f5ed4366e53f4b1c7826a66d08bf482782714d9a2974adeb2 +size 231606 diff --git a/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png.meta b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png.meta new file mode 100644 index 00000000000..2699ad08bc6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/109_URPShadersAlphaOutput.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 5175703891a9a2d449f8d03a05e662cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat index 87fbdfccbb0..497be713fba 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.97058815, g: 0.97058815, b: 0.97058815, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat index a30232de434..9e3ce888d22 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat index e1a304a6f18..a3568febb5c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat index a667ff5922d..65bb9e2a531 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat @@ -9,7 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,6 +116,7 @@ Material: - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &6474889523495581265 MonoBehaviour: m_ObjectHideFlags: 11 @@ -126,8 +126,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat index c469310cfc1..0f1dddb2409 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat index 667d7f404aa..df5f55bfb0b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat index 134a987da21..f7ea805a601 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat index 7bcea635ae8..7cabcae9284 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/006_LitShaderLightProbes/006_emission.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 2.37969, g: 2.37969, b: 2.37969, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1989026644308367711 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat index e84cf27eff1..5f622419ffb 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -86,6 +86,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &4901046320368005149 MonoBehaviour: m_ObjectHideFlags: 11 @@ -95,8 +96,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat index 928e6ee6bf5..f5238a1fa02 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1148464917096585531 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat index 3540628ed48..d873b66b9c1 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat index 27320d3331e..65e96bae030 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.182} + m_BuildTextureStacks: [] --- !u!114 &5624294885565558276 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat index bddcd7c773f..fd417fe2723 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -117,3 +116,4 @@ Material: - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat index 4ffb6d3fcd9..381c1761081 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -103,6 +103,7 @@ Material: - _EmissionColor: {r: 0.07386969, g: 0.11979348, b: 0.18867922, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6615595408240019016 MonoBehaviour: m_ObjectHideFlags: 11 @@ -112,8 +113,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat index 6a1ab338587..691d7fb6147 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat index 1f4677df388..c3e98114a0c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -116,3 +115,4 @@ Material: - _MainColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat index 164e0261826..57fe9caac2f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/mahogfloor-pbs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.98039216} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat index 4d8bb987790..5b36c750244 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/plasticpattern-pbs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 0.15686275} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat index 93218058c36..baae1dea4ce 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/008_AdditionalLights/redbricks-pbs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat index 4cce736cd04..fdbe0778ce8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 1.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat index 40fa596d36f..1b65cb8019e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 10.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat index f58a46b6c07..6d0964420f4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 11.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2195807599642219274 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat index 81ccd1813ea..77654371cd5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 12.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat index 623c39f1212..ab61aee5441 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 13.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4968206030522163895 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat index cee0324a62c..f7ae680926f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 14.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat index f1848e70734..11b1d75df5e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 15.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat index dc59238c8bf..2cd36403e72 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 16.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat index ee5b3c2a6cc..862b207df4a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 17.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat index 98f0126fe09..d508dd666ae 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 18.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat index d5040c7259d..db1a74680a9 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 19.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat index 45b8094d82a..acc49649a62 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 2.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4650732631101754418 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat index 8d0b067591e..f7b52aead4b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 20.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5953474538914956738 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat index e11e629edb1..0bb90854e66 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 21.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat index 90d1f99e9ac..22b8f71b437 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 3.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat index 96624fcc788..95290c5063d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 4.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4243513974690905907 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat index 63c93602da7..3cfb9f784f2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 5.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7489248718814999123 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat index 5eb19fd4673..a0b4f6b5395 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 6.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat index a1aa020ed6a..aac487be62a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 7.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4717768852030574692 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat index 6814289a7c1..e5cbf76bb1f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 8.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat index 759cd6b538b..87cebd73cef 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere 9.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -123,3 +122,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat index fdbdca454f2..266832b7167 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,6 +109,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MetallicSpecColor: {r: 0, g: 0.19999996, b: 0.19999996, a: 0.2} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2378779546398475007 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat index e50a0978eb1..77385086edd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 0, g: 0.08965492, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat index 13da5e2208a..759ebe06f2f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 0, g: 1, b: 0.17241383, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat index 7465fc02629..bce09e5dc3d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4448076703450405270 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat index e338a7635c4..b04cfc9e244 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 1, g: 0.9724138, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &3704495100615245849 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat index dc2ec0be0d6..2fc6afb041b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/014_CameraMulti_MiniMap/red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat index f1f9982eb92..267532050f8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -92,6 +92,7 @@ Material: - _Color: {r: 0, g: 0.13103485, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7520433432322078338 MonoBehaviour: m_ObjectHideFlags: 11 @@ -101,8 +102,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat index 1c37847ca60..4efef01527e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam/red.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,3 +105,4 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat index 0f152b0f556..cea1ff24277 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat index b07f3100a40..41c86a85d21 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7216049310591378603 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat index 0c122c66437..71c7fc4be11 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1290122637615856472 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat index db4f4b51e91..fe1850b05aa 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4313290387182987576 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat index d2101fd2802..b1fd6f40931 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 1.6624746, b: 1.0588236, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat index 0f6c96c9e84..5f80e65a281 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6469696794627641041 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat index 5ea82b308bd..f16f2dfad78 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat index b28871559f4..568f7736a4f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &391571561504505556 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat index 73b91ee48c5..eeea87a1f1e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1303672152882122231 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat index 96ba887a1c3..00520169558 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat index a4aa89ff07d..5cdb2ee4b17 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat index 026bffe00aa..09d84f16881 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6562641413808166721 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat index 7f79eb37d7f..3607940a155 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8366807865063943512 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat index 21c98cc1ff2..872a62530bd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Hole_mesh_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat index 321cb9b6129..f1db5b1091d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat index e8c3cd11d96..9cd4a196535 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7888827194497951473 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat index 09b167ac8db..995e013503e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 031_Roofing m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1033830812834852596 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat index adb097be072..90f3c8673c8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_Roofing_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7760970516850343107 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat index 4c843e1bd3b..34ce641f7e9 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 031_rocks_dirt_ground m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7615336496678759994 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat index 48a2e76114f..d68d64ba34a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_rocks_dirt_ground_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7517772181644380721 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat index 021e3deaa1b..8afcc3d2123 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat index cd9da1c3972..34884e33e2c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Hole_mesh_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat index 22e37d862b7..5590102704b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat index 6251dc7abfa..5e8a7a1a421 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_IndustrialGlass_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat index 410f6779b4b..673d89a6c19 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 032_Roofing m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1429075521766613134 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat index 9547541e84d..b4652928723 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_Roofing_gloss.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat index 1b7a4e221d6..67719c5a78b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground.mat @@ -9,11 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 032_rocks_dirt_ground m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP + _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4026353311599070343 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat index 1bae6b6789a..dec27ee5b89 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/032_Shader_GlossyEnvironmentColor/Materials/032_rocks_dirt_ground_gloss.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2931395071271964285 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat index cc72dcfd04a..7cd43019c18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &860780029588167018 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat index 0d37286a501..c6560c649c5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Hole_mesh_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1654177241399515973 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat index bca70e0e1ad..b6ad362b427 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat index b2becf7c2fb..e418fc26cc2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_IndustrialGlass_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1094090493879525788 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat index 1e97f700ec7..21355ee22e0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5005052061151087845 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat index ec5bb092a38..e927dedfa63 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_Roofing_highlights.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat index 213937d44f8..e2b7d8c8dc0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat index 44466179e47..c40a423c0de 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/033_Shader_HighlightsEnvironmentGradientSH/Materials/033_rocks_dirt_ground_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6208861177992375556 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat index c1a0a25841d..a1fa74a5e08 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat index 4aceb8b24d8..36a95352638 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -107,6 +107,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6656868026772058311 MonoBehaviour: m_ObjectHideFlags: 11 @@ -116,8 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat index 0840259c616..d3b18ea1981 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1713885918665958580 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat index 8fe9fb72371..bbd0af38415 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat index 17009413f86..35d1d6ca1b8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7541821551165332098 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat index 42f629093f4..1eefa700f0f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat @@ -108,6 +108,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.49803922} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8368340887267111576 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat index 44e1489fef4..4c012ac6161 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4390171450934998380 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat index f94ea06daa2..910f34c19c5 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8554096116055619990 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat index d633dd1514a..820197ecd81 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat index cff8b182e61..5b2962d879c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat index 12b833bd141..0950df92b80 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +107,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat index 56dbde66672..c38ee5be645 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -61,6 +60,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Mask0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -109,20 +124,28 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnableHeightBlend: 0 + - _EnableInstancedPerPixelNormal: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _HeightTransition: 0 - _Metallic: 0 - _Metallic0: 0 - _Metallic1: 0 - _Metallic2: 0 - _Metallic3: 0 - _Mode: 0 + - _NumLayersCount: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Smoothness0: 1 @@ -137,6 +160,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat index e11aa50e4d2..fdd42658059 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,3 +107,4 @@ Material: - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat index b565d86d0ac..505aabbd4ca 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -121,3 +120,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat index f6c241ddd5c..6af72ddb5e2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Cutout.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: @@ -91,6 +91,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -108,6 +109,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &2924155635232868104 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat index 077d1acc51f..50be5ae8016 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Fade.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -106,6 +105,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -123,3 +123,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat index 981cbd9e1c1..5a99dc879ed 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Cutout.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2500 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: @@ -105,6 +104,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -122,3 +122,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat index 6a7abdc80eb..6adbf9e36fc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Fade.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -106,6 +105,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.864 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -123,3 +123,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat index 1a21fac251d..28e69907fff 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Opaque.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -91,6 +91,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -108,6 +109,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.8965521, g: 2, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5130783043215099687 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat index a63bf230dda..666ac239d6f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/1. Lit - Shadow - Transparent.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -107,6 +106,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat index 588b9758597..bde6b6bcfc8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Additive.mat @@ -97,7 +97,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &7595174566679455379 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat index 4c84e39632c..d9778f14e28 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Fade.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,3 +122,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat index 99b77b33d21..da573b5823b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Camera Fading - Transparent.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &1119655945628308448 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat index cdcc3db0b14..47f2a43a440 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Modulate.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4158709294018868473 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat index 32a9b90cb0b..0ddb7e98a55 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Fade.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &6816448251434543432 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat index 3aaa50c3d7f..68570243d61 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Soft Particles - Transparent.mat @@ -110,6 +110,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &1651253450045955903 MonoBehaviour: m_ObjectHideFlags: 11 @@ -119,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat index b79d9f3cd6f..3292f22daa0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/2. Unlit - Subtractive.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,3 +122,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat index 034ab7196b4..30bf83a2241 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Additive.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4512445395021624393 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat index 9e882c938a7..8aa8e499653 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Color.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5018780211658097140 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat index d21e72c89fc..7c11aaa0b9b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Difference.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &3407332257721997827 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat index 65f50b82c2d..d79d25c722b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Multiply.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat index 72d8c47a453..f0da479ec08 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Overlay.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -122,3 +121,4 @@ Material: - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat index 79c7e39d8b5..4f5f2a957c4 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/3. Lit - Subtractive.mat @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &607434661605134500 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat index 458d83ad9a3..675511b8e4b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/4. Lit - Opaque.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -91,6 +91,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -109,6 +110,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.8965521, g: 2, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &6769237588484150783 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat index b56705734d1..4fcd2e30d0a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Lit - Two Sided.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -106,6 +105,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -126,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat index ffe9cb7fc2e..7a8db0d3ddd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/5. Unlit - Two Sided.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: @@ -108,6 +108,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &3441735669689148505 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat index 4bbd7620069..e958f07cb7e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Lit - Flip Book Simple - Fade.mat @@ -92,6 +92,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 0.806 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -109,6 +110,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5803572847513578147 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat index e5eb78ccd8b..c8bbcb83165 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/6. Unlit - Flip Book Blended - Fade.mat @@ -109,6 +109,7 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &7046824391579358999 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +119,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat index 22829fd2565..2d033b0f864 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/7. Lit - Transparent.mat @@ -92,6 +92,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 @@ -109,6 +110,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &6591741492913736838 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,8 +120,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat index e3729e19e9a..192982ad3b2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/8. Lit - Distortion.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,3 +122,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat index aaeeecec7b7..3ccdf3c0dae 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/037_Particles/Materials/Plane.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -98,6 +98,7 @@ Material: - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!114 &6319853491600825126 MonoBehaviour: m_ObjectHideFlags: 11 @@ -107,8 +108,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat index 9e32ec86b45..0aed0c34a28 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.33823532, g: 0.33823532, b: 0.33823532, a: 1} - _SpecularColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat index fa26848a26f..b6cfb1c256a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.21568628, g: 0.21568628, b: 0.21568628, a: 1} - _SpecularColor: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat index a2362854c68..3ae7efaf79a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +125,4 @@ Material: - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5} - _SpecColor: {r: 1, g: 1, b: 1, a: 0} - _SpecularColor: {r: 0.23921569, g: 0.23921569, b: 0.23921569, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat index 9e28205765c..648f60cbeda 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat index 362b8b1e57b..8ad8ee5b08b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4430986222480757237 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat index 4d817e597fc..ed27998f0a0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.41911763, g: 0.41911763, b: 0.41911763, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &987105362078538165 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat index 681416aaf0e..cebdeec3c7a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,6 +108,7 @@ Material: - _RimColor: {r: 0.2, g: 0.2, b: 0.2, a: 0} - _SpecColor: {r: 0.5960784, g: 0.5960784, b: 0.5960784, a: 1} - _SpecularColor: {r: 0.49264705, g: 0.49264705, b: 0.49264705, a: 1} + m_BuildTextureStacks: [] --- !u!114 &8571290814737199059 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat index 6b5b579b01a..3625907bb51 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat @@ -64,7 +64,7 @@ Material: - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - - _SrcBlend: 1 + - _SrcBlend: 5 - _Surface: 1 - _ZWrite: 0 m_Colors: @@ -76,6 +76,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608} + m_BuildTextureStacks: [] --- !u!114 &4710356110149861696 MonoBehaviour: m_ObjectHideFlags: 11 @@ -85,8 +86,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat index 3f3758afc91..d40700599b0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -114,3 +113,4 @@ Material: - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat index 085518b0571..bce267c639b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat index 9a79fb72f92..14c72941cc2 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat index 9ac01c0867b..4250c83673f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -134,3 +133,4 @@ Material: - _RimColor: {r: 0.19007264, g: 0.18425605, b: 0.35294116, a: 0} - _SpecColor: {r: 0.283737, g: 0.2845931, b: 0.30147058, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat index c7ac17bbf6d..1a3c7ea2000 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5984242074890382976 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat index 040a3b082c3..50d3ded3936 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.25, g: 0.21323529, b: 0.21323529, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat index 0428edc61ef..4b7c2709a27 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.20588237, g: 0.20588237, b: 0.20588237, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat index 5a866da23fa..5a38386b725 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.72794116, g: 0.72794116, b: 0.72794116, a: 1} - _SpecularColor: {r: 0.7882353, g: 0.7882353, b: 0.7882353, a: 1} + m_BuildTextureStacks: [] --- !u!114 &890071247540972588 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat index e01e030b503..85643b6bdc7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -126,3 +125,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5441177, g: 1, b: 0.5661258, a: 1} - _SpecularColor: {r: 0.74264705, g: 0.74264705, b: 0.74264705, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat index 4286e70959e..1035062e175 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,3 +119,4 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.49264705, g: 0.49264705, b: 0.49264705, a: 1} - _SpecularColor: {r: 0.2205882, g: 0.2205882, b: 0.2205882, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat index f57e6abb9d8..3af72a43acc 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -106,6 +106,7 @@ Material: - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.5661765, g: 0.5661765, b: 0.5661765, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4508372676771204003 MonoBehaviour: m_ObjectHideFlags: 11 @@ -115,8 +116,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat index 0da3909226b..73d36801c03 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -122,3 +121,4 @@ Material: - _RimColor: {r: 0.19007264, g: 0.18425605, b: 0.35294116, a: 0} - _SpecColor: {r: 0.283737, g: 0.2845931, b: 0.30147058, a: 1} - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat index a1863b924af..0149a31cd0f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -108,6 +108,7 @@ Material: - _RimColor: {r: 0.19007264, g: 0.18425605, b: 0.35294116, a: 0} - _SpecColor: {r: 0.283737, g: 0.2845931, b: 0.30147058, a: 1} - _SpecularColor: {r: 0.22794116, g: 0.22794116, b: 0.22794116, a: 1} + m_BuildTextureStacks: [] --- !u!114 &7720935081963420072 MonoBehaviour: m_ObjectHideFlags: 11 @@ -117,8 +118,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat index 75e48feb87b..3e2cb613eb8 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/040_UpgradeScene/Materials/New Material.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -95,6 +95,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2611509416719530959 MonoBehaviour: m_ObjectHideFlags: 11 @@ -104,8 +105,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat index 2f0edc1d4c4..c5bd7851d22 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,3 +108,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat index 53f162682c2..6a50a2d4db7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -95,6 +95,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &696773388402950971 MonoBehaviour: m_ObjectHideFlags: 11 @@ -104,8 +105,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat index c73f5999c39..510573e308d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -109,3 +108,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat index 4d4ebfa588c..bffa774def3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -110,3 +109,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset index 38869e48732..63da074ea18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/052_LWCallbacks/CallbackTestRenderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: - {fileID: 5740704530427184019} + m_RendererFeatureMap: postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} @@ -21,6 +22,7 @@ MonoBehaviour: screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -34,6 +36,7 @@ MonoBehaviour: passOperation: 0 failOperation: 0 zFailOperation: 0 + m_ShadowTransparentReceive: 1 --- !u!114 &5740704530427184019 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46,3 +49,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1922bf90be6ebc54da38e96e30f9339a, type: 3} m_Name: NewCameraCallbackTests m_EditorClassIdentifier: + m_Active: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat index ca7c6dbff8d..a65b926a14e 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red GI.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,3 +106,4 @@ Material: - _Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat index 71b4b71d2ed..f2b15fa7604 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader red no GI.mat @@ -9,11 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -107,3 +106,4 @@ Material: - _Color: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat index 0b4cdbca2cf..6a2b360cf42 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/053_UnlitShader/unlit shader white GI.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -94,6 +94,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4878811381003065862 MonoBehaviour: m_ObjectHideFlags: 11 @@ -103,8 +104,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset index f8181a349f7..27a62933bf3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset @@ -13,40 +13,47 @@ MonoBehaviour: m_Name: 2D_Renderer_Shader_Compatibility m_EditorClassIdentifier: m_RendererFeatures: [] + m_RendererFeatureMap: + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 1, z: 0} m_HDREmulationScale: 1 m_LightBlendStyles: - - enabled: 1 - name: Default + - name: Default maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 - - enabled: 0 - name: Blend Style 1 + - name: Blend Style 1 maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 - - enabled: 0 - name: Blend Style 2 + - name: Blend Style 2 maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 - - enabled: 0 - name: Blend Style 3 + - name: Blend Style 3 maskTextureChannel: 0 renderTextureScale: 1 blendMode: 1 customBlendFactors: multiplicative: 0 additive: 0 + m_UseDepthStencilBuffer: 1 + m_DefaultMaterialType: 0 + m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, + type: 2} m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3} @@ -54,7 +61,7 @@ MonoBehaviour: m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3} m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - m_ShadowShader: {fileID: 0} m_ShadowGroupShader: {fileID: 4800000, guid: d33b6d70b14697547ad0dc2d4debb009, type: 3} - m_RemoveSelfShadowShader: {fileID: 0} + m_RemoveSelfShadowShader: {fileID: 4800000, guid: 02e071f10b6a15d4d87dac88ce529302, + type: 3} m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat index 413bc94840f..49f3258942a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/BakedLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat index 0b6aa5cb2ba..643ed1088d0 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,3 +89,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat index bf145a30905..7a22c649e53 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultSimple.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,3 +93,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat index 04947f4fcbf..858692faf2f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/DefaultUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -90,3 +90,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat index c4aadbcf8d1..ef34a797587 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/Materials/GreenRock01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat index f32894d806a..fd573b69b0b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesLit.mat @@ -94,6 +94,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &5998429150232711907 MonoBehaviour: m_ObjectHideFlags: 11 @@ -106,4 +107,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat index 1151aa85670..1929090317a 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesSimple.mat @@ -95,6 +95,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &4963088423575533316 MonoBehaviour: m_ObjectHideFlags: 11 @@ -107,4 +108,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat index 91857fe2d7f..1ce27aca5b7 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/069_2D_Forward_Shader_Compatibility/Materials/ParticlesUnlit.mat @@ -94,6 +94,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] --- !u!114 &1528233709893421592 MonoBehaviour: m_ObjectHideFlags: 11 @@ -106,4 +107,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader index 290673f88ef..47b5ccfb4ca 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader @@ -9,10 +9,10 @@ Shader "Test/CopyToViewport" Cull Off ZWrite Off ZTest Always Pass - { - HLSLPROGRAM - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" - + { + HLSLPROGRAM + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" + TEXTURE2D(_SrcTex); SAMPLER(sampler_SrcTex); @@ -27,10 +27,10 @@ Shader "Test/CopyToViewport" float2 uv : TEXCOORD0; float4 vertex : SV_POSITION; }; - + Varyings vert(Attributes input) { - Varyings output = (Varyings)0; + Varyings output = (Varyings)0; VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); output.vertex = vertexInput.positionCS; output.uv = input.uv; @@ -39,14 +39,14 @@ Shader "Test/CopyToViewport" half4 frag(Varyings input) : SV_Target { - half4 col = SAMPLE_TEXTURE2D(_SrcTex, sampler_SrcTex, input.uv); + half4 col = SAMPLE_TEXTURE2D(_SrcTex, sampler_SrcTex, input.uv); return col; } #pragma vertex vert #pragma fragment frag - ENDHLSL + ENDHLSL } } } diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader index 450c89afc6b..65557f5acf6 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader @@ -9,10 +9,10 @@ Shader "Test/OutputColorsToMRTs" Cull Off ZWrite Off ZTest Always Pass - { - HLSLPROGRAM - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" - + { + HLSLPROGRAM + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" + struct Attributes { float4 positionOS : POSITION; @@ -22,16 +22,16 @@ Shader "Test/OutputColorsToMRTs" { float4 vertex : SV_POSITION; }; - + struct FragmentOutput { half4 dest0 : SV_Target0; half4 dest1 : SV_Target1; - }; + }; Varyings vert(Attributes input) { - Varyings output = (Varyings)0; + Varyings output = (Varyings)0; VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); output.vertex = vertexInput.positionCS; return output; @@ -40,15 +40,15 @@ Shader "Test/OutputColorsToMRTs" FragmentOutput frag(Varyings input) : SV_Target { FragmentOutput o; - o.dest0 = half4(0, 0, 1, 1); - o.dest1 = half4(1, 0, 0, 1); + o.dest0 = half4(0, 0, 1, 1); + o.dest1 = half4(1, 0, 0, 1); return o; } #pragma vertex vert #pragma fragment frag - ENDHLSL + ENDHLSL } } } diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta new file mode 100644 index 00000000000..b3245dad2c2 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db06ef4aa71943c4ba059b51c1d723f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity new file mode 100644 index 00000000000..4a6485eb337 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity @@ -0,0 +1,1795 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 0 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &165573366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 165573367} + - component: {fileID: 165573370} + - component: {fileID: 165573369} + - component: {fileID: 165573368} + m_Layer: 5 + m_Name: RenderTexturePlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &165573367 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_LocalRotation: {x: -0.03084362, y: -0.7064338, z: 0.7064338, w: 0.03084362} + m_LocalPosition: {x: 0, y: 0, z: 43.96} + m_LocalScale: {x: 1, y: 1, z: 0.5} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 95, y: 90, z: 270} +--- !u!64 &165573368 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &165573369 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 284cb6459f58c464083648fcf20ddeec, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &165573370 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165573366} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &440291764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 440291767} + - component: {fileID: 440291766} + - component: {fileID: 440291765} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &440291765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440291764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &440291766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440291764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &440291767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440291764} + 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: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &464618202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464618206} + - component: {fileID: 464618205} + - component: {fileID: 464618204} + - component: {fileID: 464618203} + m_Layer: 0 + m_Name: ParticlesSimpleLit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &464618203 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &464618204 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 221ebea45009ce347a01528f8fe6fbe8, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &464618205 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &464618206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464618202} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 15, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &517307315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 517307319} + - component: {fileID: 517307318} + - component: {fileID: 517307317} + - component: {fileID: 517307316} + m_Layer: 0 + m_Name: Lit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &517307316 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &517307317 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 12143dc7f86fad6439238d429a42ad6a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &517307318 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &517307319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 517307315} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &565277321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565277325} + - component: {fileID: 565277324} + - component: {fileID: 565277323} + - component: {fileID: 565277322} + m_Layer: 0 + m_Name: Lit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &565277322 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &565277323 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d560b316630b47d43ad9dd8de7c13314, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &565277324 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &565277325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565277321} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -15, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &570913713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 570913715} + - component: {fileID: 570913714} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &570913714 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570913713} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 2 + m_Range: 35.3 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &570913715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570913713} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &571769776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 571769777} + - component: {fileID: 571769780} + - component: {fileID: 571769779} + - component: {fileID: 571769778} + m_Layer: 0 + m_Name: ParticlesUnlit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &571769777 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 5, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &571769778 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &571769779 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fca13614753b1684fbf32090d233ac0a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &571769780 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571769776} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &580896800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580896804} + - component: {fileID: 580896803} + - component: {fileID: 580896802} + - component: {fileID: 580896801} + m_Layer: 0 + m_Name: SimpleLit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &580896801 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &580896802 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7e83d54e4530e874d94c10c55171fc45, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &580896803 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &580896804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580896800} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &689935916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689935920} + - component: {fileID: 689935919} + - component: {fileID: 689935918} + - component: {fileID: 689935917} + m_Layer: 0 + m_Name: ParticlesSimpleLit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &689935917 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &689935918 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 27f4cb45080ed2445851bba0c20b55e5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &689935919 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &689935920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689935916} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 5, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &767940025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 767940029} + - component: {fileID: 767940028} + - component: {fileID: 767940027} + - component: {fileID: 767940026} + m_Layer: 0 + m_Name: SimpleLit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &767940026 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &767940027 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8a6b4f77725e5984c9df0e7a93a6f780, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &767940028 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &767940029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767940025} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 15, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &981139002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981139006} + - component: {fileID: 981139005} + - component: {fileID: 981139004} + - component: {fileID: 981139003} + m_Layer: 0 + m_Name: CameraToRenderTexture + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &981139003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &981139004 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_Enabled: 1 +--- !u!20 &981139005 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 1, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 15 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 1 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &981139006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981139002} + 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: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1035718256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1035718260} + - component: {fileID: 1035718259} + - component: {fileID: 1035718258} + - component: {fileID: 1035718257} + m_Layer: 0 + m_Name: ParticlesLit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1035718257 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1035718258 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 90af245dc1ff5df40bc9eb6dc7008dd7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &1035718259 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1035718260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035718256} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -15, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &1142655687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1142655690} + - component: {fileID: 1142655689} + - component: {fileID: 1142655688} + - component: {fileID: 1142655691} + - component: {fileID: 1142655692} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1142655688 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 +--- !u!20 &1142655689 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.5 + far clip plane: 12000 + field of view: 15 + orthographic: 1 + orthographic size: 3.1 + m_Depth: 1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1142655690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + 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: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1142655691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!114 &1142655692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142655687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 640 + TargetHeight: 360 + PerPixelCorrectnessThreshold: 0.001 + AverageCorrectnessThreshold: 0.005 + UseHDR: 0 + WaitFrames: 5 +--- !u!1 &1216562597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1216562598} + - component: {fileID: 1216562601} + - component: {fileID: 1216562600} + - component: {fileID: 1216562599} + m_Layer: 0 + m_Name: Unlit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1216562598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -5, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &1216562599 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1216562600 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fb1115deb18d6854590d9674aecfe7a9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &1216562601 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216562597} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1544163734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544163735} + - component: {fileID: 1544163738} + - component: {fileID: 1544163737} + - component: {fileID: 1544163736} + m_Layer: 0 + m_Name: Unlit-Opaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1544163735 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -15, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &1544163736 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1544163737 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 90c53f0ca2ad9bc418ad948acf6ad972, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &1544163738 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544163734} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1710776198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1710776202} + - component: {fileID: 1710776201} + - component: {fileID: 1710776200} + - component: {fileID: 1710776199} + m_Layer: 0 + m_Name: ParticlesLit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1710776199 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1710776200 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d6b79eb193157de48a9f280be6b21a2f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &1710776201 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1710776202 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710776198} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: -5, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!1 &1751120201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1751120202} + m_Layer: 0 + m_Name: ObjectPlanes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1751120202 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751120201} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1544163735} + - {fileID: 1216562598} + - {fileID: 571769777} + - {fileID: 2050878688} + - {fileID: 565277325} + - {fileID: 517307319} + - {fileID: 580896804} + - {fileID: 767940029} + - {fileID: 1035718260} + - {fileID: 1710776202} + - {fileID: 689935920} + - {fileID: 464618206} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2050878687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2050878688} + - component: {fileID: 2050878691} + - component: {fileID: 2050878690} + - component: {fileID: 2050878689} + m_Layer: 0 + m_Name: ParticlesUnlit-Transparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2050878688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} + m_LocalPosition: {x: 15, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1751120202} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} +--- !u!64 &2050878689 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2050878690 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 753e3d836e53e5749a43b9cb3bba372f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 &2050878691 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050878687} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta new file mode 100644 index 00000000000..e751c850cb4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0a89803a0d2352245a452c202f9a67d1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat new file mode 100644 index 00000000000..c7a2aebe292 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2837999492683578002 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 109_CameraTargetTexture + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8400000, guid: f9e2386cd01180c4a8f1727769227300, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.199 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossinessSource: 1 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ReflectionSource: 0 + - _SampleGI: 0 + - _Shininess: 0.5 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} + m_BuildTextureStacks: [] +--- !u!114 &6474889523495581265 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta new file mode 100644 index 00000000000..4038b3d513d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 284cb6459f58c464083648fcf20ddeec +timeCreated: 1493306832 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture new file mode 100644 index 00000000000..fec455cf2fa --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 109_URPShadersAlphaOutputRenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 1280 + m_Height: 720 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta similarity index 78% rename from TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta rename to TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta index c3556396573..40376944a18 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a9044a455553948649a2fc8ab48924e8 +guid: f9e2386cd01180c4a8f1727769227300 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat index e74fea7faf9..ccabeac1e93 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat index 7387d5c926b..a89fc94fb74 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat index 24bebcf2bcb..baf206beb9b 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat index 9f0ec1473fb..ea02191497d 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -76,6 +76,7 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] --- !u!114 &2549847662200077430 MonoBehaviour: m_ObjectHideFlags: 11 @@ -88,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat index c6c9bd861cf..6d4bf05c435 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepth/unlit.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -89,4 +89,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting deleted file mode 100644 index ba61743ed45..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_SampleDepthSettings.lighting +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 126_SampleDepthSettings - serializedVersion: 2 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_TextureCompression: 1 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 - m_PVREnvironmentMIS: 0 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting deleted file mode 100644 index a882e00357f..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!850595691 &4890085278179872738 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 127_ClearRenderTextureSettings - serializedVersion: 2 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_TextureCompression: 1 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 - m_PVREnvironmentMIS: 1 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta new file mode 100644 index 00000000000..20789c773cf --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fd32c3006339c14f885dff42eb360c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity new file mode 100644 index 00000000000..b8432dc6880 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity @@ -0,0 +1,736 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000000, guid: 977e4515d6b86054e957cb447ec7419a, + type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: ccc71b1229998a844a0cb431f90a2b67, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &131927988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 406555286357417593, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_Name + value: ENV + objectReference: {fileID: 0} + - target: {fileID: 406555286357417593, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286357417594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286369488657, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286420914205, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286482225736, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286517727058, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286531528639, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286585198031, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286651556416, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286656332909, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286793263395, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286803363846, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286828207137, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286829790726, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286843191160, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286870497407, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286915550901, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286930118864, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555286942275642, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287015210621, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287022671624, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287060983945, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287131895727, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287138334754, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287163165996, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287211997004, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287280814547, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287305899989, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287321396956, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287362919030, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287381448375, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287385598932, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287388888290, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287395552840, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287471676073, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287478225023, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287527405171, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287638453531, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287816160547, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287878996711, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555287879935821, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288039026065, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288178953099, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288268076440, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288282578227, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288312568594, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288323522207, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288404637940, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288425260372, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288442045027, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406555288444772179, guid: 2209787132fab4b269a07531ec1e19fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2209787132fab4b269a07531ec1e19fe, type: 3} +--- !u!1 &1649979578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649979580} + - component: {fileID: 1649979579} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1649979579 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649979578} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 4 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1649979580 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649979578} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1987455871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1987455873} + - component: {fileID: 1987455872} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1987455872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987455871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: db24ed36a74e0af49a6e696caae9f6fc, type: 2} +--- !u!4 &1987455873 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987455871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.13150191, y: -0.061539173, z: -0.06098199} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1993633423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1993633427} + - component: {fileID: 1993633426} + - component: {fileID: 1993633425} + - component: {fileID: 1993633424} + - component: {fileID: 1993633428} + - component: {fileID: 1993633429} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1993633424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1993633425 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 +--- !u!20 &1993633426 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 37 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 1 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1993633427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_LocalRotation: {x: -0.295975, y: -0.29656836, z: 0.097230785, w: -0.9027692} + m_LocalPosition: {x: -5.488637, y: 6.5752234, z: -7.3347425} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1993633428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8fe3a3cc5fb7ae49abbc22ba3a69695, type: 3} + m_Name: + m_EditorClassIdentifier: + m_camera: {fileID: 1993633426} + scale: 0.5 +--- !u!114 &1993633429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993633423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 640 + TargetHeight: 480 + PerPixelCorrectnessThreshold: 0.001 + AverageCorrectnessThreshold: 0.005 + UseHDR: 0 + WaitFrames: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta new file mode 100644 index 00000000000..e024773fca6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 069f595c511c463418479db2f730eec1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs new file mode 100644 index 00000000000..aa1fad6c8a8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs @@ -0,0 +1,30 @@ +using System; +using UnityEngine; + +[ExecuteAlways] +public class DynamicResSetter : MonoBehaviour +{ + + public Camera m_camera; + + [Range(0.01f, 1f)] + public float scale = 1; + + private void OnValidate() + { + UpdateCamera(); + } + + void Update() + { + UpdateCamera(); + } + + void UpdateCamera() + { + if (m_camera) + { + ScalableBufferManager.ResizeBuffers(scale, scale); + } + } +} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta new file mode 100644 index 00000000000..5300eb5a3a4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/DynamicResSetter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f8fe3a3cc5fb7ae49abbc22ba3a69695 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset new file mode 100644 index 00000000000..f090d07b650 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 4353722282301515956} +--- !u!114 &4353722282301515956 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + min: 0 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + min: 0 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + min: 0.5 + max: 1.5 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 10.35 + min: 0.1 + aperture: + m_OverrideState: 1 + m_Value: 2.4 + min: 1 + max: 32 + focalLength: + m_OverrideState: 1 + m_Value: 300 + min: 1 + max: 300 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + min: 3 + max: 9 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 + min: -180 + max: 180 + constantSize: + m_OverrideState: 0 + m_Value: 0 + maxBlurSize: + m_OverrideState: 0 + m_Value: 2 + min: 0.25 + max: 4 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta similarity index 78% rename from TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta rename to TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta index 4df36150178..7f47645e88c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_ClearRenderTextureSettings.lighting.meta +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/Global Volume Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 286db413b8f862a4596678a63e43e1ea +guid: db24ed36a74e0af49a6e696caae9f6fc NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr new file mode 100644 index 00000000000..f38e702271b Binary files /dev/null and b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr differ diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000000..351c7d3c4b5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/127_DynamicScaling_DOF/ReflectionProbe-0.exr.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: fb3ea07c74ccd9746bc22e6d0f45b6bc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta new file mode 100644 index 00000000000..76978ba4dc8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b590a69c8a640baa04566d46a1d735 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity new file mode 100644 index 00000000000..153d77222eb --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &258907406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 258907408} + - component: {fileID: 258907407} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &258907407 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258907406} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &258907408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258907406} + m_LocalRotation: {x: 0.30089864, y: 0.6364036, z: -0.29676083, w: 0.6452779} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -630.79297, z: 0} +--- !u!1001 &299435196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2416733968201007103, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 94f4eec55f2984cb4a38ad10465d853d, type: 2} + - target: {fileID: -927199367670048503, guid: c92b68c31d5bf48d0a609ccc515a6cf7, + type: 3} + propertyPath: m_Name + value: LP_Normal_Map_Stress_Test + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c92b68c31d5bf48d0a609ccc515a6cf7, type: 3} +--- !u!1 &723586225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 723586228} + - component: {fileID: 723586227} + - component: {fileID: 723586226} + - component: {fileID: 723586229} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &723586226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_Enabled: 1 +--- !u!20 &723586227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &723586228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_LocalRotation: {x: -0.009857253, y: -0.70042616, z: 0.009671118, w: -0.7135913} + m_LocalPosition: {x: -6.0977936, y: 1.5080056, z: -0.5367039} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &723586229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723586225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta new file mode 100644 index 00000000000..7067274174c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 49aa042448a7b4260874ed632254cd4e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff new file mode 100644 index 00000000000..655b5dfe77f --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:806b0db77c8083bb34bd97c04c8e4c07a3e59b8543c66d86f4573f1c1cdbaef5 +size 12329148 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta new file mode 100644 index 00000000000..7a83a7b0ce6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/Baked_normal.tiff.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 6627ea28e0e754519b2316a28ae392e6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj new file mode 100644 index 00000000000..1242db7fae7 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ab16753d6e2ea9c26fdd2577c301bcc9de697d1440b92588de78f98ea719bd +size 17640 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta new file mode 100644 index 00000000000..c6d15f67852 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LP_Normal_Map_Stress_Test.obj.meta @@ -0,0 +1,100 @@ +fileFormatVersion: 2 +guid: c92b68c31d5bf48d0a609ccc515a6cf7 +ModelImporter: + serializedVersion: 20100 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat new file mode 100644 index 00000000000..7cca45f3744 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6591972991259300075 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LitTBN + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6627ea28e0e754519b2316a28ae392e6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 1 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta new file mode 100644 index 00000000000..8b689586f4c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/128_TBN/LitTBN.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94f4eec55f2984cb4a38ad10465d853d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset index a4b9bc922c0..50118b68104 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/EditorBuildSettings.asset @@ -213,14 +213,11 @@ EditorBuildSettings: path: Assets/Scenes/105_TransparentReceiveShadows.unity guid: 6d72a4ab29e211149914e8a46ba9d1cf - enabled: 1 - path: Assets/Scenes/106_PostProcessingRenderUICustomRenderer.unity + path: Assets/Scenes/122_RenderUICustomRendererFXAA.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 0 - path: Assets/Scenes/107_DepthPrepass.unity - guid: 12bed04065c037743845d8a5970cb5d0 - enabled: 1 - path: Assets/Scenes/108_MoveCamera.unity - guid: 5365b5739a6ca3c40bd03dc1ee5cb3c6 + path: Assets/Scenes/109_URPShadersAlphaOutput.unity + guid: 0a89803a0d2352245a452c202f9a67d1 - enabled: 1 path: Assets/Scenes/119_CameraToRTWithViewportRect.unity guid: c7b61419ee9382545afe530714fda0c2 @@ -236,9 +233,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/122_RenderUICustomRendererFXAA.unity guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 0 - path: Assets/Scenes/125_CameraStackingVolumes.unity - guid: 9173c5ffc1365594aa9b927c4cd84c54 - enabled: 1 path: Assets/Scenes/123_CameraStackingClear.unity guid: 9aa9851df0da149c9a83a0f26072e234 @@ -257,6 +251,12 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/127_ClearRenderTexture.unity guid: ecb4f57b7a1788b4b85f618d4cbc6677 + - enabled: 0 + path: Assets/Scenes/127_DynamicScaling_DOF.unity + guid: 069f595c511c463418479db2f730eec1 + - enabled: 1 + path: Assets/Scenes/126_SampleDepth.unity + guid: d66b74ae4e7264d62bdb2c4f56261030 - enabled: 1 path: Assets/Scenes/130_UnityMatrixIVP.unity guid: 716466bc92f8e4eeeb3c138524b04021 diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset index dc6dab9f3a2..5618806cf18 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 20 productGUID: 3d55fb3b8c70e604a84c55c7cb6a259b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,10 +49,12 @@ PlayerSettings: m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -84,7 +86,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -105,6 +106,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -112,6 +114,7 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 0 @@ -150,9 +153,10 @@ PlayerSettings: sharedDepthBuffer: 0 dashSupport: 0 lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 D3DHDRBitDepth: 0 @@ -179,10 +183,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -275,6 +279,38 @@ PlayerSettings: m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: MacStandaloneSupport m_APIs: 1000000011000000 @@ -290,7 +326,6 @@ PlayerSettings: openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -298,7 +333,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] - playModeTestRunnerEnabled: 0 + playModeTestRunnerEnabled: 1 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 @@ -307,12 +342,14 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -406,6 +443,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -506,6 +544,7 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -522,9 +561,10 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 0 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: LWRP_DEBUG_STATIC_POSTFX 4: LWRP_DEBUG_STATIC_POSTFX @@ -630,3 +670,4 @@ PlayerSettings: enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 1 + virtualTexturingSupportEnabled: 0 diff --git a/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset b/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/UniversalGraphicsTest/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset b/TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000000..c01cab83dc9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest/UserSettings/EditorUserSettings.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + lightmappingDeviceAndPlatform: + value: 53 + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCOverlayIcons: 1 + m_VCAllowAsyncUpdate: 0 diff --git a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat index 63fa4672710..23b6db1d3ed 100644 --- a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat +++ b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/DefaultMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat index 953a7dd94b1..719e8501ebf 100644 --- a/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat +++ b/TestProjects/VisualEffectGraph_LWRP/Assets/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 2 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,7 +26,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2050 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -88,3 +88,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset b/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset index fa89832b363..91791f36dfa 100644 --- a/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset +++ b/TestProjects/VisualEffectGraph_LWRP/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 2 diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 4bb7f49531b..188d2c09daf 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fix LookDev's layout vanishing on domain reload. - Fixed null reference exception in LookDev when setting the SRP to one not implementing LookDev (case 1245086) - Fix LookDev's undo/redo on EnvironmentLibrary (case 1234725) +- Fixed issue with the shader TransformWorldToHClipDir function computing the wrong result. ## [7.3.0] - 2020-03-11 diff --git a/com.unity.render-pipelines.core/Documentation~/index.md b/com.unity.render-pipelines.core/Documentation~/index.md index 1c0aeb9d377..438e9862be0 100644 --- a/com.unity.render-pipelines.core/Documentation~/index.md +++ b/com.unity.render-pipelines.core/Documentation~/index.md @@ -1,11 +1,33 @@ -# SRP Core - +# Scriptable Render Pipeline ![](https://blogs.unity3d.com/wp-content/uploads/2018/01/image5_rs.png) +## What is the Scriptable Render Pipeline + +The Scriptable Render Pipeline (SRP) is a feature that gives you full control over Unity's render pipeline and provides the tools you need to create modern, high-fidelity graphics in Unity. + +SRP allows you to write C# scripts to control the way Unity renders each frame. Exposing the render pipeline to you in C# makes Unity less of a “black box” when it comes to rendering. Unlike the original built-in render pipeline, SRP allows you to see and control exactly what happens during the rendering process. + +Unity provides you with two prebuilt Scriptable Render Pipelines which you can use in your Project as a base for your own custom SRP: +* The Universal Render Pipeline (URP) offers graphics that scale from mobile platforms to higher-end consoles and PCs. +* The High Definition Render Pipeline (HDRP) utilizes physically-based lighting techniques to offer high-fidelity graphics to target modern, Compute Shader compatible, platforms. + +Rather than developing your own SRP from scratch, you can use either of these prebuilt SRPs as a base to modify and adapt to your own requirements. + +## What is SRP Core + +SRP Core is a collection of API's that exposes many of the rendering internals and configuration to you. This allows you to configure exactly how you want rendering to work in your project. + +The SRP API offers a new interface to many familiar Unity constructs which include: + +- Lights +- Materials +- Cameras +- Command Buffers + +The thing that SRP changes is the *way* that you interact with Unity. For performance reasons, when you write a custom SRP, you work with groups of renderers, not individual items. + + + -The Scriptable Render Pipeline (SRP) is a Unity feature that allows you to write C# scripts to control the way Unity renders each frame. SRP Core is a package that makes it easier to create or customize an SRP. -SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and the shader libraries used in the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). -If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time. -For more information on SRP, including a guide to getting started with a custom SRP, see the [SRP documentation](https://docs.unity3d.com/Manual/ScriptableRenderPipeline.html). For more information on Unity's prebuilt SRPs, see the [Universal Render Pipeline (URP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest), or the [High Definition Render Pipeline (HDRP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest). \ No newline at end of file diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl index 19e38f62cbb..603622e8f7a 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl @@ -177,8 +177,16 @@ real3 UnpackNormalAG(real4 packedNormal, real scale = 1.0) { real3 normal; normal.xy = packedNormal.ag * 2.0 - 1.0; - normal.xy *= scale; normal.z = sqrt(1.0 - saturate(dot(normal.xy, normal.xy))); + + // must scale after reconstruction of normal.z which also + // mirrors UnpackNormalRGB(). This does imply normal is not returned + // as a unit length vector but doesn't need it since it will get normalized after TBN transformation. + // If we ever need to blend contributions with built-in shaders for URP + // then we should consider using UnpackDerivativeNormalAG() instead like + // HDRP does since derivatives do not use renormalization and unlike tangent space + // normals allow you to blend, accumulate and scale contributions correctly. + normal.xy *= scale; return normal; } diff --git a/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl index bc8762f4c0f..d1c09a9e321 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/SpaceTransforms.hlsl @@ -86,48 +86,73 @@ float4 TransformWViewToHClip(float3 positionVS) return mul(GetViewToHClipMatrix(), float4(positionVS, 1.0)); } -real3 TransformObjectToWorldDir(real3 dirOS) +// Normalize to support uniform scaling +float3 TransformObjectToWorldDir(float3 dirOS, bool doNormalize = true) { - // Normalize to support uniform scaling - return SafeNormalize(mul((real3x3)GetObjectToWorldMatrix(), dirOS)); + float3 dirWS = mul((float3x3)GetObjectToWorldMatrix(), dirOS); + if (doNormalize) + return SafeNormalize(dirWS); + + return dirWS; } -real3 TransformWorldToObjectDir(real3 dirWS) +// Normalize to support uniform scaling +float3 TransformWorldToObjectDir(float3 dirWS, bool doNormalize = true) { - // Normalize to support uniform scaling - return normalize(mul((real3x3)GetWorldToObjectMatrix(), dirWS)); + float3 dirOS = mul((float3x3)GetWorldToObjectMatrix(), dirWS); + if (doNormalize) + return normalize(dirOS); + + return dirOS; } -real3 TransformWorldToViewDir(real3 dirWS) +// Tranforms vector from world space to view space +real3 TransformWorldToViewDir(real3 dirWS, bool doNormalize = false) { - return mul((real3x3)GetWorldToViewMatrix(), dirWS).xyz; + float3 dirVS = mul((real3x3)GetWorldToViewMatrix(), dirWS).xyz; + if (doNormalize) + return normalize(dirVS); + + return dirVS; } // Tranforms vector from world space to homogenous space -real3 TransformWorldToHClipDir(real3 directionWS) +real3 TransformWorldToHClipDir(real3 directionWS, bool doNormalize = false) { - return mul((real3x3)GetWorldToHClipMatrix(), directionWS); + float3 dirHCS = mul((real3x3)GetWorldToHClipMatrix(), directionWS).xyz; + if (doNormalize) + return normalize(dirHCS); + + return dirHCS; } // Transforms normal from object to world space -float3 TransformObjectToWorldNormal(float3 normalOS) +float3 TransformObjectToWorldNormal(float3 normalOS, bool doNormalize = true) { #ifdef UNITY_ASSUME_UNIFORM_SCALING - return TransformObjectToWorldDir(normalOS); + return TransformObjectToWorldDir(normalOS, doNormalize); #else // Normal need to be multiply by inverse transpose - return SafeNormalize(mul(normalOS, (float3x3)GetWorldToObjectMatrix())); + float3 normalWS = mul(normalOS, (float3x3)GetWorldToObjectMatrix()); + if (doNormalize) + return SafeNormalize(normalWS); + + return normalWS; #endif } // Transforms normal from world to object space -float3 TransformWorldToObjectNormal(float3 normalWS) +float3 TransformWorldToObjectNormal(float3 normalWS, bool doNormalize = true) { #ifdef UNITY_ASSUME_UNIFORM_SCALING - return TransformWorldToObjectDir(normalWS); + return TransformWorldToObjectDir(normalWS, doNormalize); #else // Normal need to be multiply by inverse transpose - return SafeNormalize(mul(normalWS, (float3x3)GetObjectToWorldMatrix())); + float3 normalOS = mul(normalWS, (float3x3)GetObjectToWorldMatrix()); + if (doNormalize) + return SafeNormalize(normalOS); + + return normalOS; #endif } @@ -146,41 +171,48 @@ real3 TransformTangentToWorld(real3 dirTS, real3x3 tangentToWorld) return mul(dirTS, tangentToWorld); } +// This function does the exact inverse of TransformTangentToWorld() and is +// also decribed within comments in mikktspace.h and it follows implicitly +// from the scalar triple product (google it). real3 TransformWorldToTangent(real3 dirWS, real3x3 tangentToWorld) { // Note matrix is in row major convention with left multiplication as it is build on the fly float3 row0 = tangentToWorld[0]; - float3 row1 = tangentToWorld[1]; - float3 row2 = tangentToWorld[2]; - - // these are the columns of the inverse matrix but scaled by the determinant - float3 col0 = cross(row1, row2); - float3 col1 = cross(row2, row0); - float3 col2 = cross(row0, row1); - - float determinant = dot(row0, col0); - float sgn = determinant<0.0 ? (-1.0) : 1.0; - - // inverse transposed but scaled by determinant - real3x3 matTBN_I_T = real3x3(col0, col1, col2); - - // remove transpose part by using matrix as the first arg in mul() - // this makes it the exact inverse of what TransformTangentToWorld() does. - return SafeNormalize( sgn * mul(matTBN_I_T, dirWS) ); + float3 row1 = tangentToWorld[1]; + float3 row2 = tangentToWorld[2]; + + // these are the columns of the inverse matrix but scaled by the determinant + float3 col0 = cross(row1, row2); + float3 col1 = cross(row2, row0); + float3 col2 = cross(row0, row1); + + float determinant = dot(row0, col0); + float sgn = determinant<0.0 ? (-1.0) : 1.0; + + // inverse transposed but scaled by determinant + // Will remove transpose part by using matrix as the first arg in the mul() below + // this makes it the exact inverse of what TransformTangentToWorld() does. + real3x3 matTBN_I_T = real3x3(col0, col1, col2); + + return SafeNormalize( sgn * mul(matTBN_I_T, dirWS) ); } real3 TransformTangentToObject(real3 dirTS, real3x3 tangentToWorld) { // Note matrix is in row major convention with left multiplication as it is build on the fly - real3 normalWS = TransformTangentToWorld(dirTS, tangentToWorld); - return TransformWorldToObjectNormal(normalWS); + real3 normalWS = TransformTangentToWorld(dirTS, tangentToWorld); + return TransformWorldToObjectNormal(normalWS); } real3 TransformObjectToTangent(real3 dirOS, real3x3 tangentToWorld) { // Note matrix is in row major convention with left multiplication as it is build on the fly - float3 normalWS = TransformObjectToWorldNormal(dirOS); - return TransformWorldToTangent(normalWS, tangentToWorld); + + // don't normalize, as normalWS will be normalized after TransformWorldToTangent + float3 normalWS = TransformObjectToWorldNormal(dirOS, false); + + // transform from world to tangent + return TransformWorldToTangent(normalWS, tangentToWorld); } #endif diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 7498c715e9d..d6d69cfb318 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -10,7 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added the option to specify the maximum number of visible lights. If you set a value, lights are sorted based on their distance from the Camera. ### Changed -- The maximum number of visible lights is now set to 32 if the platform is mobile or if the graphics API is OpenGLCore, otherwise it is set to 256. +- The number of maximum visible lights is now set to 32 if the platform is mobile or if the graphics API is OpenGLCore, otherwise it is set to 256. +- UniversalRenderPipelineAsset no longer supports presets [case 1197020](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-on-preset-of-universalrenderpipelineassets) +- The Metallic property value of a Material is now linear, which is the correct behavior for the PBR approach. In the previous URP package version, those values were interpreted as gamma values. This change might affect the look of Materials that use this property after upgrading from the previous package version. +- The pipeline is now computing tangent space in per fragment. - Optimized the 2D Renderer to skip rendering into certain internal buffers when not necessary. - The 2D Renderer now supports camera stacking. @@ -43,6 +46,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed GLES shaders compilation failing on Windows platform (not a mobile platform) due to uniform count limit. - Fixed an issue where preset button could still be used, when it is not supposed to. [case 1246261](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-for-renderobject-preset-asset) - Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene) +- Fixed an issue that causes viewport to not work correctly when rendering to textures. [case 1225103](https://issuetracker.unity3d.com/issues/urp-the-viewport-rect-isnt-correctly-applied-when-the-camera-is-outputting-into-a-rendertexture) +- Fixed an issue that caused incorrect sampling of HDR reflection probe textures. +- Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture [case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset) +- Metallic slider on the Lit shader is now linear meaning correct values are used for PBR. +- URP shaders that contain a priority slider now no longer have an offset of 50 by default. +- Fixed issue where using DOF at the same time as Dynamic Scaling, the depth buffer was smapled with incorrect UVs. [case 1225467](https://issuetracker.unity3d.com/product/unity/issues/guid/1225467/) +- Fixed a performance problem with ShaderPreprocessor with large amount of active shader variants in the project. ## [7.3.0] - 2020-03-11 @@ -133,7 +143,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed incorrect light attenuation on Nintendo Switch. - Fixed XR SDK single-pass incorrectly switching to multipass issue. Add query for XR SDK single-pass availability using XR SDK renderpass descriptors. - Fixed a performance issue in Hololens when using renderer with custom render passes. - +- ## [7.1.8] - 2020-01-20 ### Fixed diff --git a/com.unity.render-pipelines.universal/Documentation~/EffectList.md b/com.unity.render-pipelines.universal/Documentation~/EffectList.md index 4b0416a0b50..0a9edf35324 100644 --- a/com.unity.render-pipelines.universal/Documentation~/EffectList.md +++ b/com.unity.render-pipelines.universal/Documentation~/EffectList.md @@ -4,17 +4,17 @@ These are the post-processing effects that are available in the Universal Render -* Bloom +* [Bloom](post-processing-bloom.md) * [Channel Mixed](Post-Processing-Channel-Mixer.md) -* Chromatic Aberration +* [Chromatic Aberration](post-processing-chromatic-aberration.md) * [Color Adjustments](Post-Processing-Color-Adjustments.md) * [Color Curves](Post-Processing-Color-Curves.md) -* Depth of Field +* [Depth of Field](post-processing-depth-of-field.md) * [Film Grain](Post-Processing-Film-Grain.md) @@ -28,11 +28,11 @@ These are the post-processing effects that are available in the Universal Render * [Shadows Midtones Highlights](Post-Processing-Shadows-Midtones-Highlights.md) -* [Split Tones](Post-Processing-Split-Tones.md) +* [Split Toning](Post-Processing-Split-Toning.md) -* Tonemapping +* [Tonemapping](post-processing-tonemapping.md) -* Vignette +* [Vignette](post-processing-vignette.md) * [White Balance](Post-Processing-White-Balance.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md b/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md index ecb2ae970e5..e2f1f90175d 100644 --- a/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md +++ b/com.unity.render-pipelines.universal/Documentation~/InstallURPIntoAProject.md @@ -16,7 +16,7 @@ URP's integrated post-processing solution does not currently support custom post 2. In the top navigation bar, select __Window > Package Manager__ to open the __Package Manager__ window. 3. Select the __All__ tab. This tab displays the list of available packages for the version of Unity that you are currently running. 4. Select **Universal RP** from the list of packages. -5. In the botoom right corner of the Package Manager window, select __Install__. Unity installs URP directly into your Project. +5. In the bottom right corner of the Package Manager window, select __Install__. Unity installs URP directly into your Project. ## Configuring URP diff --git a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md index e163f429e51..add874a1b58 100644 --- a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md +++ b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md @@ -1,4 +1,5 @@ * [Universal Render Pipeline](index.md) +* [Requirements](requirements) * [Features]() * [Feature Comparison with the Built-in Render Pipeline](universalrp-builtin-feature-comparison.md) * [Getting started](InstallingAndConfiguringURP.md) @@ -86,4 +87,4 @@ * [Frequently asked questions (FAQ)](faq.md) -* [Feature comparison with the Built-in Render Pipeline](universalrp-builtin-feature-comparison.md) \ No newline at end of file +* [Feature comparison with the Built-in Render Pipeline](universalrp-builtin-feature-comparison.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/lit-shader.md b/com.unity.render-pipelines.universal/Documentation~/lit-shader.md index 738b56a57c0..9acc2cf712e 100644 --- a/com.unity.render-pipelines.universal/Documentation~/lit-shader.md +++ b/com.unity.render-pipelines.universal/Documentation~/lit-shader.md @@ -47,7 +47,7 @@ The __Surface Inputs__ describe the surface itself. For example, you can use the | Property | Description | | --------------------------- | ------------------------------------------------------------ | | __Base Map__ | Adds color to the surface, also known as the diffuse map. To assign a Texture to the __Base Map__ setting, click the object picker next to it. This opens the Asset Browser, where you can select from the Textures in your Project. Alternatively, you can use the [color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html). The color next to the setting shows the tint on top of your assigned Texture. To assign another tint, you can click this color swatch. If you select __Transparent__ or __Alpha Clipping__ under __Surface Options__, your Material uses the Texture’s alpha channel or color. | -| __Metallic / Specular Map__ | Shows a map input for your chosen __Workflow Mode__ in the __Surface Options__.
For the [__Metallic Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterMetallic.html) workflow, the map gets the color from the __Base Map__ assigned above. Use the slider to control how metallic the surface appears. 1 is fully metallic, like silver or copper, and 0 is fully dielectric, like plastic or wood. You can generally use values in between 0 and 1 for dirty or corroded metals.
For the [__Specular Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterSpecular.html) setting, you can assign a texture to it by clicking the object picker next to it. This opens the Asset Browser, where you can select from the Textures in your Project. Alternatively, you can use the [color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html).
For both workflows, you can use the __Smoothness__ slider to control the spread of highlights on the surface. 0 gives a wide, rough highlight. 1 gives a small, sharp highlight like glass. Values in between produce semi-glossy looks. For example, 0.5 produces a plastic-like glossiness.
Under __Source__, you can control where to sample a smoothness map from.y default, both the metallic and specular workflow uses the Alpha channel of its map for the source. You can also set it to the Base Map Alpha channel. | +| __Metallic / Specular Map__ | Shows a map input for your chosen __Workflow Mode__ in the __Surface Options__.
For the [__Metallic Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterMetallic.html) workflow, the map gets the color from the __Base Map__ assigned above. Use the slider to control how metallic the surface appears. 1 is fully metallic, like silver or copper, and 0 is fully dielectric, like plastic or wood. You can generally use values in between 0 and 1 for dirty or corroded metals.
For the [__Specular Map__](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterSpecular.html) setting, you can assign a texture to it by clicking the object picker next to it. This opens the Asset Browser, where you can select from the Textures in your Project. Alternatively, you can use the [color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html).
For both workflows, you can use the __Smoothness__ slider to control the spread of highlights on the surface. 0 gives a wide, rough highlight. 1 gives a small, sharp highlight like glass. Values in between produce semi-glossy looks. For example, 0.5 produces a plastic-like glossiness.
Use the __Source__ drop-down menu to select where the shader samples a smoothness map from. Options are: __Metallic Alpha__ (alpha channel from the metallic map), and __Albedo Alpha__ (alpha channel from the base map). The default value is __Metallic Alpha__.
If the selected source has the alpha channel, the shader samples the channel and multiplies each sample by the __Smoothness__ value. | | __Normal Map__ | Adds a normal map to the surface. With a [normal map](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterNormalMap.html?), you can add surface details like bumps, scratches and grooves. To add the map, click the object picker next to it. The normal map picks up ambient lighting in the environment.
The float value next to the setting is a multiplier for the effect of the __Normal Map__. Low values decrease the effect of the normal map. High values create stronger effects. | | __Occlusion Map__ | Select an [occlusion map](https://docs.unity3d.com/Manual/StandardShaderMaterialParameterOcclusionMap.html). This simulates shadows from ambient light and reflection, which makes lighting look more realistic as less light reaches corners and crevices of objects. To select the occlusion map, click the object picker next to it. | | __Emission__ | Makes the surface look like it emits lights. When enabled, the __Emission Map__ and __Emission Color__ settings appear.
To assign an __Emission Map__, click the object picture next to it. This opens the Asset Browser, where you can select from the textures in your Project.
For __Emission Color__, you can choose the color picker](https://docs.unity3d.com/Manual/EditingValueProperties.html) to assign a tint on top of the color. This can be more than 100% white, which is useful for effects like lava, that shines brighter than white while still being another color.
If you have not assigned an __Emission Map__, the __Emission__ setting only uses the tint you’ve assigned in __Emission Color__.
If you do not enable __Emission__, URP sets the emission to black and does not calculate emission. | diff --git a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md index 833d375e152..4b66bf6926d 100644 --- a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md +++ b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md @@ -162,7 +162,7 @@ This table provides an overview of the current features supported in the Univers | Multipass | Yes | Yes | | Single Pass | Yes | Yes | | Single Pass Instanced | Yes | Yes | -| *Post-processing*
Oculus Rift
Oculus Quest
Oculus Go
Gear VR
PSVR
HoloLens
WMR
Magic Leap One|
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes |
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes | +| *Post-processing*
Oculus Rift
Oculus Quest
Oculus Go
Gear VR
PSVR
HoloLens
WMR
Magic Leap One
OpenVR|
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes |
Yes
Yes
Yes
Yes
Yes
Yes
Yes
Yes
No | | ***AR*** | | | | AR Foundation | No | Yes | | ***Debug*** | | | diff --git a/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md b/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md index 812cd0e3d98..1fb7494af85 100644 --- a/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md +++ b/com.unity.render-pipelines.universal/Documentation~/upgrade-lwrp-to-urp.md @@ -78,18 +78,22 @@ To install URP as a dependency of the Project: * Open the Project Manifest file using a text editor. * At the top of the dependencies section, add the following entry: -`com.unity.render-pipelines.universal`: `[Version number you noted earlier]`, +```json +"com.unity.render-pipelines.universal": "[Version number you noted earlier]" +``` So, for example, if the version of URP was 7.1.1, your dependencies section would look like this: -`dependencies`: { - `com.unity.render-pipelines.universal`: `7.1.1`, - … -}, +```json +"dependencies": { + "com.unity.render-pipelines.universal": "7.1.1", + ... +} +``` This marks the version of URP that you have installed as a dependency of the Project. You can now safely remove LWRP. * Open your Project in Unity. * Open the Package Manager Window. * Locate **Lightweight RP** and select it. -* In the bottom right of the Package Manager window, click Remove. Unity completely removes the LWRP package from the Project. \ No newline at end of file +* In the bottom right of the Package Manager window, click Remove. Unity completely removes the LWRP package from the Project. diff --git a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs index cea1c576209..43915f47264 100644 --- a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs @@ -89,7 +89,7 @@ class MaterialPostprocessor : AssetPostprocessor internal static List s_ImportedAssetThatNeedSaving = new List(); internal static bool s_NeedsSavingAssets = false; - internal static readonly Action[] k_Upgraders = { UpgradeV1 }; + internal static readonly Action[] k_Upgraders = { UpgradeV1, UpgradeV2 }; static internal void SaveAssetsToDisk() { @@ -213,6 +213,13 @@ static void UpgradeV1(Material material, ShaderPathID shaderID) break; } } + + static void UpgradeV2(Material material, ShaderPathID shaderID) + { + // fix 50 offset on shaders + if(material.HasProperty("_QueueOffset")) + BaseShaderGUI.SetupMaterialBlendMode(material); + } } // Upgraders v1 diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs b/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs index c160aa3194a..1959d4e7534 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs @@ -408,7 +408,10 @@ public static void SetupMaterialBlendMode(Material material) if (material == null) throw new ArgumentNullException("material"); - bool alphaClip = material.GetFloat("_AlphaClip") == 1; + bool alphaClip = false; + if(material.HasProperty("_AlphaClip")) + alphaClip = material.GetFloat("_AlphaClip") >= 0.5; + if (alphaClip) { material.EnableKeyword("_ALPHATEST_ON"); @@ -418,65 +421,65 @@ public static void SetupMaterialBlendMode(Material material) material.DisableKeyword("_ALPHATEST_ON"); } - var queueOffset = 0; // queueOffsetRange; - if(material.HasProperty("_QueueOffset")) - queueOffset = queueOffsetRange - (int) material.GetFloat("_QueueOffset"); - - SurfaceType surfaceType = (SurfaceType)material.GetFloat("_Surface"); - if (surfaceType == SurfaceType.Opaque) + if (material.HasProperty("_Surface")) { - if (alphaClip) + SurfaceType surfaceType = (SurfaceType) material.GetFloat("_Surface"); + if (surfaceType == SurfaceType.Opaque) { - material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest; - material.SetOverrideTag("RenderType", "TransparentCutout"); + if (alphaClip) + { + material.renderQueue = (int) RenderQueue.AlphaTest; + material.SetOverrideTag("RenderType", "TransparentCutout"); + } + else + { + material.renderQueue = (int) RenderQueue.Geometry; + material.SetOverrideTag("RenderType", "Opaque"); + } + + material.renderQueue += material.HasProperty("_QueueOffset") ? (int) material.GetFloat("_QueueOffset") : 0; + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.One); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.Zero); + material.SetInt("_ZWrite", 1); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + material.SetShaderPassEnabled("ShadowCaster", true); } else { - material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Geometry; - material.SetOverrideTag("RenderType", "Opaque"); - } - material.renderQueue += queueOffset; - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero); - material.SetInt("_ZWrite", 1); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - material.SetShaderPassEnabled("ShadowCaster", true); - } - else - { - BlendMode blendMode = (BlendMode)material.GetFloat("_Blend"); - var queue = (int) UnityEngine.Rendering.RenderQueue.Transparent; - - // Specific Transparent Mode Settings - switch (blendMode) - { - case BlendMode.Alpha: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - break; - case BlendMode.Premultiply: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); - material.EnableKeyword("_ALPHAPREMULTIPLY_ON"); - break; - case BlendMode.Additive: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.One); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - break; - case BlendMode.Multiply: - material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.DstColor); - material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero); - material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - material.EnableKeyword("_ALPHAMODULATE_ON"); - break; + BlendMode blendMode = (BlendMode) material.GetFloat("_Blend"); + + // Specific Transparent Mode Settings + switch (blendMode) + { + case BlendMode.Alpha: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.SrcAlpha); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + break; + case BlendMode.Premultiply: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.One); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); + material.EnableKeyword("_ALPHAPREMULTIPLY_ON"); + break; + case BlendMode.Additive: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.SrcAlpha); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.One); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + break; + case BlendMode.Multiply: + material.SetInt("_SrcBlend", (int) UnityEngine.Rendering.BlendMode.DstColor); + material.SetInt("_DstBlend", (int) UnityEngine.Rendering.BlendMode.Zero); + material.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + material.EnableKeyword("_ALPHAMODULATE_ON"); + break; + } + + // General Transparent Material Settings + material.SetOverrideTag("RenderType", "Transparent"); + material.SetInt("_ZWrite", 0); + material.renderQueue += material.HasProperty("_QueueOffset") ? (int) material.GetFloat("_QueueOffset") : 0; + material.SetShaderPassEnabled("ShadowCaster", false); } - // General Transparent Material Settings - material.SetOverrideTag("RenderType", "Transparent"); - material.SetInt("_ZWrite", 0); - material.renderQueue = queue + queueOffset; - material.SetShaderPassEnabled("ShadowCaster", false); } } diff --git a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs index 8b52444f9f4..511c0f4ea8c 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs @@ -212,14 +212,23 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< int prevVariantCount = compilerDataList.Count; - - for (int i = 0; i < compilerDataList.Count; ++i) + + var inputShaderVariantCount = compilerDataList.Count; + for (int i = 0; i < inputShaderVariantCount;) { - if (StripUnused(ShaderBuildPreprocessor.supportedFeatures, shader, snippetData, compilerDataList[i])) - { + bool removeInput = StripUnused(ShaderBuildPreprocessor.supportedFeatures, shader, snippetData, compilerDataList[i]); + if (removeInput) + compilerDataList[i] = compilerDataList[--inputShaderVariantCount]; + else + ++i; + } + + if(compilerDataList is List inputDataList) + inputDataList.RemoveRange(inputShaderVariantCount, inputDataList.Count - inputShaderVariantCount); + else + { + for(int i = compilerDataList.Count -1; i >= inputShaderVariantCount; --i) compilerDataList.RemoveAt(i); - --i; - } } if (urpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs index a8ee3d59dcd..aab6091d190 100644 --- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs +++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/Light2DLookupTexture.cs @@ -1,5 +1,6 @@ using UnityEditor; using System.IO; +using UnityEngine.Rendering.Universal; namespace UnityEngine.Experimental.Rendering.Universal { @@ -12,13 +13,13 @@ static public Texture2D CreatePointLightLookupTexture() { const float WIDTH = 256; const float HEIGHT = 256; - TextureFormat textureFormat = TextureFormat.ARGB32; - if (SystemInfo.SupportsTextureFormat(TextureFormat.RGBAHalf)) - textureFormat = TextureFormat.RGBAHalf; - else if (SystemInfo.SupportsTextureFormat(TextureFormat.RGBAFloat)) - textureFormat = TextureFormat.RGBAFloat; + GraphicsFormat textureFormat = GraphicsFormat.R8G8B8A8_UNorm; + if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.SetPixels)) + textureFormat = GraphicsFormat.R16G16B16A16_SFloat; + else if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R32G32B32A32_SFloat, FormatUsage.SetPixels)) + textureFormat = GraphicsFormat.R32G32B32A32_SFloat; - s_PointLightLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT, textureFormat, false); + s_PointLightLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT, textureFormat, TextureCreationFlags.None); s_PointLightLookupTexture.filterMode = FilterMode.Bilinear; s_PointLightLookupTexture.wrapMode = TextureWrapMode.Clamp; if (s_PointLightLookupTexture != null) @@ -70,8 +71,8 @@ static public Texture2D CreateFalloffLookupTexture() const float WIDTH = 2048; const float HEIGHT = 192; - TextureFormat textureFormat = TextureFormat.ARGB32; - s_FalloffLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT-64, textureFormat, false); + GraphicsFormat textureFormat = GraphicsFormat.R8G8B8A8_SRGB; + s_FalloffLookupTexture = new Texture2D((int)WIDTH, (int)HEIGHT-64, textureFormat, TextureCreationFlags.None); s_FalloffLookupTexture.filterMode = FilterMode.Bilinear; s_FalloffLookupTexture.wrapMode = TextureWrapMode.Clamp; if (s_FalloffLookupTexture != null) @@ -82,9 +83,6 @@ static public Texture2D CreateFalloffLookupTexture() float lineValue = -baseValue + 1; float exponent = Mathf.Log(lineValue) / Mathf.Log(baseValue); - if (y == HEIGHT - 1) - textureFormat = TextureFormat.ARGB32; - for (int x=0;x m_RenderTextureFormatSupport = new Dictionary(); + static Dictionary m_GraphicsFormatSupport = new Dictionary(); internal static void ClearSystemInfoCache() { m_RenderTextureFormatSupport.Clear(); + m_GraphicsFormatSupport.Clear(); } /// @@ -248,6 +251,24 @@ public static bool SupportsRenderTextureFormat(RenderTextureFormat format) return support; } + /// + /// Checks if a texture format is supported by the run-time system. + /// Similar to , but doesn't allocate memory. + /// + /// The format to look up. + /// The format usage to look up. + /// Returns true if the graphics card supports the given GraphicsFormat + public static bool SupportsGraphicsFormat(GraphicsFormat format, FormatUsage usage) + { + if (!m_GraphicsFormatSupport.TryGetValue(format, out var support)) + { + support = SystemInfo.IsFormatSupported(format, usage); + m_GraphicsFormatSupport.Add(format, support); + } + + return support; + } + /// /// Return the last colorBuffer index actually referring to an existing RenderTarget /// diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index c8f2ced591b..61e442ea8e3 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -4,6 +4,7 @@ using UnityEngine.Scripting.APIUpdating; using UnityEngine.Experimental.GlobalIllumination; +using UnityEngine.Experimental.Rendering; using Lightmapping = UnityEngine.Experimental.GlobalIllumination.Lightmapping; namespace UnityEngine.Rendering.Universal @@ -181,7 +182,7 @@ public bool IsCameraProjectionMatrixFlipped() public List bias; } - public static class ShaderPropertyId + internal static class ShaderPropertyId { public static readonly int scaledScreenParams = Shader.PropertyToID("_ScaledScreenParams"); public static readonly int worldSpaceCameraPos = Shader.PropertyToID("_WorldSpaceCameraPos"); @@ -364,7 +365,7 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa bool isStereoEnabled, bool isHdrEnabled, int msaaSamples, bool needsAlpha) { RenderTextureDescriptor desc; - RenderTextureFormat renderTextureFormatDefault = RenderTextureFormat.Default; + GraphicsFormat renderTextureFormatDefault = SystemInfo.GetGraphicsFormat(DefaultFormat.LDR); // NB: There's a weird case about XR and render texture // In test framework currently we render stereo tests to target texture @@ -373,7 +374,7 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa if (isStereoEnabled) { desc = XRGraphics.eyeTextureDesc; - renderTextureFormatDefault = desc.colorFormat; + renderTextureFormatDefault = desc.graphicsFormat; } else if (camera.targetTexture == null) { @@ -395,10 +396,15 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa } else { - bool use32BitHDR = !needsAlpha && RenderingUtils.SupportsRenderTextureFormat(RenderTextureFormat.RGB111110Float); - RenderTextureFormat hdrFormat = (use32BitHDR) ? RenderTextureFormat.RGB111110Float : RenderTextureFormat.DefaultHDR; - - desc.colorFormat = isHdrEnabled ? hdrFormat : renderTextureFormatDefault; + GraphicsFormat hdrFormat; + if (!needsAlpha && RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render)) + hdrFormat = GraphicsFormat.B10G11R11_UFloatPack32; + else if (RenderingUtils.SupportsGraphicsFormat(GraphicsFormat.R16G16B16A16_SFloat, FormatUsage.Linear | FormatUsage.Render)) + hdrFormat = GraphicsFormat.R16G16B16A16_SFloat; + else + hdrFormat = SystemInfo.GetGraphicsFormat(DefaultFormat.HDR); // This might actually be a LDR format on old devices. + + desc.graphicsFormat = isHdrEnabled ? hdrFormat : renderTextureFormatDefault; desc.depthBufferBits = 32; desc.msaaSamples = msaaSamples; desc.sRGB = (QualitySettings.activeColorSpace == ColorSpace.Linear); diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl index 2f7f29f10e4..6a9d7fedd0a 100644 --- a/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl +++ b/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl @@ -117,6 +117,11 @@ void AlphaDiscard(real alpha, real cutoff, real offset = 0.0h) #endif } +half OutputAlpha(half outputAlpha) +{ + return saturate(outputAlpha + _DrawObjectPassData.a); +} + // A word on normalization of normals: // For better quality normals should be normalized before and after // interpolation. diff --git a/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl b/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl index e7a1645375e..176a89c2770 100644 --- a/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl +++ b/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl @@ -37,6 +37,12 @@ float4 _ScaledScreenParams; float4 _MainLightPosition; half4 _MainLightColor; +// Global object render pass data containing various settings. +// x,y,z are currently unused +// w is used for knowing whether the object is opaque(1) or alpha blended(0) +half4 _DrawObjectPassData; + + half4 _AdditionalLightsCount; #if USE_STRUCTURED_BUFFER_FOR_LIGHT_DATA StructuredBuffer _AdditionalLightsBuffer; diff --git a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader index 0c3d74fe7c4..84c769ed041 100644 --- a/com.unity.render-pipelines.universal/Shaders/BakedLit.shader +++ b/com.unity.render-pipelines.universal/Shaders/BakedLit.shader @@ -70,10 +70,9 @@ Shader "Universal Render Pipeline/Baked Lit" { float3 uv0AndFogCoord : TEXCOORD0; // xy: uv0, z: fogCoord DECLARE_LIGHTMAP_OR_SH(lightmapUV, vertexSH, 1); - half3 normal : TEXCOORD2; + half3 normalWS : TEXCOORD2; #if defined(_NORMALMAP) - half3 tangent : TEXCOORD3; - half3 bitangent : TEXCOORD4; + half4 tangentWS : TEXCOORD3; #endif float4 vertex : SV_POSITION; @@ -94,14 +93,17 @@ Shader "Universal Render Pipeline/Baked Lit" output.uv0AndFogCoord.xy = TRANSFORM_TEX(input.uv, _BaseMap); output.uv0AndFogCoord.z = ComputeFogFactor(vertexInput.positionCS.z); + // normalWS and tangentWS already normalize. + // this is required to avoid skewing the direction during interpolation + // also required for per-vertex SH evaluation VertexNormalInputs normalInput = GetVertexNormalInputs(input.normalOS, input.tangentOS); - output.normal = normalInput.normalWS; + output.normalWS = normalInput.normalWS; #if defined(_NORMALMAP) - output.tangent = normalInput.tangentWS; - output.bitangent = normalInput.bitangentWS; + real sign = input.tangentOS.w * GetOddNegativeScale(); + output.tangentWS = half4(normalInput.tangentWS.xyz, sign); #endif OUTPUT_LIGHTMAP_UV(input.lightmapUV, unity_LightmapST, output.lightmapUV); - OUTPUT_SH(output.normal, output.vertexSH); + OUTPUT_SH(output.normalWS, output.vertexSH); return output; } @@ -123,14 +125,17 @@ Shader "Universal Render Pipeline/Baked Lit" #if defined(_NORMALMAP) half3 normalTS = SampleNormal(uv, TEXTURE2D_ARGS(_BumpMap, sampler_BumpMap)).xyz; - half3 normalWS = TransformTangentToWorld(normalTS, half3x3(input.tangent, input.bitangent, input.normal)); + float sgn = input.tangentWS.w; // should be either +1 or -1 + float3 bitangent = sgn * cross(input.normalWS.xyz, input.tangentWS.xyz); + half3 normalWS = TransformTangentToWorld(normalTS, half3x3(input.tangentWS.xyz, bitangent, input.normalWS)); #else - half3 normalWS = input.normal; + half3 normalWS = input.normalWS; #endif normalWS = NormalizeNormalPerPixel(normalWS); color *= SAMPLE_GI(input.lightmapUV, input.vertexSH, normalWS); color = MixFog(color, input.uv0AndFogCoord.z); - + alpha = OutputAlpha(alpha); + return half4(color, alpha); } ENDHLSL diff --git a/com.unity.render-pipelines.universal/Shaders/Lit.shader b/com.unity.render-pipelines.universal/Shaders/Lit.shader index f9ea307871a..403f7837d54 100644 --- a/com.unity.render-pipelines.universal/Shaders/Lit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Lit.shader @@ -14,7 +14,7 @@ Shader "Universal Render Pipeline/Lit" _GlossMapScale("Smoothness Scale", Range(0.0, 1.0)) = 1.0 _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0 - [Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 0.0 + _Metallic("Metallic", Range(0.0, 1.0)) = 0.0 _MetallicGlossMap("Metallic", 2D) = "white" {} _SpecColor("Specular", Color) = (0.2, 0.2, 0.2) diff --git a/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl index bafeb67b829..317f0401590 100644 --- a/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl @@ -22,14 +22,11 @@ struct Varyings float3 positionWS : TEXCOORD2; #endif -#ifdef _NORMALMAP - float4 normalWS : TEXCOORD3; // xyz: normal, w: viewDir.x - float4 tangentWS : TEXCOORD4; // xyz: tangent, w: viewDir.y - float4 bitangentWS : TEXCOORD5; // xyz: bitangent, w: viewDir.z -#else float3 normalWS : TEXCOORD3; - float3 viewDirWS : TEXCOORD4; +#ifdef _NORMALMAP + float4 tangentWS : TEXCOORD4; // xyz: tangent, w: sign #endif + float3 viewDirWS : TEXCOORD5; half4 fogFactorAndVertexLight : TEXCOORD6; // x: fogFactor, yzw: vertex light @@ -50,17 +47,16 @@ void InitializeInputData(Varyings input, half3 normalTS, out InputData inputData inputData.positionWS = input.positionWS; #endif -#ifdef _NORMALMAP - half3 viewDirWS = half3(input.normalWS.w, input.tangentWS.w, input.bitangentWS.w); - inputData.normalWS = TransformTangentToWorld(normalTS, - half3x3(input.tangentWS.xyz, input.bitangentWS.xyz, input.normalWS.xyz)); + half3 viewDirWS = SafeNormalize(input.viewDirWS); +#ifdef _NORMALMAP + float sgn = input.tangentWS.w; // should be either +1 or -1 + float3 bitangent = sgn * cross(input.normalWS.xyz, input.tangentWS.xyz); + inputData.normalWS = TransformTangentToWorld(normalTS, half3x3(input.tangentWS.xyz, bitangent.xyz, input.normalWS.xyz)); #else - half3 viewDirWS = input.viewDirWS; inputData.normalWS = input.normalWS; #endif inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS); - viewDirWS = SafeNormalize(viewDirWS); inputData.viewDirectionWS = viewDirWS; #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) @@ -90,20 +86,23 @@ Varyings LitPassVertex(Attributes input) UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); + + // normalWS and tangentWS already normalize. + // this is required to avoid skewing the direction during interpolation + // also required for per-vertex lighting and SH evaluation VertexNormalInputs normalInput = GetVertexNormalInputs(input.normalOS, input.tangentOS); - half3 viewDirWS = GetCameraPositionWS() - vertexInput.positionWS; + float3 viewDirWS = GetCameraPositionWS() - vertexInput.positionWS; half3 vertexLight = VertexLighting(vertexInput.positionWS, normalInput.normalWS); half fogFactor = ComputeFogFactor(vertexInput.positionCS.z); output.uv = TRANSFORM_TEX(input.texcoord, _BaseMap); -#ifdef _NORMALMAP - output.normalWS = half4(normalInput.normalWS, viewDirWS.x); - output.tangentWS = half4(normalInput.tangentWS, viewDirWS.y); - output.bitangentWS = half4(normalInput.bitangentWS, viewDirWS.z); -#else - output.normalWS = NormalizeNormalPerVertex(normalInput.normalWS); + // already normalized from normal transform to WS. + output.normalWS = normalInput.normalWS; output.viewDirWS = viewDirWS; +#ifdef _NORMALMAP + real sign = input.tangentOS.w * GetOddNegativeScale(); + output.tangentWS = half4(normalInput.tangentWS.xyz, sign); #endif OUTPUT_LIGHTMAP_UV(input.lightmapUV, unity_LightmapST, output.lightmapUV); @@ -137,8 +136,10 @@ half4 LitPassFragment(Varyings input) : SV_Target InitializeInputData(input, surfaceData.normalTS, inputData); half4 color = UniversalFragmentPBR(inputData, surfaceData.albedo, surfaceData.metallic, surfaceData.specular, surfaceData.smoothness, surfaceData.occlusion, surfaceData.emission, surfaceData.alpha); - + color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl index 620cdffd2de..df726443d7a 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7CommonPasses.hlsl @@ -145,6 +145,7 @@ half4 SpeedTree7Frag(SpeedTreeVertexOutput input) : SV_Target half4 color = UniversalFragmentBlinnPhong(inputData, diffuseColor.rgb, half4(0, 0, 0, 0), 0, 0, diffuse.a); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl index 429f171adb8..ed7776527c8 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl @@ -379,6 +379,8 @@ half4 SpeedTree8Frag(SpeedTreeFragmentInput input) : SV_Target half4 color = UniversalFragmentPBR(inputData, albedo, metallic, specular, smoothness, occlusion, emission, alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl index 4d3d4f38893..fb8d61886be 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLitForwardPass.hlsl @@ -168,6 +168,8 @@ half4 ParticlesLitFragment(VaryingsParticle input) : SV_Target surfaceData.metallic, half3(0, 0, 0), surfaceData.smoothness, surfaceData.occlusion, surfaceData.emission, surfaceData.alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl index 7a89ac71082..ecb19c76ee6 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLitForwardPass.hlsl @@ -178,6 +178,8 @@ half4 ParticlesLitFragment(VaryingsParticle input) : SV_Target half4 color = UniversalFragmentBlinnPhong(inputData, diffuse, specularGloss, shininess, emission, alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; } diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl index d9f84e0eddd..39f41471245 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlitForwardPass.hlsl @@ -155,6 +155,8 @@ half4 fragParticleUnlit(VaryingsParticle input) : SV_Target half3 result = albedo.rgb + emission; half fogFactor = input.positionWS.w; result = MixFogColor(result, half3(0, 0, 0), fogFactor); + albedo.a = OutputAlpha(albedo.a); + return half4(result, albedo.a); } diff --git a/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader b/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader index 63f3b3e1f89..a2987651121 100644 --- a/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader +++ b/com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader @@ -38,8 +38,17 @@ Shader "Hidden/Universal Render Pipeline/BokehDepthOfField" { UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + uint w; + uint h; +#if defined(UNITY_STEREO_INSTANCING_ENABLED) || defined(UNITY_STEREO_MULTIVIEW_ENABLED) + uint x; + _CameraDepthTexture.GetDimensions(w, h, x); +#else + _CameraDepthTexture.GetDimensions(w, h); +#endif + float2 uv = UnityStereoTransformScreenSpaceTex(input.uv); - float depth = LOAD_TEXTURE2D_X(_CameraDepthTexture, _MainTex_TexelSize.zw * uv).x; + float depth = LOAD_TEXTURE2D_X(_CameraDepthTexture, float2(w, h) * uv).x; float linearEyeDepth = LinearEyeDepth(depth, _ZBufferParams); half coc = (1.0 - FocusDist / linearEyeDepth) * MaxCoC; diff --git a/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl b/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl index 7c723b514a2..ee475243c6a 100644 --- a/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/SimpleLitForwardPass.hlsl @@ -141,6 +141,8 @@ half4 LitPassFragmentSimple(Varyings input) : SV_Target half4 color = UniversalFragmentBlinnPhong(inputData, diffuse, specular, smoothness, emission, alpha); color.rgb = MixFog(color.rgb, inputData.fogCoord); + color.a = OutputAlpha(color.a); + return color; }; diff --git a/com.unity.render-pipelines.universal/Shaders/Unlit.shader b/com.unity.render-pipelines.universal/Shaders/Unlit.shader index 192ef5efbf6..3ab3ed864d4 100644 --- a/com.unity.render-pipelines.universal/Shaders/Unlit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Unlit.shader @@ -101,7 +101,8 @@ Shader "Universal Render Pipeline/Unlit" #endif color = MixFog(color, input.fogCoord); - + alpha = OutputAlpha(alpha); + return half4(color, alpha); } ENDHLSL diff --git a/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl b/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl index 814ee62197d..2881a2a9346 100644 --- a/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepthPass.hlsl @@ -3,6 +3,16 @@ #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" +#if defined(_DEPTH_MSAA_2) + #define MSAA_SAMPLES 2 +#elif defined(_DEPTH_MSAA_4) + #define MSAA_SAMPLES 4 +#elif defined(_DEPTH_MSAA_8) + #define MSAA_SAMPLES 8 +#else + #define MSAA_SAMPLES 1 +#endif + half4 _ScaleBiasRT; struct Attributes @@ -59,16 +69,6 @@ Varyings vert(Attributes input) #define SAMPLE(uv) SAMPLE_DEPTH_TEXTURE(_CameraDepthAttachment, sampler_CameraDepthAttachment, uv) #endif -#if defined(_DEPTH_MSAA_2) - #define MSAA_SAMPLES 2 -#elif defined(_DEPTH_MSAA_4) - #define MSAA_SAMPLES 4 -#elif defined(_DEPTH_MSAA_8) - #define MSAA_SAMPLES 8 -#else - #define MSAA_SAMPLES 1 -#endif - #if MSAA_SAMPLES == 1 DEPTH_TEXTURE(_CameraDepthAttachment); SAMPLER(sampler_CameraDepthAttachment);