Skip to content

Commit 2baa057

Browse files
radishfaceradishface
committed
Upgrade to 2021.3.33f1
Added updated textures from the HDRP branch
1 parent aba0e8a commit 2baa057

File tree

382 files changed

+10049
-7410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+10049
-7410
lines changed

‎Assets/ClassicSponza/Art/Sponza/Materials/Arches.mat

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
15+
version: 5
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: Arches
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
m_InvalidKeywords: []
2630
m_LightmapFlags: 4
2731
m_EnableInstancingVariants: 0
2832
m_DoubleSidedGI: 0
@@ -116,7 +120,7 @@ Material:
116120
m_Scale: {x: 1, y: 1}
117121
m_Offset: {x: 0, y: 0}
118122
- _MetallicGlossMap:
119-
m_Texture: {fileID: 2800000, guid: d6bc1aba29cae68489b6238fd122b4d9, type: 3}
123+
m_Texture: {fileID: 2800000, guid: 3cd1ff65ffc146e47b7a603f152ae563, type: 3}
120124
m_Scale: {x: 1, y: 1}
121125
m_Offset: {x: 0, y: 0}
122126
- _NormalMap:
@@ -175,6 +179,7 @@ Material:
175179
m_Texture: {fileID: 0}
176180
m_Scale: {x: 1, y: 1}
177181
m_Offset: {x: 0, y: 0}
182+
m_Ints: []
178183
m_Floats:
179184
- _AORemapMax: 1
180185
- _AORemapMin: 0.43940467
@@ -269,7 +274,7 @@ Material:
269274
- _MetallicRemapMin: 0
270275
- _NormalMapSpace: 0
271276
- _NormalScale: 1
272-
- _OcclusionStrength: 0.3
277+
- _OcclusionStrength: 1
273278
- _OpaqueCullMode: 2
274279
- _PPDLodThreshold: 5
275280
- _PPDMaxSamples: 15

‎Assets/ClassicSponza/Art/Sponza/Materials/Bricks.mat

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,22 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
15+
version: 5
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: Bricks
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
- _PARALLAXMAP
30+
m_InvalidKeywords: []
2631
m_LightmapFlags: 4
2732
m_EnableInstancingVariants: 0
2833
m_DoubleSidedGI: 0
@@ -60,7 +65,7 @@ Material:
6065
m_Scale: {x: 1, y: 1}
6166
m_Offset: {x: 0, y: 0}
6267
- _BumpMap:
63-
m_Texture: {fileID: 2800000, guid: b7212cb7a7168a847ac377060c87545c, type: 3}
68+
m_Texture: {fileID: 2800000, guid: b14744a41f4097748bd9baf60dd64ef8, type: 3}
6469
m_Scale: {x: 1, y: 1}
6570
m_Offset: {x: 0, y: 0}
6671
- _CoatMaskMap:
@@ -116,7 +121,7 @@ Material:
116121
m_Scale: {x: 1, y: 1}
117122
m_Offset: {x: 0, y: 0}
118123
- _MetallicGlossMap:
119-
m_Texture: {fileID: 2800000, guid: dfbec9d7128dc9e4aa62a74686bfd08e, type: 3}
124+
m_Texture: {fileID: 2800000, guid: f866f756d992dca4b81d1e080d1b2c2d, type: 3}
120125
m_Scale: {x: 1, y: 1}
121126
m_Offset: {x: 0, y: 0}
122127
- _NormalMap:
@@ -175,6 +180,7 @@ Material:
175180
m_Texture: {fileID: 0}
176181
m_Scale: {x: 1, y: 1}
177182
m_Offset: {x: 0, y: 0}
183+
m_Ints: []
178184
m_Floats:
179185
- _AORemapMax: 1
180186
- _AORemapMin: 0

