Skip to content

Updated to Unity 2020.3 LTS and URP 10.4 #3

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
hybridherbst wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated to Unity 2020.3 LTS and URP 10.4 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e5d3d7
updated to 2020.3 LTS
hybridherbst Apr 7, 2021
33eaa7e
material and shader updates
hybridherbst Apr 7, 2021
0686b3b
fixed SHADERGRAPH_PREVIEW if/ifdef
hybridherbst Apr 7, 2021
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
.idea
Logs
UserSettings
5 changes: 3 additions & 2 deletions Assets/Example/Materials/Background Card.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -26,7 +26,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3050
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
Expand Down Expand Up @@ -64,3 +64,4 @@ Material:
- Vector2_2A594BA8: {r: 3, g: 1, b: 0, a: 0}
- _BaseColor: {r: 0.20160002, g: 0.252, b: 0.17136002, a: 0.98039216}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []
7 changes: 4 additions & 3 deletions Assets/Example/Materials/Dust Mites.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -26,7 +26,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3050
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
Expand Down Expand Up @@ -95,7 +95,7 @@ Material:
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlend: 5
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
Expand All @@ -107,3 +107,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
13 changes: 13 additions & 0 deletions Assets/Example/Materials/Grass.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,23 @@ Material:
m_Texture: {fileID: 2800000, guid: 458002aefb9b2394a9e2947bc718bd1a, 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_Floats:
- Vector1_3410E007: 1.3
- Vector1_38408574: 0.75
- Vector1_B527BCC5: 0.5
m_Colors:
- Color_AD1C6FDD: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 0}
- Color_B5CEF074: {r: 0.5, g: 0.5, b: 0.5, a: 0}
m_BuildTextureStacks: []
21 changes: 21 additions & 0 deletions Assets/Example/Materials/Ground.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,29 @@ Material:
m_Texture: {fileID: 2800000, guid: edf7a68bb7e399d4ea0d1bc868c56369, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TriplanarBlend_3c4c63dc6c5b1384b6a7848204ebcfa9_Texture2D906F9359_3414153196:
m_Texture: {fileID: 2800000, guid: 3a59dfbaaa4bd15489e655fe28737ad6, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TriplanarBlend_3c4c63dc6c5b1384b6a7848204ebcfa9_Texture2DB64B3BAB_1695717613:
m_Texture: {fileID: 2800000, guid: edf7a68bb7e399d4ea0d1bc868c56369, 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_Floats:
- Vector1_B527BCC5: 1
m_Colors:
- Color_AD1C6FDD: {r: 0, g: 0, b: 0, a: 0}
- Color_B5CEF074: {r: 0.6320754, g: 0.6320754, b: 0.6320754, a: 0}
m_BuildTextureStacks: []
13 changes: 13 additions & 0 deletions Assets/Example/Materials/Props 1.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ 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_Floats:
- Vector1_B527BCC5: 0.72
- _AlphaClip: 0
Expand Down Expand Up @@ -99,3 +111,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
7 changes: 4 additions & 3 deletions Assets/Example/Materials/Wind Trails.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -26,7 +26,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3050
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
Expand Down Expand Up @@ -95,7 +95,7 @@ Material:
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlend: 5
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
Expand All @@ -107,3 +107,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
3,350 changes: 3,157 additions & 193 deletions Assets/Example/Shader Graphs/Background Card.shadergraph
View file
Open in desktop

Large diffs are not rendered by default.

3,554 changes: 3,328 additions & 226 deletions Assets/Example/Shader Graphs/Grass.shadergraph
View file
Open in desktop

Large diffs are not rendered by default.

2,956 changes: 2,773 additions & 183 deletions Assets/Example/Shader Graphs/Ground.shadergraph
View file
Open in desktop

Large diffs are not rendered by default.

3,212 changes: 3,014 additions & 198 deletions Assets/Example/Shader Graphs/Props.shadergraph
View file
Open in desktop

Large diffs are not rendered by default.

9,307 changes: 8,740 additions & 567 deletions Assets/Example/Shader Graphs/Subsurface Scattering.shadergraph
View file
Open in desktop

Large diffs are not rendered by default.

Loading