From 7dcd6aea449db62446d6bbf87395ceddbfe92671 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 12 Aug 2021 13:49:43 -0700 Subject: [PATCH 01/39] Repoint speedtree8 prefabs to shadergraph --- .../LOD0/Broadleaf_Desktop_Field.mat | 27 ++++++++++++++++--- .../LOD0/Main_Bark.mat | 27 ++++++++++++++++--- .../LOD1/Broadleaf_Desktop_Field.mat | 25 +++++++++++++++-- .../LOD1/Main_Bark.mat | 25 +++++++++++++++-- .../LOD2/Broadleaf_Desktop_Field.mat | 27 ++++++++++++++++--- .../LOD2/Main_Bark.mat | 27 ++++++++++++++++--- .../Broadleaf_Desktop_Field_Billboard.mat | 27 ++++++++++++++++--- .../LOD0/Broadleaf_Desktop_Field.mat | 26 +++++++++++++++--- .../LOD0/Main_Bark.mat | 25 +++++++++++++++-- .../LOD1/Broadleaf_Desktop_Field.mat | 26 +++++++++++++++--- .../LOD1/Main_Bark.mat | 25 +++++++++++++++-- .../LOD2/Broadleaf_Desktop_Field.mat | 26 +++++++++++++++--- .../LOD2/Main_Bark.mat | 25 +++++++++++++++-- .../Broadleaf_Desktop_Field_Billboard.mat | 26 +++++++++++++++--- 14 files changed, 327 insertions(+), 37 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat index 22335fa6912..e3653a6a03a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -8,8 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_EXTRA_TEX _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -35,18 +36,38 @@ Material: m_Texture: {fileID: 2800000, guid: 911b053630901ad40ae50a7421dbdede, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 0 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 0 - - _WindQuality: 4 + - _WINDQUALITY: 4 + - _WindQuality: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat index ab7be53b36d..22ea78d6852 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat @@ -21,8 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Main_Bark - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_EXTRA_TEX _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -48,18 +49,38 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 0 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 - - _WindQuality: 4 + - _WINDQUALITY: 4 + - _WindQuality: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat index 01ed1ba5243..5bde6ca5846 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -8,8 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_EXTRA_TEX _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -35,17 +36,37 @@ Material: m_Texture: {fileID: 2800000, guid: 911b053630901ad40ae50a7421dbdede, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 0 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat index 3283ac58133..2ff2d8340c9 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat @@ -21,8 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Main_Bark - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_EXTRA_TEX _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -48,17 +49,37 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat index 22b121191b6..a39d1f9fc3c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -8,8 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_EXTRA_TEX _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -35,18 +36,38 @@ Material: m_Texture: {fileID: 2800000, guid: 911b053630901ad40ae50a7421dbdede, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 0 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 0 - - _WindQuality: 4 + - _WINDQUALITY: 4 + - _WindQuality: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat index b84effb6768..70976edc6b0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat @@ -21,8 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Main_Bark - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_EXTRA_TEX _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -48,18 +49,38 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 0 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 - - _WindQuality: 4 + - _WINDQUALITY: 4 + - _WindQuality: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index e1a1a5021f5..6fa2ac980b7 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -21,8 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field_Billboard - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BILLBOARD EFFECT_EXTRA_TEX _WINDQUALITY_FASTEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -48,18 +49,38 @@ Material: m_Texture: {fileID: 2800000, guid: b3532f679eaea8f46aca30c6e6c091a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 1 + - EFFECT_EXTRA_TEX: 0 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 1 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 0 - _Metallic: 0 - _NormalMapKwToggle: 0 + - _OldHueVarBehavior: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 - - _WindQuality: 1 + - _WINDQUALITY: 4 + - _WindQuality: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat index 1da54ac3a62..f1e6acc5e6c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -21,9 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION EFFECT_SUBSURFACE - _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -49,17 +49,37 @@ Material: m_Texture: {fileID: 2800000, guid: 911b053630901ad40ae50a7421dbdede, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 1 - _TwoSided: 0 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat index 800e4d3eda7..5fe046d6870 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat @@ -21,8 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Main_Bark - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -48,17 +49,37 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat index 88dea8b3d30..dfd83d55279 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -21,9 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION EFFECT_SUBSURFACE - _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -49,17 +49,37 @@ Material: m_Texture: {fileID: 2800000, guid: 911b053630901ad40ae50a7421dbdede, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 1 - _TwoSided: 0 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat index cfe1be03fab..321c6b8174b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat @@ -21,8 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Main_Bark - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -48,17 +49,37 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat index 34fe625ba74..406fff485a2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -8,9 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION EFFECT_SUBSURFACE - _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -36,17 +36,37 @@ Material: m_Texture: {fileID: 2800000, guid: 911b053630901ad40ae50a7421dbdede, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 1 - _TwoSided: 0 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat index cf4ff5590a2..2ff3fdc4784 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat @@ -8,8 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Main_Bark - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION _WINDQUALITY_BEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -35,17 +36,37 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 0 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 + - _WINDQUALITY: 4 - _WindQuality: 4 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 94f7f975aa8..792c0be8967 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -21,9 +21,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Broadleaf_Desktop_Field_Billboard - m_Shader: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - m_ShaderKeywords: EFFECT_BILLBOARD EFFECT_BUMP EFFECT_EXTRA_TEX EFFECT_HUE_VARIATION - EFFECT_SUBSURFACE _WINDQUALITY_FASTEST + m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, + type: 3} + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_BEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -49,17 +49,37 @@ Material: m_Texture: {fileID: 2800000, guid: b3532f679eaea8f46aca30c6e6c091a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - BACKFACE_NORMAL_MODE: 1 + - EFFECT_BILLBOARD: 1 + - EFFECT_EXTRA_TEX: 1 + - _AlphaClipThreshold: 0.33 - _BillboardKwToggle: 1 - _BillboardShadowFade: 0.5 - _Glossiness: 0.5 - _HueVariationKwToggle: 1 - _Metallic: 0 - _NormalMapKwToggle: 1 + - _OldHueVarBehavior: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 1 - _TwoSided: 2 + - _WINDQUALITY: 4 - _WindQuality: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} From f162d51dd02267c0b191e4085dc50ac781843c2f Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 12 Aug 2021 14:36:55 -0700 Subject: [PATCH 02/39] Save test scene --- .../Assets/Scenes/058_SpeedTree_V8.unity | 166 +++++++++++++++++- .../Scenes/058_SpeedTree_V8Settings.lighting | 5 +- 2 files changed, 167 insertions(+), 4 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index f5e2231dd65..5e9a4bb998d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000004, guid: 3fd48ca9726b34f998faa4e29306e4ec, + m_LightingDataAsset: {fileID: 112000004, guid: 50c3348b53132fa4aa6e0a605c646750, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: e2c62cc492f7f3945b1b1ac901ffc5e8, type: 2} @@ -526,6 +526,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 22.5} m_LocalScale: {x: 10, y: 1, z: 10} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 15 @@ -590,6 +591,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1 m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 0 m_Antialiasing: 0 m_AntialiasingQuality: 2 @@ -653,6 +655,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 34.6, y: 9.6, z: 22.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -696,6 +699,7 @@ MonoBehaviour: ActivePixelTests: 7 WaitFrames: 0 XRCompatible: 1 + CheckMemoryAllocation: 1 --- !u!1 &516620772 GameObject: m_ObjectHideFlags: 0 @@ -706,6 +710,7 @@ GameObject: m_Component: - component: {fileID: 516620774} - component: {fileID: 516620773} + - component: {fileID: 516620775} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -785,10 +790,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 26.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &516620775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516620772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1 &707831285 GameObject: m_ObjectHideFlags: 0 @@ -799,6 +825,7 @@ GameObject: m_Component: - component: {fileID: 707831287} - component: {fileID: 707831286} + - component: {fileID: 707831288} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -878,10 +905,31 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &707831288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707831285} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1001 &747708796 PrefabInstance: m_ObjectHideFlags: 0 @@ -1091,6 +1139,7 @@ GameObject: m_Component: - component: {fileID: 819651149} - component: {fileID: 819651148} + - component: {fileID: 819651150} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -1170,10 +1219,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.03, y: 10, z: 2.93} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &819651150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819651147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1 &845027878 GameObject: m_ObjectHideFlags: 0 @@ -1266,6 +1336,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.25, y: 3.44, z: 40.646} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 16 @@ -1280,6 +1351,7 @@ GameObject: m_Component: - component: {fileID: 1071057505} - component: {fileID: 1071057504} + - component: {fileID: 1071057506} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -1359,10 +1431,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 18.75} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1071057506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071057503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1 &1133241750 GameObject: m_ObjectHideFlags: 0 @@ -1418,6 +1511,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.18, y: 4.58, z: 45.15} m_LocalScale: {x: 3.0652597, y: 4.0427527, z: 2.352359} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 17 @@ -1596,6 +1690,7 @@ GameObject: m_Component: - component: {fileID: 1477893691} - component: {fileID: 1477893690} + - component: {fileID: 1477893692} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -1675,10 +1770,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.61, y: 10, z: 41.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1477893692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477893689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1001 &1565034107 PrefabInstance: m_ObjectHideFlags: 0 @@ -1863,6 +1979,7 @@ GameObject: m_Component: - component: {fileID: 1567784503} - component: {fileID: 1567784502} + - component: {fileID: 1567784504} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -1942,10 +2059,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 33.75} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1567784504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1567784501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1 &1721950901 GameObject: m_ObjectHideFlags: 0 @@ -1956,6 +2094,7 @@ GameObject: m_Component: - component: {fileID: 1721950903} - component: {fileID: 1721950902} + - component: {fileID: 1721950904} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -2035,10 +2174,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 11.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1721950904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721950901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1001 &1822696044 PrefabInstance: m_ObjectHideFlags: 0 @@ -2268,6 +2428,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.18, y: 4.58, z: 37.5} m_LocalScale: {x: 3.0652597, y: 4.0427527, z: 2.352359} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 18 @@ -2364,6 +2525,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.25, y: 3.44, z: 4.09} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 19 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8Settings.lighting b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8Settings.lighting index dd4eae6f79c..bfa277a563b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8Settings.lighting +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8Settings.lighting @@ -7,7 +7,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 058_SpeedTree_V8Settings - serializedVersion: 3 + serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -20,7 +20,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 2 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -61,3 +61,4 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 From f63893936b477f54b9bf741a2aff3d3c002260e0 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 17 Aug 2021 14:57:24 -0700 Subject: [PATCH 03/39] Update ST8 test scene to test the ST8 shadergraph. Modify test conditions to ensure failures are caught. --- .../SpeedTree/SpeedTreeTestSetup.cs | 4 + .../Direct3D11/None/058_SpeedTree_V8.png | 4 +- .../Assets/Scenes/058_SpeedTree_V8.unity | 435 ++++++++++++++---- 3 files changed, 356 insertions(+), 87 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeTestSetup.cs b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeTestSetup.cs index 3e027c0def0..d6315245d02 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeTestSetup.cs +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeTestSetup.cs @@ -13,6 +13,8 @@ void OnEnable() var lwAsset = (UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset)GraphicsSettings.renderPipelineAsset; distance = lwAsset.shadowDistance; lwAsset.shadowDistance = 1000.0f; + lodBias = QualitySettings.lodBias; + QualitySettings.lodBias = 1.0f; } } @@ -22,8 +24,10 @@ void OnDisable() { var lwAsset = (UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset)GraphicsSettings.renderPipelineAsset; lwAsset.shadowDistance = distance; + QualitySettings.lodBias = lodBias; } } float distance = 0.0f; + float lodBias = 1.0f; } diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index 34e19ab75b2..760b0388aa4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:d4ed406568eeb69db0c4ae1d75a2a28ffab4d2d883b26c512d33fff75226b1bb +size 843191 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 5e9a4bb998d..44b7819afe0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -125,12 +125,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &97827588 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, + type: 3} + m_PrefabInstance: {fileID: 126918510} + m_PrefabAsset: {fileID: 0} --- !u!1001 &102272075 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1046155036} m_Modifications: - target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -145,7 +151,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_RootOrder - value: 10 + value: 4 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -175,7 +181,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.z - value: 30 + value: 14.23 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -185,17 +191,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -225,7 +231,7 @@ PrefabInstance: - target: {fileID: -927199367670048503, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -274,7 +280,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1215022218} m_Modifications: - target: {fileID: -8468506237607346234, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -289,7 +295,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_RootOrder - value: 6 + value: 2 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -319,7 +325,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalPosition.z - value: 15 + value: 8.509998 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -329,17 +335,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -409,7 +415,7 @@ PrefabInstance: - target: {fileID: 5551014577142218206, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LODs.Array.data[2].screenRelativeHeight - value: 0 + value: 0.999 objectReference: {fileID: 0} - target: {fileID: 5551014577142218206, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -529,8 +535,20 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &379755942 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, + type: 3} + m_PrefabInstance: {fileID: 1822696044} + m_PrefabAsset: {fileID: 0} +--- !u!4 &380150166 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, + type: 3} + m_PrefabInstance: {fileID: 1204085009} + m_PrefabAsset: {fileID: 0} --- !u!1 &380492249 GameObject: m_ObjectHideFlags: 0 @@ -627,7 +645,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60 + field of view: 26.991467 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -652,14 +670,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 380492249} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 34.6, y: 9.6, z: 22.5} + m_LocalRotation: {x: 0.14971471, y: -0.6910756, z: 0.14971471, w: 0.6910756} + m_LocalPosition: {x: 27.66, y: 15.88, z: 29.94} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 24.447, y: -90, z: 0} --- !u!114 &380492255 MonoBehaviour: m_ObjectHideFlags: 0 @@ -695,11 +713,23 @@ MonoBehaviour: UseHDR: 0 UseBackBuffer: 0 ImageResolution: 0 - ActiveImageTests: 1 + ActiveImageTests: 2147483647 ActivePixelTests: 7 WaitFrames: 0 XRCompatible: 1 CheckMemoryAllocation: 1 +--- !u!4 &436143176 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, + type: 3} + m_PrefabInstance: {fileID: 2055084467} + m_PrefabAsset: {fileID: 0} +--- !u!4 &481120010 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, + type: 3} + m_PrefabInstance: {fileID: 102272075} + m_PrefabAsset: {fileID: 0} --- !u!1 &516620772 GameObject: m_ObjectHideFlags: 0 @@ -787,13 +817,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516620772} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 26.25} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 10, z: 10.48} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 1046155036} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &516620775 MonoBehaviour: @@ -935,7 +965,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1046155036} m_Modifications: - target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -980,7 +1010,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1010,7 +1040,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.z - value: 7.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1020,17 +1050,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1216,13 +1246,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 819651147} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.03, y: 10, z: 2.93} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.029999733, y: 10, z: 4.6099987} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1215022218} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &819651150 MonoBehaviour: @@ -1339,7 +1369,86 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &881175520 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, + type: 3} + m_PrefabInstance: {fileID: 1565034107} + m_PrefabAsset: {fileID: 0} +--- !u!1 &890409632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 890409633} + m_Layer: 0 + m_Name: OptionsOn_Probes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &890409633 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 890409632} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.58, y: 10, z: 22.37} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1567784503} + - {fileID: 436143176} + - {fileID: 1477893691} + - {fileID: 380150166} + - {fileID: 1133241752} + - {fileID: 1849561110} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1046155035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1046155036} + m_Layer: 0 + m_Name: OptionsOn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1046155036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046155035} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 22.880001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1353309969} + - {fileID: 1721950903} + - {fileID: 379755942} + - {fileID: 516620774} + - {fileID: 481120010} + m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1071057503 GameObject: @@ -1428,13 +1537,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1071057503} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 18.75} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 10, z: 12.259998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 1215022218} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1071057506 MonoBehaviour: @@ -1508,20 +1617,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1133241750} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.18, y: 4.58, z: 45.15} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.17999983, y: -5.42, z: 11.400002} m_LocalScale: {x: 3.0652597, y: 4.0427527, z: 2.352359} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 890409633} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1204085009 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 890409633} m_Modifications: - target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1541,7 +1650,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_RootOrder - value: 14 + value: 3 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1566,12 +1675,12 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.z - value: 45 + value: 11.25 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1581,17 +1690,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -1680,6 +1789,47 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80e30858b19da7c4280442f8a756f145, type: 3} +--- !u!1 &1215022217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1215022218} + m_Layer: 0 + m_Name: OptionsOff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1215022218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215022217} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.9, y: 0, z: 25.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 881175520} + - {fileID: 819651149} + - {fileID: 97827588} + - {fileID: 1071057505} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1353309969 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, + type: 3} + m_PrefabInstance: {fileID: 747708796} + m_PrefabAsset: {fileID: 0} --- !u!1 &1477893689 GameObject: m_ObjectHideFlags: 0 @@ -1767,13 +1917,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477893689} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.61, y: 10, z: 41.25} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.6099997, y: 0, z: 7.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 + m_Father: {fileID: 890409633} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1477893692 MonoBehaviour: @@ -1800,7 +1950,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1215022218} m_Modifications: - target: {fileID: -8468506237607346234, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -1825,7 +1975,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -1865,17 +2015,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 963e0425798c18546a875cb71184f8a4, type: 3} @@ -2056,13 +2206,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1567784501} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 33.75} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 + m_Father: {fileID: 890409633} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1567784504 MonoBehaviour: @@ -2171,13 +2321,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721950901} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 11.25} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 10, z: 3.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1046155036} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1721950904 MonoBehaviour: @@ -2204,7 +2354,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1046155036} m_Modifications: - target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2229,7 +2379,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_RootOrder - value: 8 + value: 2 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2259,7 +2409,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.z - value: 22.5 + value: 6.7299995 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2269,17 +2419,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2373,6 +2523,121 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80e30858b19da7c4280442f8a756f145, type: 3} +--- !u!1 &1831320762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1831320765} + - component: {fileID: 1831320764} + - component: {fileID: 1831320763} + m_Layer: 0 + m_Name: Point Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1831320763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831320762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!108 &1831320764 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831320762} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 0.5577354, g: 0.39999998, b: 0.9137255, a: 1} + m_Intensity: 100 + m_Range: 7.5 + 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_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1831320765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831320762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.8700004, y: 10, z: 22.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1849561108 GameObject: m_ObjectHideFlags: 0 @@ -2425,13 +2690,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1849561108} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.18, y: 4.58, z: 37.5} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.17999983, y: -5.42, z: 3.75} m_LocalScale: {x: 3.0652597, y: 4.0427527, z: 2.352359} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 18 + m_Father: {fileID: 890409633} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1941276851 GameObject: @@ -2528,14 +2793,14 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2055084467 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 890409633} m_Modifications: - target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2555,7 +2820,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_RootOrder - value: 12 + value: 1 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2580,12 +2845,12 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalPosition.z - value: 37.5 + value: 3.75 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} @@ -2595,17 +2860,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 80e30858b19da7c4280442f8a756f145, type: 3} From 7364763ab707f45baf9e480f10436065c7a05b3c Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 19 Aug 2021 16:25:55 -0700 Subject: [PATCH 04/39] Make the ST8 shadergraph the default ST8 shader for Universal --- .../Editor/SpeedTree8MaterialUpgrader.cs | 8 ++----- .../Nature/HDSpeedTree8MaterialUpgrader.cs | 4 ++++ .../MaterialPostprocessor.cs | 15 ++++++++++++ .../Editor/ShaderUtils.cs | 3 +++ ...UniversalRenderPipelineMaterialUpgrader.cs | 9 +++++-- ...iversalRenderPipelineEditorResources.asset | 24 +++++++------------ .../UniversalRenderPipelineEditorResources.cs | 2 +- .../Runtime/ShaderUtils.cs | 4 ++-- 8 files changed, 42 insertions(+), 27 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs index 2f2b3b6913c..f732daeea02 100644 --- a/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs @@ -41,7 +41,6 @@ public SpeedTree8MaterialUpgrader(string sourceShaderName, string destShaderName { RenameShader(sourceShaderName, destShaderName, finalizer); RenameFloat("_WindQuality", "_WINDQUALITY"); - RenameFloat("_TwoSided", "_CullMode"); // Currently only used in HD. Update this once URP per-material cullmode is enabled via shadergraph. } private static void ImportNewSpeedTree8Material(Material mat, int windQuality, bool isBillboard) @@ -56,8 +55,8 @@ private static void ImportNewSpeedTree8Material(Material mat, int windQuality, b mat.SetFloat("EFFECT_BILLBOARD", 1.0f); cullmode = 2; } - if (mat.HasProperty("_CullMode")) - mat.SetFloat("_CullMode", cullmode); + + mat.SetFloat("_TwoSided", cullmode); // Temporary; Finalizer should read from this and apply the value to a pipeline-specific cull property if (mat.IsKeywordEnabled("EFFECT_EXTRA_TEX")) mat.SetFloat("EFFECT_EXTRA_TEX", 1.0f); @@ -102,9 +101,6 @@ public static void PostprocessSpeedTree8Materials(GameObject speedtree, SpeedTre /// SpeedTree 8 material to upgrade. public static void SpeedTree8MaterialFinalizer(Material material) { - if (material.HasProperty("_TwoSided") && material.HasProperty("_CullMode")) - material.SetFloat("_CullMode", material.GetFloat("_TwoSided")); - if (material.IsKeywordEnabled("EFFECT_EXTRA_TEX")) material.SetFloat("EFFECT_EXTRA_TEX", 1.0f); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs index 46589a64374..d0fc2c30556 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs @@ -16,6 +16,7 @@ class HDSpeedTree8MaterialUpgrader : SpeedTree8MaterialUpgrader public HDSpeedTree8MaterialUpgrader(string sourceShaderName, string destShaderName) : base(sourceShaderName, destShaderName, HDSpeedTree8MaterialFinalizer) { + RenameFloat("_TwoSided", "_CullMode"); } public static void HDSpeedTree8MaterialFinalizer(Material mat) @@ -62,6 +63,9 @@ private static void SetHDSpeedTree8Defaults(Material mat) mat.SetFloat("_DoubleSidedEnable", 1.0f); } + if (mat.HasFloat("_TwoSided")) + mat.SetFloat("_CullMode", mat.GetFloat("_TwoSided")); + SetDefaultDiffusionProfile(mat); } diff --git a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs index fbd6931befe..e8e1b5b9bf6 100644 --- a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs @@ -119,6 +119,21 @@ static internal void SaveAssetsToDisk() s_NeedsSavingAssets = false; } + static private void UniversalSpeedTree8MaterialImportFinalizer(Material mat) + { + if (mat.HasFloat("_TwoSided")) + mat.SetFloat(Property.CullMode, mat.GetFloat("_TwoSided")); + UpdateMaterial(mat, + MaterialUpdateType.CreatedNewMaterial, + ShaderID.SpeedTree8); + } + + void OnPostprocessSpeedTree(GameObject speedTree) + { + SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; + SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8MaterialImportFinalizer); + } + static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths) { string upgradeLog = ""; diff --git a/com.unity.render-pipelines.universal/Editor/ShaderUtils.cs b/com.unity.render-pipelines.universal/Editor/ShaderUtils.cs index 43bbbd6358c..9cfd323f2db 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderUtils.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderUtils.cs @@ -90,6 +90,9 @@ internal static void UpdateMaterial(Material material, MaterialUpdateType update case ShaderID.ParticlesUnlit: ParticlesUnlitShader.SetMaterialKeywords(material, null, ParticleGUI.SetMaterialKeywords); break; + case ShaderID.SpeedTree8: + ShaderGraphLitGUI.UpdateMaterial(material, updateType); + break; case ShaderID.SG_Lit: ShaderGraphLitGUI.UpdateMaterial(material, updateType); break; diff --git a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs index e981730c32c..d74712e60c6 100644 --- a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs +++ b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs @@ -4,7 +4,9 @@ using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; +using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("MaterialPostprocessor")] namespace UnityEditor.Rendering.Universal { internal sealed class UniversalRenderPipelineMaterialUpgrader : RenderPipelineConverter @@ -68,6 +70,7 @@ private static void GetShaderNamesToIgnore(ref HashSet shadersToIgnore) shadersToIgnore.Add("Universal Render Pipeline/Nature/SpeedTree7"); shadersToIgnore.Add("Universal Render Pipeline/Nature/SpeedTree7 Billboard"); shadersToIgnore.Add("Universal Render Pipeline/Nature/SpeedTree8"); + shadersToIgnore.Add("Universal Render Pipeline/Nature/SpeedTree8_PBRLit"); shadersToIgnore.Add("Universal Render Pipeline/2D/Sprite-Lit-Default"); shadersToIgnore.Add("Universal Render Pipeline/Terrain/Lit"); shadersToIgnore.Add("Universal Render Pipeline/Unlit"); @@ -528,11 +531,13 @@ internal SpeedTreeBillboardUpgrader(string oldShaderName) RenameShader(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree7Billboard)); } } - internal class SpeedTree8Upgrader : MaterialUpgrader + + internal class SpeedTree8Upgrader : SpeedTree8MaterialUpgrader { internal SpeedTree8Upgrader(string oldShaderName) + : base(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8), SpeedTree8MaterialFinalizer) { - RenameShader(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8)); + RenameFloat("_TwoSided", Property.CullMode); } } diff --git a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.asset b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.asset index cb268b27106..1a296dc499a 100644 --- a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.asset +++ b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.asset @@ -13,22 +13,14 @@ MonoBehaviour: m_Name: UniversalRenderPipelineEditorResources m_EditorClassIdentifier: shaders: - autodeskInteractivePS: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, - type: 3} - autodeskInteractiveTransparentPS: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, - type: 3} - autodeskInteractiveMaskedPS: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, - type: 3} - terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, - type: 3} - terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, - type: 3} - terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, - type: 3} - defaultSpeedTree7PS: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, - type: 3} - defaultSpeedTree8PS: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, - type: 3} + autodeskInteractivePS: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + autodeskInteractiveTransparentPS: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + autodeskInteractiveMaskedPS: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + defaultSpeedTree7PS: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + defaultSpeedTree8PS: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} materials: lit: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} particleLit: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} diff --git a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.cs b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.cs index d94861a54e8..6175fcf8736 100644 --- a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.cs +++ b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineEditorResources.cs @@ -28,7 +28,7 @@ public sealed class ShaderResources [Reload("Shaders/Nature/SpeedTree7.shader")] public Shader defaultSpeedTree7PS; - [Reload("Shaders/Nature/SpeedTree8.shader")] + [Reload("Shaders/Nature/SpeedTree8_PBRLit.shadergraph")] public Shader defaultSpeedTree8PS; } diff --git a/com.unity.render-pipelines.universal/Runtime/ShaderUtils.cs b/com.unity.render-pipelines.universal/Runtime/ShaderUtils.cs index 709de2b0b52..91c14793f99 100644 --- a/com.unity.render-pipelines.universal/Runtime/ShaderUtils.cs +++ b/com.unity.render-pipelines.universal/Runtime/ShaderUtils.cs @@ -33,7 +33,7 @@ public static class ShaderUtils "Universal Render Pipeline/Baked Lit", "Universal Render Pipeline/Nature/SpeedTree7", "Universal Render Pipeline/Nature/SpeedTree7 Billboard", - "Universal Render Pipeline/Nature/SpeedTree8", + "Universal Render Pipeline/Nature/SpeedTree8_PBRLit", }; public static string GetShaderPath(ShaderPathID id) @@ -71,7 +71,7 @@ public static bool IsLWShader(Shader shader) "0ca6dca7396eb48e5849247ffd444914", "0f4122b9a743b744abe2fb6a0a88868b", "5ec81c81908db34429b4f6ddecadd3bd", - "99134b1f0c27d54469a840832a28fadf", + "9920c1f1781549a46ba081a2a15a16ec", }; internal static string GetShaderGUID(ShaderPathID id) From c037ecce54effd54850c0d76e06d2364f1dba242 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Mon, 27 Sep 2021 16:55:25 -0700 Subject: [PATCH 05/39] Update URP ST8 upgrader to work with the ST8 shadergraph. Convert keywords to properties where needed. --- .../Editor/SpeedTree8MaterialUpgrader.cs | 19 ++++++++----------- ...UniversalRenderPipelineMaterialUpgrader.cs | 13 ++++++++++++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs index f732daeea02..dd9d8d1453e 100644 --- a/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs @@ -41,6 +41,11 @@ public SpeedTree8MaterialUpgrader(string sourceShaderName, string destShaderName { RenameShader(sourceShaderName, destShaderName, finalizer); RenameFloat("_WindQuality", "_WINDQUALITY"); + RenameFloat("_BillboardKwToggle", "EFFECT_BILLBOARD"); + RenameKeywordToFloat("EFFECT_EXTRA_TEX", "EFFECT_EXTRA_TEX", 1, 0); + RenameKeywordToFloat("EFFECT_SUBSURFACE", "_SubsurfaceKwToggle", 1, 0); + RenameKeywordToFloat("EFFECT_BUMP", "_NormalMapKwToggle", 1, 0); + RenameKeywordToFloat("EFFECT_HUE_VARIATION", "_HueVariationKwToggle", 1, 0); } private static void ImportNewSpeedTree8Material(Material mat, int windQuality, bool isBillboard) @@ -95,19 +100,12 @@ public static void PostprocessSpeedTree8Materials(GameObject speedtree, SpeedTre /// /// Preserves wind quality and billboard settings while you are upgrading a SpeedTree 8 material from previous versions of SpeedTree 8. - /// Wind priority order is enabled keyword > _WindQuality float value. + /// Wind priority order is _WindQuality float value > enabled keyword. /// Should work for upgrading versions within a pipeline and from standard to current pipeline. /// /// SpeedTree 8 material to upgrade. public static void SpeedTree8MaterialFinalizer(Material material) { - if (material.IsKeywordEnabled("EFFECT_EXTRA_TEX")) - material.SetFloat("EFFECT_EXTRA_TEX", 1.0f); - - bool isBillboard = material.IsKeywordEnabled("EFFECT_BILLBOARD"); - if (material.HasProperty("EFFECT_BILLBOARD")) - material.SetFloat("EFFECT_BILLBOARD", isBillboard ? 1.0f : 0.0f); - UpgradeWindQuality(material); } @@ -123,11 +121,10 @@ private static int GetWindQuality(Material material, int windQuality = -1) // input WindQuality > enabled keyword > _WindQuality float value if (!WindIntValid(windQuality)) { - windQuality = GetWindQualityFromKeywords(material.shaderKeywords); + windQuality = material.HasProperty("_WindQuality") ? (int)material.GetFloat("_WindQuality") : 0; if (!WindIntValid(windQuality)) { - windQuality = material.HasProperty("_WindQuality") ? (int)material.GetFloat("_WindQuality") : 0; - + windQuality = GetWindQualityFromKeywords(material.shaderKeywords); if (!WindIntValid(windQuality)) windQuality = 0; } diff --git a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs index 55b0be57cef..f36d4dd7632 100644 --- a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs +++ b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs @@ -551,10 +551,21 @@ internal SpeedTreeBillboardUpgrader(string oldShaderName) internal class SpeedTree8Upgrader : SpeedTree8MaterialUpgrader { internal SpeedTree8Upgrader(string oldShaderName) - : base(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8), SpeedTree8MaterialFinalizer) + : base(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8), UniversalSpeedTree8MaterialFinalizer) { RenameFloat("_TwoSided", Property.CullMode); } + static public void UniversalSpeedTree8MaterialFinalizer(Material mat) + { + SpeedTree8MaterialFinalizer(mat); + + if (mat.HasFloat("_TwoSided")) + mat.SetFloat(Property.CullMode, mat.GetFloat("_TwoSided")); + + Unity.Rendering.Universal.ShaderUtils.UpdateMaterial(mat, + Unity.Rendering.Universal.ShaderUtils.MaterialUpdateType.CreatedNewMaterial, + Unity.Rendering.Universal.ShaderUtils.ShaderID.SpeedTree8); + } } public class ParticleUpgrader : MaterialUpgrader From b3dbf27542645c053c5fbd2dfc50431a6355bd58 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 11:07:50 -0700 Subject: [PATCH 06/39] Update core and universal changelogs. --- com.unity.render-pipelines.core/CHANGELOG.md | 1 + com.unity.render-pipelines.universal/CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index d59228468e2..b4117933381 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -15,6 +15,7 @@ The version number for this package has increased due to a version update of a r ### Fixed - Fixed black pixel issue in AMD FidelityFX RCAS implementation +- Fixed keyword upgrading for SpeedTree8 shadergraphs ## [12.0.0] - 2021-01-11 diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 2504beb95eb..d1e4836892b 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Removed experimental tile deferred code. - VFX: New shadergraph support directly on Universal target. +- Now using the SpeedTree8 PBRLit shadergraph as the default SpeedTree8 shader for Universal. ### Fixed - Added warning for lit shader detailed abledo, if texture is not linear. [1342011](https://issuetracker.unity3d.com/issues/detail-maps-packed-differently-in-built-in-vs-urp) From bd355abf9f09f475d1c943d7799666c960c51380 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 11:19:18 -0700 Subject: [PATCH 07/39] Update reference images for 058_SpeedTree_V8. --- .../Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png index 34e19ab75b2..e964893a102 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:7815646288c3af40e21bb71009a4473a6940147b48f6ce8dc4b55d32ac0b2bea +size 830115 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png index 34e19ab75b2..4695a0e282e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:b039613b40dd7989f260e4ab33f99050b8f546a778173b231f3089d79cbc07a3 +size 831187 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png index 34e19ab75b2..7fbb9e8a2e9 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:7c4d4c1093cccb97db8bf9bfc9533aa6a56271a21ab2929fcb168881dbfbbb6d +size 844438 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index 760b0388aa4..8bf09f8f0a6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4ed406568eeb69db0c4ae1d75a2a28ffab4d2d883b26c512d33fff75226b1bb -size 843191 +oid sha256:907c18d1df22372787f7456e98e9ce163fa7a1f17360867224984140e8e25361 +size 845884 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png index 34e19ab75b2..a9167124c9c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:7ebda136221dcd04bfc71f8a33401b21ed6e3860ef48beb62636128f235bac2e +size 844546 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png index 34e19ab75b2..4266c74a5ac 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:c1d25a6b3df0d91efc33711b076cfadebc55edc6a0bdcabf5dc57b653d550b1a +size 844546 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png index 34e19ab75b2..96c097a2b2c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d -size 267989 +oid sha256:372383f73ba7d9cfc19040966eeee9c3b69aa35bda603ad5697f1db0f3e36520 +size 830630 From d36220f7b26ad9a09a8184c97d4a259f0d970e4b Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 13:27:09 -0700 Subject: [PATCH 08/39] Test ST8 billboard material should have wind quality fastest. Update ref images. --- .../LOD3/Broadleaf_Desktop_Field_Billboard.mat | 4 ++-- .../LOD3/Broadleaf_Desktop_Field_Billboard.mat | 4 ++-- .../Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 6fa2ac980b7..51fe3286061 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -23,7 +23,7 @@ Material: m_Name: Broadleaf_Desktop_Field_Billboard m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_BEST + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_FASTEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -79,7 +79,7 @@ Material: - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _TwoSided: 2 - - _WINDQUALITY: 4 + - _WINDQUALITY: 1 - _WindQuality: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 792c0be8967..8a6e34a16d2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -23,7 +23,7 @@ Material: m_Name: Broadleaf_Desktop_Field_Billboard m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_BEST + m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_FASTEST m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 @@ -79,7 +79,7 @@ Material: - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 1 - _TwoSided: 2 - - _WINDQUALITY: 4 + - _WINDQUALITY: 1 - _WindQuality: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png index 7fbb9e8a2e9..09c4a9b9470 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c4d4c1093cccb97db8bf9bfc9533aa6a56271a21ab2929fcb168881dbfbbb6d -size 844438 +oid sha256:34e16b7d19f16f19aed633225bb576d41934021a84dedf11314a351554eae6dc +size 844408 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index 8bf09f8f0a6..60b8549fedb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:907c18d1df22372787f7456e98e9ce163fa7a1f17360867224984140e8e25361 -size 845884 +oid sha256:ad637b901ddcafc03a30e274c077acb6935146195ad3a18ef823bd9d61bd0ef5 +size 845852 From 3cdd6ed46fa753dff6816ef6d04a0ddb588a4af1 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 14:23:21 -0700 Subject: [PATCH 09/39] Update transform nodes in ST8 shadersubgraphs --- .../Nature/SpeedTree8Billboard.shadersubgraph | 47 ++++++++++++-- .../SpeedTree8ColorAlpha.shadersubgraph | 61 +++++++++++++++++-- 2 files changed, 98 insertions(+), 10 deletions(-) diff --git a/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8Billboard.shadersubgraph b/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8Billboard.shadersubgraph index 032dbfe3a22..ad67008d27e 100644 --- a/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8Billboard.shadersubgraph +++ b/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8Billboard.shadersubgraph @@ -17,7 +17,12 @@ } ], "m_Keywords": [], - "m_CategoryData": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "081705fd59894b1e9b0f80f52ba23cdf" + } + ], "m_Nodes": [ { "m_Id": "97529629eeb67083922a3aa87bf21b66" @@ -1069,7 +1074,8 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "SpeedTree", "m_GraphPrecision": 0, @@ -1117,6 +1123,8 @@ "m_DefaultReferenceName": "Vector1_2E103E32", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1218,6 +1226,27 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "081705fd59894b1e9b0f80f52ba23cdf", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "cc88b4710cbfeb8ea3bb7bf9a07fbc12" + }, + { + "m_Id": "25c34ca0a45daf8e8b1042f8ec1a30bb" + }, + { + "m_Id": "038009d79142698bb76607e0466409a7" + }, + { + "m_Id": "140e9fdcda3d1a82ad9a7337e1d5c8ec" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1522,7 +1551,7 @@ "m_SlotType": 0, "m_Hidden": false, "m_ShaderOutputName": "NormalTangentSpace", - "m_StageCapability": 2, + "m_StageCapability": 3, "m_Value": { "x": 0.0, "y": 0.0, @@ -1645,6 +1674,8 @@ "m_DefaultReferenceName": "Boolean_1A7045BA", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2154,6 +2185,8 @@ "m_DefaultReferenceName": "Vector3_F863C863", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2562,7 +2595,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.TransformNode", "m_ObjectId": "3a5f67d6e979e88c908d521e864c0a7e", "m_Group": { @@ -3301,7 +3334,7 @@ "m_SlotType": 0, "m_Hidden": false, "m_ShaderOutputName": "NormalWorldSpace", - "m_StageCapability": 2, + "m_StageCapability": 3, "m_Value": { "x": 0.0, "y": 0.0, @@ -3884,7 +3917,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.TransformNode", "m_ObjectId": "77d1caddbcfb888d91c90ef23934b7d7", "m_Group": { @@ -5673,6 +5706,8 @@ "m_DefaultReferenceName": "Vector1_B7478AA2", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, diff --git a/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8ColorAlpha.shadersubgraph b/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8ColorAlpha.shadersubgraph index 7640bc75c47..18a79cc808b 100644 --- a/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8ColorAlpha.shadersubgraph +++ b/com.unity.shadergraph/ShaderGraphLibrary/Nature/SpeedTree8ColorAlpha.shadersubgraph @@ -26,7 +26,12 @@ } ], "m_Keywords": [], - "m_CategoryData": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "41610b9c955045e4985b2a7a3c250128" + } + ], "m_Nodes": [ { "m_Id": "a7cc8110386a4246aca9cd7d92f4547b" @@ -1036,7 +1041,8 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "SpeedTree", "m_GraphPrecision": 1, @@ -1154,6 +1160,8 @@ "m_DefaultReferenceName": "Use_Old_Hue_Variation_Behavior", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1431,7 +1439,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.TransformNode", "m_ObjectId": "16910a20060c43f889cace1d074fd2ca", "m_Group": { @@ -1766,6 +1774,8 @@ "m_DefaultReferenceName": "Hue_Variation_Color", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2075,6 +2085,8 @@ "m_DefaultReferenceName": "Enable_Hue_Variation", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2237,6 +2249,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "41610b9c955045e4985b2a7a3c250128", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "c107c2c9d7004f2995cfb371ea5b9db8" + }, + { + "m_Id": "57f38263249544e3a8912cfa07ee9ec1" + }, + { + "m_Id": "36feafe2c1ab4fd89b8933f1368493ae" + }, + { + "m_Id": "206346d0fe4b4f2f85011c7e43dbaa9c" + }, + { + "m_Id": "068628585360489693fabc221e160d34" + }, + { + "m_Id": "be4498ae834e45b880f9a673b5a1c985" + }, + { + "m_Id": "836bcfd67ee943c3879453a549013794" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -2686,6 +2728,8 @@ "m_DefaultReferenceName": "Color_Tint", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3464,6 +3508,8 @@ "m_DefaultReferenceName": "Crossfade", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4534,6 +4580,8 @@ "m_DefaultReferenceName": "Is_Billboard", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4665,6 +4713,8 @@ "m_DefaultReferenceName": "Base_Map", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4673,6 +4723,8 @@ "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -5833,7 +5885,8 @@ "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { From da7cd90b7cc3c6e743424a31dcb81920c8eaabd3 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 14:24:10 -0700 Subject: [PATCH 10/39] Update ref images. --- .../Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png index e964893a102..c3915daa2b4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7815646288c3af40e21bb71009a4473a6940147b48f6ce8dc4b55d32ac0b2bea -size 830115 +oid sha256:e3d4a372ce0d3c71848cbef9de0ae0942720d600be5fa109f366e8335613bcad +size 830136 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png index 4695a0e282e..e717f2d0d2f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b039613b40dd7989f260e4ab33f99050b8f546a778173b231f3089d79cbc07a3 -size 831187 +oid sha256:78142da7031b280d131868ef2dde778b8f14ce0a8a630829d85473ad2e176ddc +size 831079 From 18764febddcfc3f09e89044406a5f6cfb348ba7a Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 16:37:50 -0700 Subject: [PATCH 11/39] Update ref image from old scene --- .../Linear/Android/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png index ee22bec60b3..4e6bc70d247 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30b6054b4f4c22f9aaf41d3c7a84128ed6be0314a21a236b660afacc3c9faf94 -size 247399 +oid sha256:4a6638fd34f35d430b83976ffe6d622ef1cbde7471052e7dd9317cdd4d34dcb6 +size 830160 From ac424f7de7b0002e8e7af9e4c6c8327a030258cf Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 28 Sep 2021 16:38:14 -0700 Subject: [PATCH 12/39] Increase incorrect pixels threshold --- .../Assets/Scenes/058_SpeedTree_V8.unity | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 44b7819afe0..b7308d19147 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000004, guid: 50c3348b53132fa4aa6e0a605c646750, + m_LightingDataAsset: {fileID: 112000004, guid: 17f5e39894d1a79429cf457fa2325b9a, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: e2c62cc492f7f3945b1b1ac901ffc5e8, type: 2} @@ -705,11 +705,11 @@ MonoBehaviour: ImageComparisonSettings: TargetWidth: 1000 TargetHeight: 600 - PerPixelCorrectnessThreshold: 0.001 + PerPixelCorrectnessThreshold: 0.002 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.005 - IncorrectPixelsThreshold: 0.0000038146973 + IncorrectPixelsThreshold: 0.000006814697 UseHDR: 0 UseBackBuffer: 0 ImageResolution: 0 From 93fd237602c7bb455344ad2f027c0698fcd3e370 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 29 Sep 2021 11:08:08 -0700 Subject: [PATCH 13/39] Clean up HD ST8 upgrades/imports. Add _CullModeForward setup as well. --- .../AssetProcessors/MaterialPostProcessor.cs | 3 --- .../Nature/HDSpeedTree8MaterialUpgrader.cs | 21 ++++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs index a2ccc6dc147..229374a3d32 100644 --- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs @@ -300,9 +300,6 @@ void OnPostprocessMaterial(Material material) if (!HDShaderUtils.IsHDRPShader(material.shader, upgradable: true)) return; - if (HDSpeedTree8MaterialUpgrader.IsHDSpeedTree8Material(material)) - SpeedTree8MaterialUpgrader.SpeedTree8MaterialFinalizer(material); - HDShaderUtils.ResetMaterialKeywords(material); } diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs index 317a2cc9c09..8d64743db4d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs @@ -16,12 +16,16 @@ class HDSpeedTree8MaterialUpgrader : SpeedTree8MaterialUpgrader public HDSpeedTree8MaterialUpgrader(string sourceShaderName, string destShaderName) : base(sourceShaderName, destShaderName, HDSpeedTree8MaterialFinalizer) { + RenameKeywordToFloat("EFFECT_BILLBOARD", "_DoubleSidedEnable", 0, 1); RenameFloat("_TwoSided", "_CullMode"); + RenameFloat("_TwoSided", "_CullModeForward"); } public static void HDSpeedTree8MaterialFinalizer(Material mat) { SetHDSpeedTree8Defaults(mat); + + // Need to call this again after reconfiguring keyword toggles HDShaderUtils.ResetMaterialKeywords(mat); } @@ -52,9 +56,19 @@ public static void RestoreHDSpeedTree8Keywords(Material mat) private const string kDefaultDiffusionProfileName = "Foliage"; private static void SetHDSpeedTree8Defaults(Material mat) { + SetupHDPropertiesOnImport(mat); + SetDefaultDiffusionProfile(mat); + } + + private static void SetupHDPropertiesOnImport(Material mat) + { + // When importing a new SpeedTree8, upgrade/convert has not run beforehand, + // so setup HD-specific properties based on builtin configuration. + // TODO: Only do this if called during OnPostprocessSpeedTree. + // Since _DoubleSidedEnable controls _CullMode in HD, // disable it for billboard LOD. - if (mat.IsKeywordEnabled("EFFECT_BILLBOARD")) + if (mat.GetFloat("EFFECT_BILLBOARD") > 0) { mat.SetFloat("_DoubleSidedEnable", 0.0f); } @@ -64,9 +78,10 @@ private static void SetHDSpeedTree8Defaults(Material mat) } if (mat.HasFloat("_TwoSided")) + { mat.SetFloat("_CullMode", mat.GetFloat("_TwoSided")); - - SetDefaultDiffusionProfile(mat); + mat.SetFloat("_CullModeForward", mat.GetFloat("_TwoSided")); + } } private static void SetDefaultDiffusionProfile(Material mat) From c618ad6600703f5be93999850ff078e8fad348fe Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 29 Sep 2021 11:11:57 -0700 Subject: [PATCH 14/39] Update HD changelog. --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index f3357e9cbd1..3fc4b696dd5 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed the volume not being assigned on some scene templates. - Fixed corruption in player with lightmap uv when Optimize Mesh Data is enabled [1357902] - Fixed a warning to Rendering Debugger Runtime UI when debug shaders are stripped. +- HD's SpeedTree 8 upgrader now sets up CullModeForward as well. ### Changed - Visual Environment ambient mode is now Dynamic by default. From 6976ae087710e71eb742e450e0dbe5ef2dc34597 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 29 Sep 2021 11:18:23 -0700 Subject: [PATCH 15/39] Update WindowsPlayer ref images for URP ST8 test. --- .../Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png index a9167124c9c..116b82ca59e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ebda136221dcd04bfc71f8a33401b21ed6e3860ef48beb62636128f235bac2e -size 844546 +oid sha256:ff446c973cd754e98e8d769647a88ff73830be91f7858e50b14ddb802b69ca21 +size 844556 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png index 4266c74a5ac..0b2c18cec4c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1d25a6b3df0d91efc33711b076cfadebc55edc6a0bdcabf5dc57b653d550b1a -size 844546 +oid sha256:fdee5a4af37c715c4ca1c19f8d7229b2b114edf1a689dfd0e7152beefb7ccbe2 +size 844569 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png index 96c097a2b2c..0e5af2dc889 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:372383f73ba7d9cfc19040966eeee9c3b69aa35bda603ad5697f1db0f3e36520 -size 830630 +oid sha256:18f6e38e36f3fb79a98553efefc3fb99f2bb99c9ed77af8a5fd2233e54cb9c6d +size 830516 From 34e9bb8afbbe50b2e4d2dfe1c125ad618ad8189d Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 29 Sep 2021 15:25:35 -0700 Subject: [PATCH 16/39] Test SpeedTree8 URP_Terrain scene in backbuffer mode so that XR tests don't display "Development Build" text --- .../Assets/Scenes/058_SpeedTree_V8.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index b7308d19147..9fc8cc52742 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -711,7 +711,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.005 IncorrectPixelsThreshold: 0.000006814697 UseHDR: 0 - UseBackBuffer: 0 + UseBackBuffer: 1 ImageResolution: 0 ActiveImageTests: 2147483647 ActivePixelTests: 7 From d59951f59d6d705ebdfe049b6eece70f95102efb Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 29 Sep 2021 16:58:27 -0700 Subject: [PATCH 17/39] Fix expected image dimensions after conversion to backbuffer testing --- .../Assets/Scenes/058_SpeedTree_V8.unity | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 9fc8cc52742..255396799e1 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -703,8 +703,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ImageComparisonSettings: - TargetWidth: 1000 - TargetHeight: 600 + TargetWidth: 1280 + TargetHeight: 720 PerPixelCorrectnessThreshold: 0.002 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 @@ -712,7 +712,7 @@ MonoBehaviour: IncorrectPixelsThreshold: 0.000006814697 UseHDR: 0 UseBackBuffer: 1 - ImageResolution: 0 + ImageResolution: 2 ActiveImageTests: 2147483647 ActivePixelTests: 7 WaitFrames: 0 From 46b7575761ada59d85e695927da63a4fbaf6c9b7 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 30 Sep 2021 09:02:26 -0700 Subject: [PATCH 18/39] Update ST8 ref images after switching to backbuffer testing --- .../Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png index c3915daa2b4..2f87c6854db 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3d4a372ce0d3c71848cbef9de0ae0942720d600be5fa109f366e8335613bcad -size 830136 +oid sha256:71620e210c562491c9d9646227f3e63d949f15410c85d32fe870ae8439c3cc0f +size 2562374 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png index e717f2d0d2f..d6cae9095c5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78142da7031b280d131868ef2dde778b8f14ce0a8a630829d85473ad2e176ddc -size 831079 +oid sha256:76b1a1b29129642568918b29a3e8b6f6b87379074c0ffe95a96c05aeca73e0f5 +size 2456987 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png index 09c4a9b9470..1b2c97d8964 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34e16b7d19f16f19aed633225bb576d41934021a84dedf11314a351554eae6dc -size 844408 +oid sha256:0e96b6b540884d33d45a7b0ba3042de7a97e2c466099e64b744870c298b63f79 +size 2609789 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index 60b8549fedb..adcbb9d2311 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad637b901ddcafc03a30e274c077acb6935146195ad3a18ef823bd9d61bd0ef5 -size 845852 +oid sha256:faa2f87e8d28d8e20bc4898ed152c6039a132833186ec1fcb4b35cb5f6a81afb +size 2607904 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png index 116b82ca59e..f3f4283ae3a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff446c973cd754e98e8d769647a88ff73830be91f7858e50b14ddb802b69ca21 -size 844556 +oid sha256:ec8a88f5f01777d384be78036c6ba21dc3db6f1d7e7ffa14b2c38f42731ecc5d +size 2607391 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png index 0b2c18cec4c..da78099b363 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdee5a4af37c715c4ca1c19f8d7229b2b114edf1a689dfd0e7152beefb7ccbe2 -size 844569 +oid sha256:0d3fa3f0d3970ad1c9b188d7f84f98d2461b26fa95a900b4c54c3781242fb556 +size 2607390 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png index 0e5af2dc889..8305094df14 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18f6e38e36f3fb79a98553efefc3fb99f2bb99c9ed77af8a5fd2233e54cb9c6d -size 830516 +oid sha256:f813236f766a8263cde27316d45a7414f4214b9497e12808bb5badf13e9cd32b +size 2563670 From 4803f7601be8b4f251c7e90a5bd2c67fa4a1bf6e Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 30 Sep 2021 09:10:56 -0700 Subject: [PATCH 19/39] Update android vulkan ref image also --- .../Linear/Android/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png index 4e6bc70d247..6416bb5fd08 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a6638fd34f35d430b83976ffe6d622ef1cbde7471052e7dd9317cdd4d34dcb6 -size 830160 +oid sha256:0d1706dd78d7fa6484fcb54e9a618d8a7e5e8be15208be726ebb0fc4988cd999 +size 2571637 From 1d8c596e97b1c495d586c4709fb94774576b6aae Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 30 Sep 2021 15:57:59 -0700 Subject: [PATCH 20/39] Update ST8 test image resolution to 1280 --- .../Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png index 2f87c6854db..3fc18a4b1bc 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71620e210c562491c9d9646227f3e63d949f15410c85d32fe870ae8439c3cc0f -size 2562374 +oid sha256:1f7dbb8ae89f176f48222e4ed94548ff154350a89dcb7d7e1e844c45fec2d9fc +size 1220786 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png index d6cae9095c5..5efa0eeb4fb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b1a1b29129642568918b29a3e8b6f6b87379074c0ffe95a96c05aeca73e0f5 -size 2456987 +oid sha256:ef19df3ed78e226036578e835851cdfbfddfe146e9f30a6c53b1c47217badad4 +size 1185971 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index adcbb9d2311..7a19e789544 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:faa2f87e8d28d8e20bc4898ed152c6039a132833186ec1fcb4b35cb5f6a81afb -size 2607904 +oid sha256:57c87e38e5314e420578d236618bfb47f6f563f6d93cad74caffa84e038ffa01 +size 1208502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png index f3f4283ae3a..fc7e0dbd511 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec8a88f5f01777d384be78036c6ba21dc3db6f1d7e7ffa14b2c38f42731ecc5d -size 2607391 +oid sha256:369552a5de0a14aae20f9c08cdb9668a87cf77068559bb443f6b1ec8447da17f +size 1222049 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png index da78099b363..fc7e0dbd511 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3fa3f0d3970ad1c9b188d7f84f98d2461b26fa95a900b4c54c3781242fb556 -size 2607390 +oid sha256:369552a5de0a14aae20f9c08cdb9668a87cf77068559bb443f6b1ec8447da17f +size 1222049 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png index 8305094df14..e8f5a29bb1b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f813236f766a8263cde27316d45a7414f4214b9497e12808bb5badf13e9cd32b -size 2563670 +oid sha256:9483bd4254a8cd52e9aec56f86229643a0a3549e9a64ad0d7784bb7c150d4e55 +size 1209717 From c1f382622650c560463e6f81c5a1ab7f785f9d03 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Fri, 1 Oct 2021 10:29:53 -0700 Subject: [PATCH 21/39] Update android and OSX ref images. Increase error threshold. --- .../Linear/Android/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png | 4 ++-- .../Assets/Scenes/058_SpeedTree_V8.unity | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png index 6416bb5fd08..b3c19123339 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d1706dd78d7fa6484fcb54e9a618d8a7e5e8be15208be726ebb0fc4988cd999 -size 2571637 +oid sha256:69ee1b8102639c967b8e1f31d2448e29717e16def5cf4befb60035a8acb7dd0e +size 1222018 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png index 1b2c97d8964..90258854840 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e96b6b540884d33d45a7b0ba3042de7a97e2c466099e64b744870c298b63f79 -size 2609789 +oid sha256:87d35b14605d3be65b2119285d32a20b0a9abdaa368e45eb0705576060d29420 +size 1221802 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 255396799e1..5caf5b94445 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -705,11 +705,11 @@ MonoBehaviour: ImageComparisonSettings: TargetWidth: 1280 TargetHeight: 720 - PerPixelCorrectnessThreshold: 0.002 + PerPixelCorrectnessThreshold: 0.001 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.005 - IncorrectPixelsThreshold: 0.000006814697 + IncorrectPixelsThreshold: 0.00003814697 UseHDR: 0 UseBackBuffer: 1 ImageResolution: 2 From 04307d0926441fb4f6192f55aae4378eceef2014 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Mon, 4 Oct 2021 10:17:52 -0700 Subject: [PATCH 22/39] Test fix for XR standalone tests --- com.unity.testing.xr/Runtime/ConfigureMockHMD.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs b/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs index dccd2a2da60..0a9250e1b4c 100644 --- a/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs +++ b/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs @@ -40,7 +40,7 @@ static public int SetupTest(bool xrCompatible, int waitFrames, UnityEngine.TestT #if UNITY_EDITOR UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.SetGameViewSize(w, h); #else - Screen.SetResolution(w, h, FullScreenMode.Windowed); + Screen.SetResolution(w / 2, h / 2, FullScreenMode.Windowed); #endif } else From 4c6b32d93054254fcd9d79fb7093143cac415f54 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 5 Oct 2021 14:41:46 -0700 Subject: [PATCH 23/39] Move universal material upgrader and postprocessor into its own file. --- .../MaterialPostprocessor.cs | 15 -------- ...UniversalRenderPipelineMaterialUpgrader.cs | 22 +----------- .../UniversalSpeedTree8MaterialUpgrader.cs | 35 +++++++++++++++++++ ...niversalSpeedTree8MaterialUpgrader.cs.meta | 11 ++++++ 4 files changed, 47 insertions(+), 36 deletions(-) create mode 100644 com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs create mode 100644 com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs.meta diff --git a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs index f04f44a4d34..aeda8e6c365 100644 --- a/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs @@ -131,21 +131,6 @@ static internal void SaveAssetsToDisk() s_NeedsSavingAssets = false; } - static private void UniversalSpeedTree8MaterialImportFinalizer(Material mat) - { - if (mat.HasFloat("_TwoSided")) - mat.SetFloat(Property.CullMode, mat.GetFloat("_TwoSided")); - UpdateMaterial(mat, - MaterialUpdateType.CreatedNewMaterial, - ShaderID.SpeedTree8); - } - - void OnPostprocessSpeedTree(GameObject speedTree) - { - SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; - SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8MaterialImportFinalizer); - } - static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths) { string upgradeLog = ""; diff --git a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs index f36d4dd7632..7538375feb4 100644 --- a/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs +++ b/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs @@ -171,7 +171,7 @@ private static void GetUpgraders(ref List upgraders) upgraders.Add(new TerrainUpgrader("Nature/Terrain/Standard")); upgraders.Add(new SpeedTreeUpgrader("Nature/SpeedTree")); upgraders.Add(new SpeedTreeBillboardUpgrader("Nature/SpeedTree Billboard")); - upgraders.Add(new SpeedTree8Upgrader("Nature/SpeedTree8")); + upgraders.Add(new UniversalSpeedTree8Upgrader("Nature/SpeedTree8")); //////////////////////////////////// // Particle Upgraders // @@ -548,26 +548,6 @@ internal SpeedTreeBillboardUpgrader(string oldShaderName) } } - internal class SpeedTree8Upgrader : SpeedTree8MaterialUpgrader - { - internal SpeedTree8Upgrader(string oldShaderName) - : base(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8), UniversalSpeedTree8MaterialFinalizer) - { - RenameFloat("_TwoSided", Property.CullMode); - } - static public void UniversalSpeedTree8MaterialFinalizer(Material mat) - { - SpeedTree8MaterialFinalizer(mat); - - if (mat.HasFloat("_TwoSided")) - mat.SetFloat(Property.CullMode, mat.GetFloat("_TwoSided")); - - Unity.Rendering.Universal.ShaderUtils.UpdateMaterial(mat, - Unity.Rendering.Universal.ShaderUtils.MaterialUpdateType.CreatedNewMaterial, - Unity.Rendering.Universal.ShaderUtils.ShaderID.SpeedTree8); - } - } - public class ParticleUpgrader : MaterialUpgrader { public ParticleUpgrader(string oldShaderName) diff --git a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs new file mode 100644 index 00000000000..3ad3b10ca8b --- /dev/null +++ b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs @@ -0,0 +1,35 @@ +using System; +using UnityEngine.Rendering.Universal; +using UnityEngine; + +namespace UnityEditor.Rendering.Universal +{ + class UniversalSpeedTree8Upgrader : SpeedTree8MaterialUpgrader + { + internal UniversalSpeedTree8Upgrader(string oldShaderName) + : base(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8), UniversalSpeedTree8MaterialFinalizer) + { + RenameFloat("_TwoSided", Property.CullMode); + } + static public void UniversalSpeedTree8MaterialFinalizer(Material mat) + { + SpeedTree8MaterialFinalizer(mat); + + if (mat.HasFloat("_TwoSided")) + mat.SetFloat(Property.CullMode, mat.GetFloat("_TwoSided")); + + Unity.Rendering.Universal.ShaderUtils.UpdateMaterial(mat, + Unity.Rendering.Universal.ShaderUtils.MaterialUpdateType.CreatedNewMaterial, + Unity.Rendering.Universal.ShaderUtils.ShaderID.SpeedTree8); + } + } + + class UniversalSpeedTree8PostProcessor : AssetPostprocessor + { + void OnPostprocessSpeedTree(GameObject speedTree) + { + SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; + SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8Upgrader.UniversalSpeedTree8MaterialFinalizer); + } + } +} diff --git a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs.meta b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs.meta new file mode 100644 index 00000000000..f561425a50a --- /dev/null +++ b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a699ef0a455ff0440a0fe9b1689ec566 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From bd262c6ed58cac0819f7dc8b901d8f15d956a97a Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 5 Oct 2021 14:44:33 -0700 Subject: [PATCH 24/39] Define a separate material postprocessor for HD speedtree8 --- .../Editor/AssetProcessors/MaterialPostProcessor.cs | 6 ------ .../Material/Nature/HDSpeedTree8MaterialUpgrader.cs | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs index 65cda092347..a17d5dcfe13 100644 --- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs @@ -475,12 +475,6 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse } } - public void OnPostprocessSpeedTree(GameObject speedTree) - { - SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; - SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer); - } - // Note: It is not possible to separate migration step by kind of shader // used. This is due that user can change shader that material reflect. // And when user do this, the material is not reimported and we have no diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs index 8d64743db4d..4235429a713 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs @@ -122,4 +122,13 @@ private static void SetDefaultDiffusionProfile(Material mat) } } } + + class HDSpeedTree8PostProcessor : AssetPostprocessor + { + public void OnPostprocessSpeedTree(GameObject speedTree) + { + SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; + SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer); + } + } } From 901618e7635e3082f5ca5ea7622cf587c90198dc Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 5 Oct 2021 16:24:30 -0700 Subject: [PATCH 25/39] Only run imagetest average delta E, bringing 058 in line with other terrain tests to work around resolution discrepancies in XR testing. --- .../Assets/Scenes/058_SpeedTree_V8.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 5caf5b94445..ee747e34a2f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -713,7 +713,7 @@ MonoBehaviour: UseHDR: 0 UseBackBuffer: 1 ImageResolution: 2 - ActiveImageTests: 2147483647 + ActiveImageTests: 1 ActivePixelTests: 7 WaitFrames: 0 XRCompatible: 1 From 0f3b64cac95f22b158ea4025f0fd9b15a385670a Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 5 Oct 2021 16:40:35 -0700 Subject: [PATCH 26/39] Only run rp-specific speedtree importers when respective RP asset is active. --- .../Material/Nature/HDSpeedTree8MaterialUpgrader.cs | 9 +++++++-- .../Editor/UniversalSpeedTree8MaterialUpgrader.cs | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs index 4235429a713..870ccf9d48d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs @@ -1,5 +1,6 @@ using UnityEngine; using UnityEngine.Rendering.HighDefinition; +using UnityEngine.Rendering; namespace UnityEditor.Rendering.HighDefinition { @@ -127,8 +128,12 @@ class HDSpeedTree8PostProcessor : AssetPostprocessor { public void OnPostprocessSpeedTree(GameObject speedTree) { - SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; - SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer); + context.DependsOnCustomDependency("srp/default-pipeline"); + if (GraphicsSettings.renderPipelineAsset is HDRenderPipelineAsset) + { + SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; + SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer); + } } } } diff --git a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs index 3ad3b10ca8b..730f138a420 100644 --- a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs @@ -1,6 +1,7 @@ using System; using UnityEngine.Rendering.Universal; using UnityEngine; +using UnityEngine.Rendering; namespace UnityEditor.Rendering.Universal { @@ -28,8 +29,13 @@ class UniversalSpeedTree8PostProcessor : AssetPostprocessor { void OnPostprocessSpeedTree(GameObject speedTree) { - SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; - SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8Upgrader.UniversalSpeedTree8MaterialFinalizer); + context.DependsOnCustomDependency("srp/default-pipeline"); + + if (GraphicsSettings.renderPipelineAsset is UniversalRenderPipelineAsset) + { + SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; + SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8Upgrader.UniversalSpeedTree8MaterialFinalizer); + } } } } From e49b90400ee2e4cb348d293c182c201db38a6741 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 6 Oct 2021 10:15:23 -0700 Subject: [PATCH 27/39] Update com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com> --- .../Editor/UniversalSpeedTree8MaterialUpgrader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs index 730f138a420..1ebbe31cd32 100644 --- a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs @@ -31,7 +31,7 @@ void OnPostprocessSpeedTree(GameObject speedTree) { context.DependsOnCustomDependency("srp/default-pipeline"); - if (GraphicsSettings.renderPipelineAsset is UniversalRenderPipelineAsset) + if (RenderPipelineManager.currentPipeline is UniversalRenderPipelineAsset) { SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8Upgrader.UniversalSpeedTree8MaterialFinalizer); From 7026232afb26612afd6399daf3e5e6b556fea91b Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 6 Oct 2021 10:15:31 -0700 Subject: [PATCH 28/39] Update com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com> --- .../Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs index 870ccf9d48d..5d17bb87db9 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs @@ -129,7 +129,7 @@ class HDSpeedTree8PostProcessor : AssetPostprocessor public void OnPostprocessSpeedTree(GameObject speedTree) { context.DependsOnCustomDependency("srp/default-pipeline"); - if (GraphicsSettings.renderPipelineAsset is HDRenderPipelineAsset) + if (RenderPipelineManager.currentPipeline is HDRenderPipelineAsset) { SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer); From 712e9a586691f9604ae7a2ed193a1acbe795cf22 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 6 Oct 2021 10:30:49 -0700 Subject: [PATCH 29/39] Try doubling screen resolution during mock hmd setup --- com.unity.testing.xr/Runtime/ConfigureMockHMD.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs b/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs index 0a9250e1b4c..e8da7708f56 100644 --- a/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs +++ b/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs @@ -40,7 +40,7 @@ static public int SetupTest(bool xrCompatible, int waitFrames, UnityEngine.TestT #if UNITY_EDITOR UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.SetGameViewSize(w, h); #else - Screen.SetResolution(w / 2, h / 2, FullScreenMode.Windowed); + Screen.SetResolution(w * 2, h * 2, FullScreenMode.Windowed); #endif } else From e1dd3422a40d7e3074700218480ca88d44ccf8c7 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Mon, 11 Oct 2021 15:55:25 -0700 Subject: [PATCH 30/39] Fix type on current pipeline check --- .../Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs | 2 +- .../Editor/UniversalSpeedTree8MaterialUpgrader.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs index 5d17bb87db9..89639ff39f0 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Nature/HDSpeedTree8MaterialUpgrader.cs @@ -129,7 +129,7 @@ class HDSpeedTree8PostProcessor : AssetPostprocessor public void OnPostprocessSpeedTree(GameObject speedTree) { context.DependsOnCustomDependency("srp/default-pipeline"); - if (RenderPipelineManager.currentPipeline is HDRenderPipelineAsset) + if (RenderPipelineManager.currentPipeline is HDRenderPipeline) { SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer); diff --git a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs index 1ebbe31cd32..96848f1029f 100644 --- a/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs +++ b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs @@ -31,7 +31,7 @@ void OnPostprocessSpeedTree(GameObject speedTree) { context.DependsOnCustomDependency("srp/default-pipeline"); - if (RenderPipelineManager.currentPipeline is UniversalRenderPipelineAsset) + if (RenderPipelineManager.currentPipeline is UniversalRenderPipeline) { SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter; SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, UniversalSpeedTree8Upgrader.UniversalSpeedTree8MaterialFinalizer); From e7d1695fdf3538a8f7cb6ae6b74d66cf328bf4a1 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 12 Oct 2021 14:48:03 -0700 Subject: [PATCH 31/39] Revert "Update ST8 test image resolution to 1280" This reverts commit 1d8c596e97b1c495d586c4709fb94774576b6aae. --- .../Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png index 3fc18a4b1bc..2f87c6854db 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f7dbb8ae89f176f48222e4ed94548ff154350a89dcb7d7e1e844c45fec2d9fc -size 1220786 +oid sha256:71620e210c562491c9d9646227f3e63d949f15410c85d32fe870ae8439c3cc0f +size 2562374 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png index 5efa0eeb4fb..d6cae9095c5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef19df3ed78e226036578e835851cdfbfddfe146e9f30a6c53b1c47217badad4 -size 1185971 +oid sha256:76b1a1b29129642568918b29a3e8b6f6b87379074c0ffe95a96c05aeca73e0f5 +size 2456987 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index 7a19e789544..adcbb9d2311 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57c87e38e5314e420578d236618bfb47f6f563f6d93cad74caffa84e038ffa01 -size 1208502 +oid sha256:faa2f87e8d28d8e20bc4898ed152c6039a132833186ec1fcb4b35cb5f6a81afb +size 2607904 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png index fc7e0dbd511..f3f4283ae3a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:369552a5de0a14aae20f9c08cdb9668a87cf77068559bb443f6b1ec8447da17f -size 1222049 +oid sha256:ec8a88f5f01777d384be78036c6ba21dc3db6f1d7e7ffa14b2c38f42731ecc5d +size 2607391 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png index fc7e0dbd511..da78099b363 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:369552a5de0a14aae20f9c08cdb9668a87cf77068559bb443f6b1ec8447da17f -size 1222049 +oid sha256:0d3fa3f0d3970ad1c9b188d7f84f98d2461b26fa95a900b4c54c3781242fb556 +size 2607390 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png index e8f5a29bb1b..8305094df14 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9483bd4254a8cd52e9aec56f86229643a0a3549e9a64ad0d7784bb7c150d4e55 -size 1209717 +oid sha256:f813236f766a8263cde27316d45a7414f4214b9497e12808bb5badf13e9cd32b +size 2563670 From f71921ab5965db85efc3bc3f9055d8b3b70d11a7 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 12 Oct 2021 14:48:25 -0700 Subject: [PATCH 32/39] Revert "Update android and OSX ref images. Increase error threshold." This reverts commit c1f382622650c560463e6f81c5a1ab7f785f9d03. --- .../Linear/Android/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png | 4 ++-- .../Assets/Scenes/058_SpeedTree_V8.unity | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png index b3c19123339..6416bb5fd08 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69ee1b8102639c967b8e1f31d2448e29717e16def5cf4befb60035a8acb7dd0e -size 1222018 +oid sha256:0d1706dd78d7fa6484fcb54e9a618d8a7e5e8be15208be726ebb0fc4988cd999 +size 2571637 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png index 90258854840..1b2c97d8964 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87d35b14605d3be65b2119285d32a20b0a9abdaa368e45eb0705576060d29420 -size 1221802 +oid sha256:0e96b6b540884d33d45a7b0ba3042de7a97e2c466099e64b744870c298b63f79 +size 2609789 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 5caf5b94445..255396799e1 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -705,11 +705,11 @@ MonoBehaviour: ImageComparisonSettings: TargetWidth: 1280 TargetHeight: 720 - PerPixelCorrectnessThreshold: 0.001 + PerPixelCorrectnessThreshold: 0.002 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.005 - IncorrectPixelsThreshold: 0.00003814697 + IncorrectPixelsThreshold: 0.000006814697 UseHDR: 0 UseBackBuffer: 1 ImageResolution: 2 From de425b8c51bdfb71d612da4660b8353671420aa5 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 12 Oct 2021 14:52:47 -0700 Subject: [PATCH 33/39] Return to original graphics test settings --- .../Assets/Scenes/058_SpeedTree_V8.unity | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity index 255396799e1..3bf6ce3b19b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity @@ -703,17 +703,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ImageComparisonSettings: - TargetWidth: 1280 - TargetHeight: 720 - PerPixelCorrectnessThreshold: 0.002 + TargetWidth: 1000 + TargetHeight: 600 + PerPixelCorrectnessThreshold: 0.001 PerPixelGammaThreshold: 0.003921569 PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.005 - IncorrectPixelsThreshold: 0.000006814697 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 - UseBackBuffer: 1 - ImageResolution: 2 - ActiveImageTests: 2147483647 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 ActivePixelTests: 7 WaitFrames: 0 XRCompatible: 1 From dcfe3dacf6bba946a16e6b6284b8bd32d44e8758 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 12 Oct 2021 16:10:49 -0700 Subject: [PATCH 34/39] Revert mock hmd config change that didn't work --- com.unity.testing.xr/Runtime/ConfigureMockHMD.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs b/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs index e8da7708f56..dccd2a2da60 100644 --- a/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs +++ b/com.unity.testing.xr/Runtime/ConfigureMockHMD.cs @@ -40,7 +40,7 @@ static public int SetupTest(bool xrCompatible, int waitFrames, UnityEngine.TestT #if UNITY_EDITOR UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.SetGameViewSize(w, h); #else - Screen.SetResolution(w * 2, h * 2, FullScreenMode.Windowed); + Screen.SetResolution(w, h, FullScreenMode.Windowed); #endif } else From 1394d5981c63d73d7236933c3251470d020bced6 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 12 Oct 2021 16:22:58 -0700 Subject: [PATCH 35/39] Update reference images --- .../Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/Android/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png | 4 ++-- .../Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png index 2f87c6854db..600db95aa4d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71620e210c562491c9d9646227f3e63d949f15410c85d32fe870ae8439c3cc0f -size 2562374 +oid sha256:ef85cca3b24b11d4ba7bb94bb11a5603032f80d458a2c7b068fe7e7a8b3e7283 +size 830141 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png index 6416bb5fd08..4e6bc70d247 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d1706dd78d7fa6484fcb54e9a618d8a7e5e8be15208be726ebb0fc4988cd999 -size 2571637 +oid sha256:4a6638fd34f35d430b83976ffe6d622ef1cbde7471052e7dd9317cdd4d34dcb6 +size 830160 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png index d6cae9095c5..235d4e26ccb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b1a1b29129642568918b29a3e8b6f6b87379074c0ffe95a96c05aeca73e0f5 -size 2456987 +oid sha256:59d803e7dc82b08445a7bb79ed5aed665873344010b3a9f4985b0d41541b97a2 +size 831088 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png index 1b2c97d8964..626cc4f096a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e96b6b540884d33d45a7b0ba3042de7a97e2c466099e64b744870c298b63f79 -size 2609789 +oid sha256:b284bc0115a645e1002179efb4ca2a4bee825e7fb30ba98230e636ddb5f0e73d +size 844407 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png index f3f4283ae3a..09e949e9178 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec8a88f5f01777d384be78036c6ba21dc3db6f1d7e7ffa14b2c38f42731ecc5d -size 2607391 +oid sha256:9d29e1e94a17439c0bf4cbc7b69258bc2cf76eba91fbfac9b13efd603e08c6d3 +size 844570 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png index da78099b363..c92376df550 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3fa3f0d3970ad1c9b188d7f84f98d2461b26fa95a900b4c54c3781242fb556 -size 2607390 +oid sha256:aec6e6e4b69c85f4bcc6109ac1ef02c0b972118bbe54bdbb8babfd0289406586 +size 844557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png index 8305094df14..87d62999138 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f813236f766a8263cde27316d45a7414f4214b9497e12808bb5badf13e9cd32b -size 2563670 +oid sha256:b4e3b192ca53cfb0768ef543d4c7889b1b40c04bae7a05aac38404c90b9742f8 +size 830498 From 8ac660cc5b50015e38af000d733a3544e362b994 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 13 Oct 2021 09:00:42 -0700 Subject: [PATCH 36/39] One more ref image --- .../Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png index adcbb9d2311..41b597828b4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/058_SpeedTree_V8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:faa2f87e8d28d8e20bc4898ed152c6039a132833186ec1fcb4b35cb5f6a81afb -size 2607904 +oid sha256:53cdef9b37a24bb115aa98da70ec37f24eaa3697173426904a6d9680e4cb8f27 +size 845853 From 68fbc113c3bde36af028049ade367bc6f1183f5d Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Wed, 13 Oct 2021 16:21:56 -0700 Subject: [PATCH 37/39] Update HD ref images. --- .../Linear/LinuxEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png | 4 ++-- .../WindowsEditor/Direct3D11/None/1225_Lit_SpeedTree8SG.png | 4 ++-- .../WindowsEditor/Direct3D12/None/1225_Lit_SpeedTree8SG.png | 4 ++-- .../WindowsEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png index 4a2a754065e..252540d5775 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:318725a46b151d0bd6d10f2bf4eb4735fd811cff395672761355df808e9567d5 -size 374635 +oid sha256:09159a218b0d61dd822869550b0d50a0b1d5550cc0d6ae2e60f30ed5b18eddf3 +size 374363 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1225_Lit_SpeedTree8SG.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1225_Lit_SpeedTree8SG.png index 23415b7e5e3..b50ed4089cf 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1225_Lit_SpeedTree8SG.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1225_Lit_SpeedTree8SG.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd0b271be1a276e552ac7541f598ee5916887e184fa4a48d93a946efdf88ec1e -size 380517 +oid sha256:519edb63b25b8e4ba6e083584786fd008caada81c7945948bc6cc21b50a23549 +size 380388 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1225_Lit_SpeedTree8SG.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1225_Lit_SpeedTree8SG.png index 785e35846f0..f60be1c5444 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1225_Lit_SpeedTree8SG.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1225_Lit_SpeedTree8SG.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7b1f3dbc223d07c164d6f94b5375573c6192ebb3f6f061632580c0c4e558654 -size 380615 +oid sha256:75f1a0a78a1809504c52c4cf279bccfd2cf29ccc0afc3a6c368b5d3d5c2ca992 +size 380228 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png index 4a2a754065e..252540d5775 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1225_Lit_SpeedTree8SG.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:318725a46b151d0bd6d10f2bf4eb4735fd811cff395672761355df808e9567d5 -size 374635 +oid sha256:09159a218b0d61dd822869550b0d50a0b1d5550cc0d6ae2e60f30ed5b18eddf3 +size 374363 From dfbf1fa3f32fe26bd0536b9576d8cf9c8099ef3f Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Thu, 14 Oct 2021 09:28:56 -0700 Subject: [PATCH 38/39] Update HD OSX ref image for 1225 ST8 SG --- .../Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png index 47f8a173ee1..15f75aea841 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d53ef06e02bb81b4a62f963c49f2237e9475bfceb568c710a7598973aced8e79 -size 380472 +oid sha256:caea4c08b52321bd8f5fcd9a74b798d5e2b7034267a09fd7cbab7917c441c1aa +size 380344 From 7ca25f815f32840e291686b0ce00dc9cac3c69f2 Mon Sep 17 00:00:00 2001 From: Tianliang Ning Date: Tue, 19 Oct 2021 09:33:30 -0700 Subject: [PATCH 39/39] Fudge error threshold on HD ST8 test to hide cacheserver nondeterminism in billboard rendering. --- .../Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity index 23a0110f8b9..5453327ed7a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity @@ -24,7 +24,7 @@ RenderSettings: 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_AmbientMode: 4 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 @@ -1026,6 +1026,7 @@ MonoBehaviour: m_Profile: {fileID: 11400000, guid: fc9e408991e011b43aedcb95762c1cc0, type: 2} m_StaticLightingSkyUniqueID: 2 m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!114 &1330659249 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1237,6 +1238,16 @@ PrefabInstance: propertyPath: captureFramerate value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.ActivePixelTests + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold + value: 0.00075 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1635263470