Skip to content

[Backport 21.2] [HDRP][URP][SpeedTree8] Set shadergraph as default SpeedTree 8 shader for Universal. Clean up HDRP importers/upgraders #6105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Backport 21.2] [HDRP][URP][SpeedTree8] Set shadergraph as default SpeedTree 8 shader for Universal. Clean up HDRP importers/upgraders #6105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ...rojects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeTestSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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;
}
27 changes: 24 additions & 3 deletions ...SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
27 changes: 24 additions & 3 deletions ...ets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
25 changes: 23 additions & 2 deletions ...SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
25 changes: 23 additions & 2 deletions ...ets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
27 changes: 24 additions & 3 deletions ...SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
27 changes: 24 additions & 3 deletions ...ets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
Loading