Skip to content

Commit e5d4721

Browse files
Pauliusd01Pauliusd01
committed
Add default materials for legacy built in render pipeline support
Add a SimpleLit shader and Default.mat assets (with .meta) across multiple sample folders (InGameHints, ProjectWideActions, RebindingUI, SimpleDemo, SimpleMultiplayer, UIvsGameInput, UnityRemote). Update sample scenes and prefabs to reference the new Default material GUIDs and adjust RebindingUI game materials to use the new shader GUID. This provides a shared lightweight PBR shader and default materials for the sample content.
1 parent c2a6c68 commit e5d4721

38 files changed

Lines changed: 1406 additions & 70 deletions

‎Assets/Samples/InGameHints/Default.mat‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Default
11+
m_Shader: {fileID: 4800000, guid: a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _MainTex:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
m_Floats:
27+
- _Glossiness: 0.5
28+
- _Metallic: 0
29+
m_Colors:
30+
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Samples/InGameHints/Default.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Samples/InGameHints/InGameHintsSampleScene.unity‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ MeshRenderer:
368368
m_RenderingLayerMask: 1
369369
m_RendererPriority: 0
370370
m_Materials:
371-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
371+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
372372
m_StaticBatchInfo:
373373
firstSubMesh: 0
374374
subMeshCount: 0
@@ -501,7 +501,7 @@ MeshRenderer:
501501
m_RenderingLayerMask: 1
502502
m_RendererPriority: 0
503503
m_Materials:
504-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
504+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
505505
m_StaticBatchInfo:
506506
firstSubMesh: 0
507507
subMeshCount: 0
@@ -713,7 +713,7 @@ MeshRenderer:
713713
m_RenderingLayerMask: 1
714714
m_RendererPriority: 0
715715
m_Materials:
716-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
716+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
717717
m_StaticBatchInfo:
718718
firstSubMesh: 0
719719
subMeshCount: 0
@@ -819,7 +819,7 @@ MeshRenderer:
819819
m_RenderingLayerMask: 1
820820
m_RendererPriority: 0
821821
m_Materials:
822-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
822+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
823823
m_StaticBatchInfo:
824824
firstSubMesh: 0
825825
subMeshCount: 0
@@ -952,7 +952,7 @@ MeshRenderer:
952952
m_RenderingLayerMask: 1
953953
m_RendererPriority: 0
954954
m_Materials:
955-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
955+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
956956
m_StaticBatchInfo:
957957
firstSubMesh: 0
958958
subMeshCount: 0
@@ -1085,7 +1085,7 @@ MeshRenderer:
10851085
m_RenderingLayerMask: 1
10861086
m_RendererPriority: 0
10871087
m_Materials:
1088-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1088+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
10891089
m_StaticBatchInfo:
10901090
firstSubMesh: 0
10911091
subMeshCount: 0
@@ -1218,7 +1218,7 @@ MeshRenderer:
12181218
m_RenderingLayerMask: 1
12191219
m_RendererPriority: 0
12201220
m_Materials:
1221-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1221+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
12221222
m_StaticBatchInfo:
12231223
firstSubMesh: 0
12241224
subMeshCount: 0
@@ -1351,7 +1351,7 @@ MeshRenderer:
13511351
m_RenderingLayerMask: 1
13521352
m_RendererPriority: 0
13531353
m_Materials:
1354-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1354+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
13551355
m_StaticBatchInfo:
13561356
firstSubMesh: 0
13571357
subMeshCount: 0
@@ -1484,7 +1484,7 @@ MeshRenderer:
14841484
m_RenderingLayerMask: 1
14851485
m_RendererPriority: 0
14861486
m_Materials:
1487-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1487+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
14881488
m_StaticBatchInfo:
14891489
firstSubMesh: 0
14901490
subMeshCount: 0
@@ -1617,7 +1617,7 @@ MeshRenderer:
16171617
m_RenderingLayerMask: 1
16181618
m_RendererPriority: 0
16191619
m_Materials:
1620-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1620+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
16211621
m_StaticBatchInfo:
16221622
firstSubMesh: 0
16231623
subMeshCount: 0
@@ -1750,7 +1750,7 @@ MeshRenderer:
17501750
m_RenderingLayerMask: 1
17511751
m_RendererPriority: 0
17521752
m_Materials:
1753-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1753+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
17541754
m_StaticBatchInfo:
17551755
firstSubMesh: 0
17561756
subMeshCount: 0
@@ -1883,7 +1883,7 @@ MeshRenderer:
18831883
m_RenderingLayerMask: 1
18841884
m_RendererPriority: 0
18851885
m_Materials:
1886-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
1886+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
18871887
m_StaticBatchInfo:
18881888
firstSubMesh: 0
18891889
subMeshCount: 0
@@ -2016,7 +2016,7 @@ MeshRenderer:
20162016
m_RenderingLayerMask: 1
20172017
m_RendererPriority: 0
20182018
m_Materials:
2019-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2019+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
20202020
m_StaticBatchInfo:
20212021
firstSubMesh: 0
20222022
subMeshCount: 0
@@ -2292,7 +2292,7 @@ MeshRenderer:
22922292
m_RenderingLayerMask: 1
22932293
m_RendererPriority: 0
22942294
m_Materials:
2295-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2295+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
22962296
m_StaticBatchInfo:
22972297
firstSubMesh: 0
22982298
subMeshCount: 0
@@ -2425,7 +2425,7 @@ MeshRenderer:
24252425
m_RenderingLayerMask: 1
24262426
m_RendererPriority: 0
24272427
m_Materials:
2428-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2428+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
24292429
m_StaticBatchInfo:
24302430
firstSubMesh: 0
24312431
subMeshCount: 0
@@ -2558,7 +2558,7 @@ MeshRenderer:
25582558
m_RenderingLayerMask: 1
25592559
m_RendererPriority: 0
25602560
m_Materials:
2561-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2561+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
25622562
m_StaticBatchInfo:
25632563
firstSubMesh: 0
25642564
subMeshCount: 0
@@ -2691,7 +2691,7 @@ MeshRenderer:
26912691
m_RenderingLayerMask: 1
26922692
m_RendererPriority: 0
26932693
m_Materials:
2694-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2694+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
26952695
m_StaticBatchInfo:
26962696
firstSubMesh: 0
26972697
subMeshCount: 0
@@ -2824,7 +2824,7 @@ MeshRenderer:
28242824
m_RenderingLayerMask: 1
28252825
m_RendererPriority: 0
28262826
m_Materials:
2827-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2827+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
28282828
m_StaticBatchInfo:
28292829
firstSubMesh: 0
28302830
subMeshCount: 0
@@ -2957,7 +2957,7 @@ MeshRenderer:
29572957
m_RenderingLayerMask: 1
29582958
m_RendererPriority: 0
29592959
m_Materials:
2960-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
2960+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
29612961
m_StaticBatchInfo:
29622962
firstSubMesh: 0
29632963
subMeshCount: 0
@@ -3090,7 +3090,7 @@ MeshRenderer:
30903090
m_RenderingLayerMask: 1
30913091
m_RendererPriority: 0
30923092
m_Materials:
3093-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
3093+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
30943094
m_StaticBatchInfo:
30953095
firstSubMesh: 0
30963096
subMeshCount: 0
@@ -3223,7 +3223,7 @@ MeshRenderer:
32233223
m_RenderingLayerMask: 1
32243224
m_RendererPriority: 0
32253225
m_Materials:
3226-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
3226+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
32273227
m_StaticBatchInfo:
32283228
firstSubMesh: 0
32293229
subMeshCount: 0
@@ -3356,7 +3356,7 @@ MeshRenderer:
33563356
m_RenderingLayerMask: 1
33573357
m_RendererPriority: 0
33583358
m_Materials:
3359-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
3359+
- {fileID: 2100000, guid: b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5, type: 2}
33603360
m_StaticBatchInfo:
33613361
firstSubMesh: 0
33623362
subMeshCount: 0

‎Assets/Samples/InGameHints/SimpleLit.shader.meta‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Samples/ProjectWideActions/Default.mat‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Default
11+
m_Shader: {fileID: 4800000, guid: c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _MainTex:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
m_Floats:
27+
- _Glossiness: 0.5
28+
- _Metallic: 0
29+
m_Colors:
30+
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Samples/ProjectWideActions/Default.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Samples/ProjectWideActions/ProjectWideActionsSampleScene.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ MeshRenderer:
413413
m_RenderingLayerMask: 1
414414
m_RendererPriority: 0
415415
m_Materials:
416-
- {fileID: 2100000, guid: c8291cad59243b24ba551b0bc44dc40d, type: 2}
416+
- {fileID: 2100000, guid: d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1, type: 2}
417417
m_StaticBatchInfo:
418418
firstSubMesh: 0
419419
subMeshCount: 0

0 commit comments

Comments
 (0)