Skip to content

Fix lighting on billboards in Speedtree 8 shader (1382257) #6768

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+3,730 −44
Open

Fix lighting on billboards in Speedtree 8 shader (1382257) #6768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e0dbe4
Fix lighting on billboards in Speedtree 8 shader (1382257)
TimAidleyAtUnity Jan 18, 2022
7705ec4
Merge branch 'master' into terrain/bill-board-tree-lighting-1382257
phi-lira Feb 1, 2022
602a41f
Test Scene for Speedtree final LODs
TimAidleyAtUnity Feb 7, 2022
c1e0372
Remove unneeded tree group from terrain
TimAidleyAtUnity Feb 9, 2022
5342738
Added reference image for the test
TimAidleyAtUnity Feb 9, 2022
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
12 changes: 6 additions & 6 deletions .../SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ MonoBehaviour:
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Broadleaf_Desktop_Field
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -67,18 +70,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 1
- _TwoSided: 0
- _WINDQUALITY: 4
- _WindQuality: 4
m_Colors:
Expand Down
12 changes: 6 additions & 6 deletions ...sets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ MonoBehaviour:
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Main_Bark
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -67,18 +70,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 0
- _TwoSided: 2
- _WINDQUALITY: 4
- _WindQuality: 4
m_Colors:
Expand Down
12 changes: 6 additions & 6 deletions .../SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ MonoBehaviour:
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Broadleaf_Desktop_Field
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -67,18 +70,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 1
- _TwoSided: 0
- _WINDQUALITY: 4
- _WindQuality: 4
m_Colors:
Expand Down
12 changes: 6 additions & 6 deletions ...sets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ MonoBehaviour:
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Main_Bark
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -67,18 +70,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 0
- _TwoSided: 2
- _WINDQUALITY: 4
- _WindQuality: 4
m_Colors:
Expand Down
12 changes: 6 additions & 6 deletions .../SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Broadleaf_Desktop_Field
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -54,18 +57,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 1
- _TwoSided: 0
- _WINDQUALITY: 4
- _WindQuality: 4
m_Colors:
Expand Down
12 changes: 6 additions & 6 deletions ...sets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Main_Bark
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR _WINDQUALITY_BEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -54,18 +57,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 0
- _TwoSided: 2
- _WINDQUALITY: 4
- _WindQuality: 4
m_Colors:
Expand Down
14 changes: 7 additions & 7 deletions ...V8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ MonoBehaviour:
version: 6
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Broadleaf_Desktop_Field_Billboard
m_Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ShaderKeywords: BACKFACE_NORMAL_MODE_MIRROR EFFECT_BILLBOARD _WINDQUALITY_FASTEST
m_LightmapFlags: 4
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -67,18 +70,15 @@ Material:
- 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
- _OldHueVarBehavior: 0
- _QueueControl: 0
- _QueueOffset: 0
- _SubsurfaceIndirect: 0.25
- _SubsurfaceKwToggle: 1
- _TwoSided: 2
- _WINDQUALITY: 1
- _WindQuality: 1
m_Colors:
Expand Down
8 changes: 8 additions & 0 deletions ...lGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Hero_Field.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added ...in/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Hero_Field/Broadleaf_Hero_Field.st
View file
Open in desktop
Binary file not shown.
Loading