Skip to content

Update to 2019.3 #7

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

Update to 2019.3 #7

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
5150e26
Initial update to 19.2
Verasl Jun 16, 2019
c858ca0
updated to LWRP 6.9.2
hybridherbst Feb 11, 2020
cb2b238
update to 2019.3 ( URP 7.2.0)
hybridherbst Feb 12, 2020
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
28 changes: 24 additions & 4 deletions ...ibrary_Project/Assets/ExampleAssets/AlienPlants/Grass Alien D/Materials/Grass_Alien_D.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Grass_Alien_D
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP
m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 2
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2050
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- DistortionVectors
- TransparentBackfaceDebugDisplay
Expand All @@ -33,6 +34,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 06cca7ed9198d9e4f99f887c99c9f4f2, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 2800000, guid: ef68f429930d17b4d98fc6e1a6b51d8b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BentNormalMap:
m_Texture: {fileID: 2800000, guid: aa0523c543363b64b8607db998d44ae8, type: 3}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -192,6 +197,7 @@ Material:
- _EnableSpecularOcclusion: 0
- _EnableWind: 1
- _EnergyConservingSpecularColor: 1
- _EnvironmentReflections: 1
- _FpsModeFov: 60
- _GlossMapScale: 0.749
- _Glossiness: 0.5
Expand Down Expand Up @@ -224,14 +230,15 @@ Material:
- _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1
- _PreRefractionPass: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _RefractionMode: 0
- _RefractionModel: 0
- _RefractionSSRayModel: 0
- _SSRefractionProjectionModel: 0
- _ShiverDirectionality: 1
- _ShiverDrag: 0.04
- _Smoothness: 0.455
- _Smoothness: 0.749
- _SmoothnessRemapMax: 0.6326312
- _SmoothnessRemapMin: 0
- _SmoothnessTextureChannel: 0
Expand Down Expand Up @@ -283,3 +290,16 @@ Material:
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
--- !u!114 &5093635296827281098
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
28 changes: 24 additions & 4 deletions ..._Project/Assets/ExampleAssets/AlienPlants/Liana Shrubs A/Materials/Spaceplant_Liana_A.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Spaceplant_Liana_A
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2050
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- DistortionVectors
- TransparentDepthPrepass
Expand All @@ -32,6 +33,10 @@ Material:
m_Texture: {fileID: 2800000, guid: e70e9783c2572a140bc00870c64553d8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 423cac027154e2341a06e357bbbb84a5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BentNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -183,6 +188,7 @@ Material:
- _EnableSpecularOcclusion: 0
- _EnableWind: 1
- _EnergyConservingSpecularColor: 1
- _EnvironmentReflections: 1
- _FpsModeFov: 60
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand Down Expand Up @@ -215,6 +221,7 @@ Material:
- _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1
- _PreRefractionPass: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _RefractionMode: 0
- _RefractionModel: 0
Expand Down Expand Up @@ -259,7 +266,7 @@ Material:
- _ZTestModeDistortion: 4
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.8679245, g: 0.7737629, b: 0.84194887, a: 1}
- _BaseColor: {r: 1, g: 0.58962256, b: 0.9606902, a: 1}
- _Color: {r: 1, g: 0.5896226, b: 0.9606902, a: 1}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
Expand All @@ -273,3 +280,16 @@ Material:
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
--- !u!114 &1802869022631111208
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
28 changes: 25 additions & 3 deletions ...nderPass_ExampleLibrary_Project/Assets/ExampleAssets/Barrel/Materials/Barrel_Body_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Barrel_Body_Mat
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2050
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: af169a134e7ec7744a3abb7698722654, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 29abbe6c899f53e48838e5a1ecbc1b4c, type: 3}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -50,19 +55,36 @@ Material:
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
--- !u!114 &7151291527878792294
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
4 changes: 2 additions & 2 deletions ...nderPass_ExampleLibrary_Project/Assets/ExampleAssets/Barrel/Materials/Barrel_Core_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ Material:
- _WorkflowMode: 0
- _ZWrite: 1
m_Colors:
- Color_3C9D672D: {r: 0.053108193, g: 0.46107566, b: 0, a: 1}
- Color_F5EA7043: {r: 1, g: 0.8874891, b: 0, a: 1}
- Color_3C9D672D: {r: 0.29072988, g: 4.43, b: 0.03876399, a: 1}
- Color_F5EA7043: {r: 3.9999995, g: 3.560209, b: 0.12565443, a: 1}
- Vector2_8633A3C7: {r: 0.4, g: 0.4, b: 2, a: 0}
- Vector2_92701695: {r: 0.2, g: 0.2, b: 2, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
33 changes: 27 additions & 6 deletions ...derPass_ExampleLibrary_Project/Assets/ExampleAssets/Barrel/Materials/Barrel_Glass_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,22 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Barrel_Glass_Mat
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _NORMALMAP _RECEIVE_SHADOWS_OFF _SPECULAR_SETUP
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _METALLICSPECGLOSSMAP _NORMALMAP _RECEIVE_SHADOWS_OFF
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: 3050
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 30fdc4b7aa84dca46bba5f1c72d6f4a9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: c7254a8e7a0294747bf549e57e6e753f, type: 3}
m_Scale: {x: 1, y: 1}
Expand All @@ -47,24 +51,41 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _Blend: 1
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.299
- _GlossyReflections: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 0
- _Smoothness: 1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlend: 1
- _Surface: 1
- _WorkflowMode: 0
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &1360205785568511122
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
28 changes: 25 additions & 3 deletions ...rPass_ExampleLibrary_Project/Assets/ExampleAssets/Displays/Materials/LargeDisplay_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-605736606517557528
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
--- !u!21 &2100000
Material:
serializedVersion: 6
Expand All @@ -9,16 +22,21 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: LargeDisplay_Mat
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP
m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2050
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 245b4eacceb7445d6a2d04b12c3cb298, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: b2ec278de826e4bc09eaa3546768c678, type: 3}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -67,13 +85,16 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Expand All @@ -82,6 +103,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
Loading