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
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/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..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
@@ -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_FASTEST
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: 1
+ - _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..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
@@ -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_FASTEST
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: 1
- _WindQuality: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
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..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+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 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
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..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+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 34e19ab75b2..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+oid sha256:b284bc0115a645e1002179efb4ca2a4bee825e7fb30ba98230e636ddb5f0e73d
+size 844407
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..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+oid sha256:53cdef9b37a24bb115aa98da70ec37f24eaa3697173426904a6d9680e4cb8f27
+size 845853
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..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+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 34e19ab75b2..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+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 34e19ab75b2..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:df0bd4f6f5a1381114bc8c0f62ddb725f5bd4671f74b00ba602e532b4d243d8d
-size 267989
+oid sha256:b4e3b192ca53cfb0768ef543d4c7889b1b40c04bae7a05aac38404c90b9742f8
+size 830498
diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/058_SpeedTree_V8.unity
index f5e2231dd65..3bf6ce3b19b 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: 17f5e39894d1a79429cf457fa2325b9a,
type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: e2c62cc492f7f3945b1b1ac901ffc5e8,
type: 2}
@@ -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}
@@ -526,10 +532,23 @@ 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
+ 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
@@ -590,6 +609,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
+ m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
@@ -625,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
@@ -650,13 +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
@@ -696,6 +717,19 @@ MonoBehaviour:
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
@@ -706,6 +740,7 @@ GameObject:
m_Component:
- component: {fileID: 516620774}
- component: {fileID: 516620773}
+ - component: {fileID: 516620775}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
@@ -782,13 +817,34 @@ 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:
+ 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 +855,7 @@ GameObject:
m_Component:
- component: {fileID: 707831287}
- component: {fileID: 707831286}
+ - component: {fileID: 707831288}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
@@ -878,16 +935,37 @@ 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
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 1046155036}
m_Modifications:
- target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145,
type: 3}
@@ -932,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}
@@ -962,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}
@@ -972,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}
@@ -1091,6 +1169,7 @@ GameObject:
m_Component:
- component: {fileID: 819651149}
- component: {fileID: 819651148}
+ - component: {fileID: 819651150}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
@@ -1167,13 +1246,34 @@ 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:
+ 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,9 +1366,89 @@ 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
+ 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:
@@ -1280,6 +1460,7 @@ GameObject:
m_Component:
- component: {fileID: 1071057505}
- component: {fileID: 1071057504}
+ - component: {fileID: 1071057506}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
@@ -1356,13 +1537,34 @@ 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:
+ 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
@@ -1415,19 +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}
@@ -1447,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}
@@ -1472,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}
@@ -1487,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}
@@ -1586,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
@@ -1596,6 +1840,7 @@ GameObject:
m_Component:
- component: {fileID: 1477893691}
- component: {fileID: 1477893690}
+ - component: {fileID: 1477893692}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
@@ -1672,19 +1917,40 @@ 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:
+ 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
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 1215022218}
m_Modifications:
- target: {fileID: -8468506237607346234, guid: 963e0425798c18546a875cb71184f8a4,
type: 3}
@@ -1709,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}
@@ -1749,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}
@@ -1863,6 +2129,7 @@ GameObject:
m_Component:
- component: {fileID: 1567784503}
- component: {fileID: 1567784502}
+ - component: {fileID: 1567784504}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
@@ -1939,13 +2206,34 @@ 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:
+ 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 +2244,7 @@ GameObject:
m_Component:
- component: {fileID: 1721950903}
- component: {fileID: 1721950902}
+ - component: {fileID: 1721950904}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
@@ -2032,19 +2321,40 @@ 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:
+ 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
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 1046155036}
m_Modifications:
- target: {fileID: -7785609437617567166, guid: 80e30858b19da7c4280442f8a756f145,
type: 3}
@@ -2069,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}
@@ -2099,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}
@@ -2109,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}
@@ -2213,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
@@ -2265,12 +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:
@@ -2364,16 +2790,17 @@ 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
+ 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}
@@ -2393,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}
@@ -2418,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}
@@ -2433,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}
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
diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md
index d045ee7c356..3f27285ea34 100644
--- a/com.unity.render-pipelines.core/CHANGELOG.md
+++ b/com.unity.render-pipelines.core/CHANGELOG.md
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Debug Panels Framework See `IDebugDisplaySettingsQuery`.
+### Fixed
+- Fixed keyword and float property upgrading in SpeedTree8MaterialUpgrader
+
## [13.0.0] - 2021-09-01
Version Updated
diff --git a/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs b/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs
index 2f2b3b6913c..dd9d8d1453e 100644
--- a/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs
+++ b/com.unity.render-pipelines.core/Editor/SpeedTree8MaterialUpgrader.cs
@@ -41,7 +41,11 @@ 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.
+ 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)
@@ -56,8 +60,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);
@@ -96,22 +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.HasProperty("_TwoSided") && material.HasProperty("_CullMode"))
- material.SetFloat("_CullMode", material.GetFloat("_TwoSided"));
-
- 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);
}
@@ -127,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.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index ba82b5fe725..aee6e81ae40 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Changed the max distance for Light Anchors to avoid unstability with high values (case 1362802).
- PrepareLightsForGPU CPU Light loop performance improvement (40% to 70% faster), utilizing burst and optimized. Utilizing better sorting, distributing work in jobs and improving cache access of light data.
- In path tracing, camera ray misses now return a null value with Minimum Depth > 1.
+- HD's SpeedTree 8 upgrader now sets up CullModeForward as well.
## [13.1.0] - 2021-09-24
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 b198ae2b898..784a3766c58 100644
--- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
@@ -325,9 +325,6 @@ void OnPostprocessMaterial(Material material)
if (!HDShaderUtils.IsHDRPShader(material.shader, upgradable: true))
return;
- if (HDSpeedTree8MaterialUpgrader.IsHDSpeedTree8Material(material))
- SpeedTree8MaterialUpgrader.SpeedTree8MaterialFinalizer(material);
-
HDShaderUtils.ResetMaterialKeywords(material);
}
@@ -479,12 +476,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 314254c1ce7..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
@@ -1,5 +1,6 @@
using UnityEngine;
using UnityEngine.Rendering.HighDefinition;
+using UnityEngine.Rendering;
namespace UnityEditor.Rendering.HighDefinition
{
@@ -16,11 +17,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);
}
@@ -51,9 +57,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);
}
@@ -62,7 +78,11 @@ private static void SetHDSpeedTree8Defaults(Material mat)
mat.SetFloat("_DoubleSidedEnable", 1.0f);
}
- SetDefaultDiffusionProfile(mat);
+ if (mat.HasFloat("_TwoSided"))
+ {
+ mat.SetFloat("_CullMode", mat.GetFloat("_TwoSided"));
+ mat.SetFloat("_CullModeForward", mat.GetFloat("_TwoSided"));
+ }
}
private static void SetDefaultDiffusionProfile(Material mat)
@@ -103,4 +123,17 @@ private static void SetDefaultDiffusionProfile(Material mat)
}
}
}
+
+ class HDSpeedTree8PostProcessor : AssetPostprocessor
+ {
+ public void OnPostprocessSpeedTree(GameObject speedTree)
+ {
+ context.DependsOnCustomDependency("srp/default-pipeline");
+ if (RenderPipelineManager.currentPipeline is HDRenderPipeline)
+ {
+ SpeedTreeImporter stImporter = assetImporter as SpeedTreeImporter;
+ SpeedTree8MaterialUpgrader.PostprocessSpeedTree8Materials(speedTree, stImporter, HDSpeedTree8MaterialUpgrader.HDSpeedTree8MaterialFinalizer);
+ }
+ }
+ }
}
diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md
index e47b11817f7..4305f77fede 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
- Main light shadow, additional light shadow and additional light keywords are now enabled based on urp setting instead of existence in scene. This allows better variant stripping.
+- Now using the SpeedTree8 PBRLit shadergraph as the default SpeedTree8 shader for Universal.
### Fixed
- Fixed a regression where ShaderGraph screen position was not correct in game view and when using XR [1369450]
@@ -24,7 +25,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed an issue in where installing the Adaptive Performance package caused errors to the inspector UI [1368161](https://issuetracker.unity3d.com/issues/urp-package-throws-compilation-error-cs1525-when-imported-together-with-adaptive-performance-package)
## [13.1.0] - 2021-09-24
-
### Added
- Added public api and updated docs for Light2D shape properties.
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 5121ecbb5fd..7538375feb4 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");
@@ -168,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 //
@@ -544,13 +547,6 @@ internal SpeedTreeBillboardUpgrader(string oldShaderName)
RenameShader(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree7Billboard));
}
}
- internal class SpeedTree8Upgrader : MaterialUpgrader
- {
- internal SpeedTree8Upgrader(string oldShaderName)
- {
- RenameShader(oldShaderName, ShaderUtils.GetShaderPath(ShaderPathID.SpeedTree8));
- }
- }
public class ParticleUpgrader : MaterialUpgrader
{
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..96848f1029f
--- /dev/null
+++ b/com.unity.render-pipelines.universal/Editor/UniversalSpeedTree8MaterialUpgrader.cs
@@ -0,0 +1,41 @@
+using System;
+using UnityEngine.Rendering.Universal;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+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)
+ {
+ context.DependsOnCustomDependency("srp/default-pipeline");
+
+ if (RenderPipelineManager.currentPipeline is UniversalRenderPipeline)
+ {
+ 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:
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 c7cba826f4d..cb74612abb4 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",
};
///
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
}
{