Skip to content

Commit a9f7aec

Browse files
arthurkehrwaldarthurkehrwald
committed
Upgrade materials for new urp version
1 parent f733248 commit a9f7aec

29 files changed

+425
-105
lines changed

‎Assets/Art/Materials/Metal.mat‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,26 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Metal
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords:
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
1316
m_LightmapFlags: 4
1417
m_EnableInstancingVariants: 0
1518
m_DoubleSidedGI: 0
1619
m_CustomRenderQueue: 2000
1720
stringTagMap:
1821
RenderType: Opaque
19-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
24+
m_LockedProperties:
2025
m_SavedProperties:
2126
serializedVersion: 3
2227
m_TexEnvs:
@@ -76,9 +81,13 @@ Material:
7681
m_Texture: {fileID: 0}
7782
m_Scale: {x: 1, y: 1}
7883
m_Offset: {x: 0, y: 0}
84+
m_Ints: []
7985
m_Floats:
86+
- _AddPrecomputedVelocity: 0
8087
- _AlphaClip: 0
88+
- _AlphaToMask: 0
8189
- _Blend: 0
90+
- _BlendModePreserveSpecular: 1
8291
- _BumpScale: 1
8392
- _ClearCoatMask: 0
8493
- _ClearCoatSmoothness: 0
@@ -87,6 +96,7 @@ Material:
8796
- _DetailAlbedoMapScale: 1
8897
- _DetailNormalMapScale: 1
8998
- _DstBlend: 0
99+
- _DstBlendAlpha: 0
90100
- _EnvironmentReflections: 1
91101
- _GlossMapScale: 0
92102
- _Glossiness: 0
@@ -100,15 +110,18 @@ Material:
100110
- _SmoothnessTextureChannel: 0
101111
- _SpecularHighlights: 1
102112
- _SrcBlend: 1
113+
- _SrcBlendAlpha: 1
103114
- _Surface: 0
104115
- _WorkflowMode: 1
116+
- _XRMotionVectorsPass: 1
105117
- _ZWrite: 1
106118
m_Colors:
107119
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
108120
- _Color: {r: 1, g: 1, b: 1, a: 1}
109121
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
110122
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
111123
m_BuildTextureStacks: []
124+
m_AllowLocking: 1
112125
--- !u!114 &4454818212500575546
113126
MonoBehaviour:
114127
m_ObjectHideFlags: 11
@@ -121,4 +134,4 @@ MonoBehaviour:
121134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
122135
m_Name:
123136
m_EditorClassIdentifier:
124-
version: 4
137+
version: 10

‎Assets/Art/Materials/Visual Pinball/Bumper (Base).mat‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ MonoBehaviour:
1515
version: 11
1616
--- !u!21 &2100000
1717
Material:
18-
serializedVersion: 6
18+
serializedVersion: 8
1919
m_ObjectHideFlags: 0
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Bumper (Base)
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords:
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords: []
28+
m_InvalidKeywords: []
2629
m_LightmapFlags: 4
2730
m_EnableInstancingVariants: 0
2831
m_DoubleSidedGI: 0
@@ -35,6 +38,7 @@ Material:
3538
- TransparentBackface
3639
- RayTracingPrepass
3740
- MOTIONVECTORS
41+
m_LockedProperties:
3842
m_SavedProperties:
3943
serializedVersion: 3
4044
m_TexEnvs:
@@ -103,7 +107,7 @@ Material:
103107
m_Scale: {x: 1, y: 1}
104108
m_Offset: {x: 0, y: 0}
105109
- _MainTex:
106-
m_Texture: {fileID: 2800000, guid: 07512ac32059e7e499136e942210ef25, type: 3}
110+
m_Texture: {fileID: 0}
107111
m_Scale: {x: 1, y: 1}
108112
m_Offset: {x: 0, y: 0}
109113
- _MaskMap:
@@ -170,6 +174,7 @@ Material:
170174
m_Texture: {fileID: 0}
171175
m_Scale: {x: 1, y: 1}
172176
m_Offset: {x: 0, y: 0}
177+
m_Ints: []
173178
m_Floats:
174179
- _AORemapMax: 1
175180
- _AORemapMin: 0
@@ -189,6 +194,7 @@ Material:
189194
- _Anisotropy: 0
190195
- _Blend: 0
191196
- _BlendMode: 0
197+
- _BlendModePreserveSpecular: 1
192198
- _BumpScale: 1
193199
- _ClearCoatMask: 0
194200
- _ClearCoatSmoothness: 0
@@ -211,6 +217,7 @@ Material:
211217
- _DoubleSidedEnable: 0
212218
- _DoubleSidedNormalMode: 1
213219
- _DstBlend: 0
220+
- _DstBlendAlpha: 0
214221
- _EmissiveColorMode: 1
215222
- _EmissiveExposureWeight: 1
216223
- _EmissiveIntensity: 1
@@ -266,6 +273,7 @@ Material:
266273
- _SpecularHighlights: 1
267274
- _SpecularOcclusionMode: 1
268275
- _SrcBlend: 1
276+
- _SrcBlendAlpha: 1
269277
- _StencilRef: 0
270278
- _StencilRefDepth: 8
271279
- _StencilRefGBuffer: 10
@@ -295,6 +303,7 @@ Material:
295303
- _UseEmissiveIntensity: 0
296304
- _UseShadowThreshold: 0
297305
- _WorkflowMode: 1
306+
- _XRMotionVectorsPass: 1
298307
- _ZTestDepthEqualForOpaque: 3
299308
- _ZTestGBuffer: 4
300309
- _ZTestTransparent: 4
@@ -318,6 +327,7 @@ Material:
318327
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
319328
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
320329
m_BuildTextureStacks: []
330+
m_AllowLocking: 1
321331
--- !u!114 &7420360984238375301
322332
MonoBehaviour:
323333
m_ObjectHideFlags: 11
@@ -330,4 +340,4 @@ MonoBehaviour:
330340
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
331341
m_Name:
332342
m_EditorClassIdentifier:
333-
version: 4
343+
version: 10