‎Assets/ClassicSponza/Art/Sponza/Materials/Ceiling.mat

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ 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: Ceiling
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
m_InvalidKeywords: []
2630
m_LightmapFlags: 4
2731
m_EnableInstancingVariants: 0
2832
m_DoubleSidedGI: 0
@@ -116,7 +120,7 @@ Material:
116120
m_Scale: {x: 1, y: 1}
117121
m_Offset: {x: 0, y: 0}
118122
- _MetallicGlossMap:
119-
m_Texture: {fileID: 2800000, guid: a5738e46d31073f48896b1d77c0b8d73, type: 3}
123+
m_Texture: {fileID: 2800000, guid: e71d14611da5a0449a97ba52985f0f81, type: 3}
120124
m_Scale: {x: 1, y: 1}
121125
m_Offset: {x: 0, y: 0}
122126
- _NormalMap:
@@ -128,7 +132,7 @@ Material:
128132
m_Scale: {x: 1, y: 1}
129133
m_Offset: {x: 0, y: 0}
130134
- _OcclusionMap:
131-
m_Texture: {fileID: 2800000, guid: 9509140f83dd27e4d85035994c06021d, type: 3}
135+
m_Texture: {fileID: 2800000, guid: b0b89532d01741b40bdb557180d80a2c, type: 3}
132136
m_Scale: {x: 1, y: 1}
133137
m_Offset: {x: 0, y: 0}
134138
- _ParallaxMap:
@@ -175,6 +179,7 @@ Material:
175179
m_Texture: {fileID: 0}
176180
m_Scale: {x: 1, y: 1}
177181
m_Offset: {x: 0, y: 0}
182+
m_Ints: []
178183
m_Floats:
179184
- _AORemapMax: 1
180185
- _AORemapMin: 0.19135365
@@ -268,7 +273,7 @@ Material:
268273
- _MetallicRemapMin: 0
269274
- _NormalMapSpace: 0
270275
- _NormalScale: 1
271-
- _OcclusionStrength: 0.75
276+
- _OcclusionStrength: 1
272277
- _OpaqueCullMode: 2
273278
- _PPDLodThreshold: 5
274279
- _PPDMaxSamples: 15
@@ -365,4 +370,4 @@ MonoBehaviour:
365370
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
366371
m_Name:
367372
m_EditorClassIdentifier:
368-
version: 4
373+
version: 5

‎Assets/ClassicSponza/Art/Sponza/Materials/Column_A.mat

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
15+
version: 5
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: Column_A
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
m_InvalidKeywords: []
2630
m_LightmapFlags: 4
2731
m_EnableInstancingVariants: 0
2832
m_DoubleSidedGI: 0
@@ -116,7 +120,7 @@ Material:
116120
m_Scale: {x: 1, y: 1}
117121
m_Offset: {x: 0, y: 0}
118122
- _MetallicGlossMap:
119-
m_Texture: {fileID: 2800000, guid: 295a39c729312ba44ba85c622e35e122, type: 3}
123+
m_Texture: {fileID: 2800000, guid: 447c81082d1b2ee4ba731b9175a3bc83, type: 3}
120124
m_Scale: {x: 1, y: 1}
121125
m_Offset: {x: 0, y: 0}
122126
- _NormalMap:
@@ -175,6 +179,7 @@ Material:
175179
m_Texture: {fileID: 0}
176180
m_Scale: {x: 1, y: 1}
177181
m_Offset: {x: 0, y: 0}
182+
m_Ints: []
178183
m_Floats:
179184
- _AORemapMax: 0.9999999
180185
- _AORemapMin: 0

‎Assets/ClassicSponza/Art/Sponza/Materials/Column_B.mat

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
15+
version: 5
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: Column_B
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
m_InvalidKeywords: []
2630
m_LightmapFlags: 4
2731
m_EnableInstancingVariants: 0
2832
m_DoubleSidedGI: 0
@@ -116,7 +120,7 @@ Material:
116120
m_Scale: {x: 1, y: 1}
117121
m_Offset: {x: 0, y: 0}
118122
- _MetallicGlossMap:
119-
m_Texture: {fileID: 2800000, guid: 5c0cacb4e65a5654b8cfc89bddeab966, type: 3}
123+
m_Texture: {fileID: 2800000, guid: 8dc31d58c93c7214680f12b073ccb07c, type: 3}
120124
m_Scale: {x: 1, y: 1}
121125
m_Offset: {x: 0, y: 0}
122126
- _NormalMap:
@@ -175,6 +179,7 @@ Material:
175179
m_Texture: {fileID: 0}
176180
m_Scale: {x: 1, y: 1}
177181
m_Offset: {x: 0, y: 0}
182+
m_Ints: []
178183
m_Floats:
179184
- _AORemapMax: 1
180185
- _AORemapMin: 0.23387668
@@ -269,7 +274,7 @@ Material:
269274
- _MetallicRemapMin: 0
270275
- _NormalMapSpace: 0
271276
- _NormalScale: 1
272-
- _OcclusionStrength: 0.75
277+
- _OcclusionStrength: 1
273278
- _OpaqueCullMode: 2
274279
- _PPDLodThreshold: 5
275280
- _PPDMaxSamples: 15