‎Assets/Art/Materials/Visual Pinball/Bumper (Cap).mat‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ MonoBehaviour:
1515
version: 11
1616
--- !u!21 &2100000
1717
Material:
18-
serializedVersion: 6
18+
serializedVersion: 8
1919
m_ObjectHideFlags: 0
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Bumper (Cap)
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords:
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords: []
28+
m_InvalidKeywords: []
2629
m_LightmapFlags: 4
2730
m_EnableInstancingVariants: 0
2831
m_DoubleSidedGI: 0
@@ -35,6 +38,7 @@ Material:
3538
- TransparentBackface
3639
- RayTracingPrepass
3740
- MOTIONVECTORS
41+
m_LockedProperties:
3842
m_SavedProperties:
3943
serializedVersion: 3
4044
m_TexEnvs:
@@ -103,7 +107,7 @@ Material:
103107
m_Scale: {x: 1, y: 1}
104108
m_Offset: {x: 0, y: 0}
105109
- _MainTex:
106-
m_Texture: {fileID: 2800000, guid: 5603454214d62424caf42989f91359d0, type: 3}
110+
m_Texture: {fileID: 0}
107111
m_Scale: {x: 1, y: 1}
108112
m_Offset: {x: 0, y: 0}
109113
- _MaskMap:
@@ -170,6 +174,7 @@ Material:
170174
m_Texture: {fileID: 0}
171175
m_Scale: {x: 1, y: 1}
172176
m_Offset: {x: 0, y: 0}
177+
m_Ints: []
173178
m_Floats:
174179
- _AORemapMax: 1
175180
- _AORemapMin: 0
@@ -189,6 +194,7 @@ Material:
189194
- _Anisotropy: 0
190195
- _Blend: 0
191196
- _BlendMode: 0
197+
- _BlendModePreserveSpecular: 1
192198
- _BumpScale: 1
193199
- _ClearCoatMask: 0
194200
- _ClearCoatSmoothness: 0
@@ -211,6 +217,7 @@ Material:
211217
- _DoubleSidedEnable: 0
212218
- _DoubleSidedNormalMode: 1
213219
- _DstBlend: 0
220+
- _DstBlendAlpha: 0
214221
- _EmissiveColorMode: 1
215222
- _EmissiveExposureWeight: 1
216223
- _EmissiveIntensity: 1
@@ -266,6 +273,7 @@ Material:
266273
- _SpecularHighlights: 1
267274
- _SpecularOcclusionMode: 1
268275
- _SrcBlend: 1
276+
- _SrcBlendAlpha: 1
269277
- _StencilRef: 0
270278
- _StencilRefDepth: 0
271279
- _StencilRefGBuffer: 2
@@ -295,6 +303,7 @@ Material:
295303
- _UseEmissiveIntensity: 0
296304
- _UseShadowThreshold: 0
297305
- _WorkflowMode: 1
306+
- _XRMotionVectorsPass: 1
298307
- _ZTestDepthEqualForOpaque: 4
299308
- _ZTestGBuffer: 4
300309
- _ZTestTransparent: 4
@@ -318,6 +327,7 @@ Material:
318327
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
319328
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
320329
m_BuildTextureStacks: []
330+
m_AllowLocking: 1
321331
--- !u!114 &5226291923951786601
322332
MonoBehaviour:
323333
m_ObjectHideFlags: 11
@@ -330,4 +340,4 @@ MonoBehaviour:
330340
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
331341
m_Name:
332342
m_EditorClassIdentifier:
333-
version: 4
343+
version: 10