‎Assets/ClassicSponza/Art/Sponza/Materials/Column_C.mat

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
15+
version: 5
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: Column_C
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
m_InvalidKeywords: []
2630
m_LightmapFlags: 4
2731
m_EnableInstancingVariants: 0
2832
m_DoubleSidedGI: 0
@@ -116,7 +120,7 @@ Material:
116120
m_Scale: {x: 1, y: 1}
117121
m_Offset: {x: 0, y: 0}
118122
- _MetallicGlossMap:
119-
m_Texture: {fileID: 2800000, guid: 932ec6c8ba6f6bd4d98d4ad820bf87c6, type: 3}
123+
m_Texture: {fileID: 2800000, guid: ac4ecd3d53121944ab657c4b2d46b565, type: 3}
120124
m_Scale: {x: 1, y: 1}
121125
m_Offset: {x: 0, y: 0}
122126
- _NormalMap:
@@ -175,6 +179,7 @@ Material:
175179
m_Texture: {fileID: 0}
176180
m_Scale: {x: 1, y: 1}
177181
m_Offset: {x: 0, y: 0}
182+
m_Ints: []
178183
m_Floats:
179184
- _AORemapMax: 0.99999994
180185
- _AORemapMin: 0.18426646
@@ -269,7 +274,7 @@ Material:
269274
- _MetallicRemapMin: 0
270275
- _NormalMapSpace: 0
271276
- _NormalScale: 1
272-
- _OcclusionStrength: 0.5
277+
- _OcclusionStrength: 1
273278
- _OpaqueCullMode: 2
274279
- _PPDLodThreshold: 5
275280
- _PPDMaxSamples: 15

‎Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Blue.mat

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
15+
version: 5
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: Curtain_Blue
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_ValidKeywords:
26+
- _METALLICSPECGLOSSMAP
27+
- _NORMALMAP
28+
- _OCCLUSIONMAP
29+
m_InvalidKeywords: []
2630
m_LightmapFlags: 4
2731
m_EnableInstancingVariants: 0
2832
m_DoubleSidedGI: 0
@@ -175,6 +179,7 @@ Material:
175179
m_Texture: {fileID: 0}
176180
m_Scale: {x: 1, y: 1}
177181
m_Offset: {x: 0, y: 0}
182+
m_Ints: []
178183
m_Floats:
179184
- _AORemapMax: 1
180185
- _AORemapMin: 0

‎Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Green.mat

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
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: Curtain_Green
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
12+
m_ValidKeywords:
13+
- _METALLICSPECGLOSSMAP
14+
- _NORMALMAP
15+
- _OCCLUSIONMAP
16+
m_InvalidKeywords: []
1317
m_LightmapFlags: 4
1418
m_EnableInstancingVariants: 0
1519
m_DoubleSidedGI: 0
@@ -162,6 +166,7 @@ Material:
162166
m_Texture: {fileID: 0}
163167
m_Scale: {x: 1, y: 1}
164168
m_Offset: {x: 0, y: 0}
169+
m_Ints: []
165170
m_Floats:
166171
- _AORemapMax: 1
167172
- _AORemapMin: 0
@@ -365,4 +370,4 @@ MonoBehaviour:
365370
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
366371
m_Name:
367372
m_EditorClassIdentifier:
368-
version: 4
373+
version: 5

0 commit comments

Comments
 (0)