‎Assets/Art/Materials/Visual Pinball/Bumper (Ring).mat‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@ MonoBehaviour:
2525
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
2626
m_Name:
2727
m_EditorClassIdentifier:
28-
version: 4
28+
version: 10
2929
--- !u!21 &2100000
3030
Material:
31-
serializedVersion: 6
31+
serializedVersion: 8
3232
m_ObjectHideFlags: 0
3333
m_CorrespondingSourceObject: {fileID: 0}
3434
m_PrefabInstance: {fileID: 0}
3535
m_PrefabAsset: {fileID: 0}
3636
m_Name: Bumper (Ring)
3737
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
38-
m_ShaderKeywords:
38+
m_Parent: {fileID: 0}
39+
m_ModifiedSerializedProperties: 0
40+
m_ValidKeywords: []
41+
m_InvalidKeywords: []
3942
m_LightmapFlags: 4
4043
m_EnableInstancingVariants: 1
4144
m_DoubleSidedGI: 0
@@ -48,6 +51,7 @@ Material:
4851
- TransparentDepthPrepass
4952
- TransparentDepthPostpass
5053
- TransparentBackface
54+
m_LockedProperties:
5155
m_SavedProperties:
5256
serializedVersion: 3
5357
m_TexEnvs:
@@ -120,7 +124,7 @@ Material:
120124
m_Scale: {x: 1, y: 1}
121125
m_Offset: {x: 0, y: 0}
122126
- _MainTex:
123-
m_Texture: {fileID: 2800000, guid: f456e09c10545b54a8b565a817c848e3, type: 3}
127+
m_Texture: {fileID: 0}
124128
m_Scale: {x: 1, y: 1}
125129
m_Offset: {x: 0, y: 0}
126130
- _MaskMap:
@@ -187,6 +191,7 @@ Material:
187191
m_Texture: {fileID: 0}
188192
m_Scale: {x: 1, y: 1}
189193
m_Offset: {x: 0, y: 0}
194+
m_Ints: []
190195
m_Floats:
191196
- _AORemapMax: 1
192197
- _AORemapMin: 0
@@ -206,6 +211,7 @@ Material:
206211
- _Anisotropy: 0
207212
- _Blend: 0
208213
- _BlendMode: 0
214+
- _BlendModePreserveSpecular: 1
209215
- _BumpScale: 1
210216
- _ClearCoatMask: 0
211217
- _ClearCoatSmoothness: 0
@@ -242,6 +248,7 @@ Material:
242248
- _DoubleSidedEnable: 0
243249
- _DoubleSidedNormalMode: 1
244250
- _DstBlend: 0
251+
- _DstBlendAlpha: 0
245252
- _EmissiveColorMode: 1
246253
- _EmissiveExposureWeight: 1
247254
- _EmissiveIntensity: 1
@@ -298,6 +305,7 @@ Material:
298305
- _SpecularHighlights: 1
299306
- _SpecularOcclusionMode: 1
300307
- _SrcBlend: 1
308+
- _SrcBlendAlpha: 1
301309
- _StencilRef: 0
302310
- _StencilRefDepth: 8
303311
- _StencilRefDistortionVec: 4
@@ -329,6 +337,7 @@ Material:
329337
- _UseEmissiveIntensity: 0
330338
- _UseShadowThreshold: 0
331339
- _WorkflowMode: 1
340+
- _XRMotionVectorsPass: 1
332341
- _ZTestDepthEqualForOpaque: 3
333342
- _ZTestGBuffer: 4
334343
- _ZTestModeDistortion: 4
@@ -353,3 +362,4 @@ Material:
353362
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
354363
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
355364
m_BuildTextureStacks: []
365+
m_AllowLocking: 1

0 commit comments

Comments
 (0)