Skip to content

Commit 1d3dca2

Browse files
freezyfreezy
committed
Update diffusion profiles and HDRP assets to 2022.
1 parent 4d6ea7c commit 1d3dca2

File tree

10 files changed

+162
-151
lines changed

10 files changed

+162
-151
lines changed

‎Assets/Resources/Materials/ChromeBall.mat‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,25 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 12
15+
version: 13
1616
hdPluginSubTargetMaterialVersions:
1717
m_Keys: []
1818
m_Values:
1919
--- !u!21 &2100000
2020
Material:
21-
serializedVersion: 6
21+
serializedVersion: 8
2222
m_ObjectHideFlags: 0
2323
m_CorrespondingSourceObject: {fileID: 0}
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
2626
m_Name: ChromeBall
2727
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
28-
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
28+
m_Parent: {fileID: 0}
29+
m_ModifiedSerializedProperties: 0
30+
m_ValidKeywords:
31+
- _DISABLE_SSR_TRANSPARENT
32+
- _NORMALMAP_TANGENT_SPACE
33+
m_InvalidKeywords: []
2934
m_LightmapFlags: 4
3035
m_EnableInstancingVariants: 1
3136
m_DoubleSidedGI: 0
@@ -39,6 +44,7 @@ Material:
3944
- TransparentBackface
4045
- RayTracingPrepass
4146
- ForwardEmissiveForDeferred
47+
m_LockedProperties:
4248
m_SavedProperties:
4349
serializedVersion: 3
4450
m_TexEnvs:

‎Assets/Resources/Materials/TableCutout.mat‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
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: TableCutout
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP_TANGENT_SPACE
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _ALPHATEST_ON
16+
- _DISABLE_SSR_TRANSPARENT
17+
- _DOUBLESIDED_ON
18+
- _NORMALMAP_TANGENT_SPACE
19+
m_InvalidKeywords: []
1320
m_LightmapFlags: 4
1421
m_EnableInstancingVariants: 0
1522
m_DoubleSidedGI: 1
@@ -24,6 +31,7 @@ Material:
2431
- TransparentBackface
2532
- RayTracingPrepass
2633
- ForwardEmissiveForDeferred
34+
m_LockedProperties:
2735
m_SavedProperties:
2836
serializedVersion: 3
2937
m_TexEnvs:
@@ -107,6 +115,10 @@ Material:
107115
m_Texture: {fileID: 0}
108116
m_Scale: {x: 1, y: 1}
109117
m_Offset: {x: 0, y: 0}
118+
- _TransmissionMaskMap:
119+
m_Texture: {fileID: 0}
120+
m_Scale: {x: 1, y: 1}
121+
m_Offset: {x: 0, y: 0}
110122
- _TransmittanceColorMap:
111123
m_Texture: {fileID: 0}
112124
m_Scale: {x: 1, y: 1}
@@ -136,6 +148,8 @@ Material:
136148
- _AlphaCutoffPrepass: 0.5
137149
- _AlphaCutoffShadow: 0.5
138150
- _AlphaDstBlend: 0
151+
- _AlphaRemapMax: 1
152+
- _AlphaRemapMin: 0
139153
- _AlphaSrcBlend: 1
140154
- _AlphaToMask: 0
141155
- _AlphaToMaskInspectorValue: 0
@@ -201,6 +215,8 @@ Material:
201215
- _MetallicRemapMin: 0
202216
- _NormalMapSpace: 0
203217
- _NormalScale: 1
218+
- _ObjectSpaceUVMapping: 0
219+
- _ObjectSpaceUVMappingEmissive: 0
204220
- _OpaqueCullMode: 2
205221
- _PPDLodThreshold: 5
206222
- _PPDMaxSamples: 15
@@ -224,17 +240,18 @@ Material:
224240
- _StencilRefGBuffer: 10
225241
- _StencilRefMV: 40
226242
- _StencilWriteMask: 6
227-
- _StencilWriteMaskDepth: 8
243+
- _StencilWriteMaskDepth: 9
228244
- _StencilWriteMaskDistortionVec: 4
229-
- _StencilWriteMaskGBuffer: 14
230-
- _StencilWriteMaskMV: 40
245+
- _StencilWriteMaskGBuffer: 15
246+
- _StencilWriteMaskMV: 41
231247
- _SubsurfaceMask: 1
232248
- _SupportDecals: 1
233249
- _SurfaceType: 0
234250
- _TexWorldScale: 1
235251
- _TexWorldScaleEmissive: 1
236252
- _Thickness: 1
237253
- _TransmissionEnable: 1
254+
- _TransmissionMask: 1
238255
- _TransparentBackfaceEnable: 0
239256
- _TransparentCullMode: 2
240257
- _TransparentDepthPostpassEnable: 0
@@ -282,7 +299,7 @@ MonoBehaviour:
282299
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
283300
m_Name:
284301
m_EditorClassIdentifier:
285-
version: 12
302+
version: 13
286303
hdPluginSubTargetMaterialVersions:
287304
m_Keys: []
288305
m_Values:

‎Assets/Resources/Materials/TableOpaque.mat‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
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: TableOpaque
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
12-
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP_TANGENT_SPACE
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _DISABLE_SSR_TRANSPARENT
16+
- _DOUBLESIDED_ON
17+
- _NORMALMAP_TANGENT_SPACE
18+
m_InvalidKeywords: []
1319
m_LightmapFlags: 4
1420
m_EnableInstancingVariants: 0
1521
m_DoubleSidedGI: 1
@@ -23,6 +29,7 @@ Material:
2329
- TransparentBackface
2430
- RayTracingPrepass
2531
- ForwardEmissiveForDeferred
32+
m_LockedProperties:
2633
m_SavedProperties:
2734
serializedVersion: 3
2835
m_TexEnvs:
@@ -106,6 +113,10 @@ Material:
106113
m_Texture: {fileID: 0}
107114
m_Scale: {x: 1, y: 1}
108115
m_Offset: {x: 0, y: 0}
116+
- _TransmissionMaskMap:
117+
m_Texture: {fileID: 0}
118+
m_Scale: {x: 1, y: 1}
119+
m_Offset: {x: 0, y: 0}
109120
- _TransmittanceColorMap:
110121
m_Texture: {fileID: 0}
111122
m_Scale: {x: 1, y: 1}
@@ -135,6 +146,8 @@ Material:
135146
- _AlphaCutoffPrepass: 0.5
136147
- _AlphaCutoffShadow: 0.5
137148
- _AlphaDstBlend: 0
149+
- _AlphaRemapMax: 1
150+
- _AlphaRemapMin: 0
138151
- _AlphaSrcBlend: 1
139152
- _AlphaToMask: 0
140153
- _AlphaToMaskInspectorValue: 0
@@ -200,6 +213,8 @@ Material:
200213
- _MetallicRemapMin: 0
201214
- _NormalMapSpace: 0
202215
- _NormalScale: 0
216+
- _ObjectSpaceUVMapping: 0
217+
- _ObjectSpaceUVMappingEmissive: 0
203218
- _OpaqueCullMode: 2
204219
- _PPDLodThreshold: 5
205220
- _PPDMaxSamples: 15
@@ -223,17 +238,18 @@ Material:
223238
- _StencilRefGBuffer: 10
224239
- _StencilRefMV: 40
225240
- _StencilWriteMask: 6
226-
- _StencilWriteMaskDepth: 8
241+
- _StencilWriteMaskDepth: 9
227242
- _StencilWriteMaskDistortionVec: 4
228-
- _StencilWriteMaskGBuffer: 14
229-
- _StencilWriteMaskMV: 40
243+
- _StencilWriteMaskGBuffer: 15
244+
- _StencilWriteMaskMV: 41
230245
- _SubsurfaceMask: 1
231246
- _SupportDecals: 1
232247
- _SurfaceType: 0
233248
- _TexWorldScale: 1
234249
- _TexWorldScaleEmissive: 1
235250
- _Thickness: 1
236251
- _TransmissionEnable: 1
252+
- _TransmissionMask: 1
237253
- _TransparentBackfaceEnable: 0
238254
- _TransparentCullMode: 2
239255
- _TransparentDepthPostpassEnable: 0
@@ -281,7 +297,7 @@ MonoBehaviour:
281297
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
282298
m_Name:
283299
m_EditorClassIdentifier:
284-
version: 12
300+
version: 13
285301
hdPluginSubTargetMaterialVersions:
286302
m_Keys: []
287303
m_Values:

‎Assets/Resources/Materials/TableTranslucent.mat‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,28 @@ MonoBehaviour:
2727
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
2828
m_Name:
2929
m_EditorClassIdentifier:
30-
version: 12
30+
version: 13
3131
hdPluginSubTargetMaterialVersions:
3232
m_Keys: []
3333
m_Values:
3434
--- !u!21 &2100000
3535
Material:
36-
serializedVersion: 6
36+
serializedVersion: 8
3737
m_ObjectHideFlags: 0
3838
m_CorrespondingSourceObject: {fileID: 0}
3939
m_PrefabInstance: {fileID: 0}
4040
m_PrefabAsset: {fileID: 0}
4141
m_Name: TableTranslucent
4242
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
43-
m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _MATERIAL_FEATURE_TRANSMISSION
44-
_NORMALMAP_TANGENT_SPACE
43+
m_Parent: {fileID: 0}
44+
m_ModifiedSerializedProperties: 0
45+
m_ValidKeywords:
46+
- _ALPHATEST_ON
47+
- _DISABLE_SSR_TRANSPARENT
48+
- _DOUBLESIDED_ON
49+
- _MATERIAL_FEATURE_TRANSMISSION
50+
- _NORMALMAP_TANGENT_SPACE
51+
m_InvalidKeywords: []
4552
m_LightmapFlags: 4
4653
m_EnableInstancingVariants: 0
4754
m_DoubleSidedGI: 1
@@ -56,6 +63,7 @@ Material:
5663
- TransparentBackface
5764
- RayTracingPrepass
5865
- ForwardEmissiveForDeferred
66+
m_LockedProperties:
5967
m_SavedProperties:
6068
serializedVersion: 3
6169
m_TexEnvs:
@@ -139,6 +147,10 @@ Material:
139147
m_Texture: {fileID: 0}
140148
m_Scale: {x: 1, y: 1}
141149
m_Offset: {x: 0, y: 0}
150+
- _TransmissionMaskMap:
151+
m_Texture: {fileID: 0}
152+
m_Scale: {x: 1, y: 1}
153+
m_Offset: {x: 0, y: 0}
142154
- _TransmittanceColorMap:
143155
m_Texture: {fileID: 0}
144156
m_Scale: {x: 1, y: 1}
@@ -168,6 +180,8 @@ Material:
168180
- _AlphaCutoffPrepass: 0.5
169181
- _AlphaCutoffShadow: 0.5
170182
- _AlphaDstBlend: 0
183+
- _AlphaRemapMax: 1
184+
- _AlphaRemapMin: 0
171185
- _AlphaSrcBlend: 1
172186
- _AlphaToMask: 0
173187
- _AlphaToMaskInspectorValue: 0
@@ -233,6 +247,8 @@ Material:
233247
- _MetallicRemapMin: 0
234248
- _NormalMapSpace: 0
235249
- _NormalScale: 1
250+
- _ObjectSpaceUVMapping: 0
251+
- _ObjectSpaceUVMappingEmissive: 0
236252
- _OpaqueCullMode: 2
237253
- _PPDLodThreshold: 5
238254
- _PPDMaxSamples: 15
@@ -256,17 +272,18 @@ Material:
256272
- _StencilRefGBuffer: 10
257273
- _StencilRefMV: 40
258274
- _StencilWriteMask: 6
259-
- _StencilWriteMaskDepth: 8
275+
- _StencilWriteMaskDepth: 9
260276
- _StencilWriteMaskDistortionVec: 4
261-
- _StencilWriteMaskGBuffer: 14
262-
- _StencilWriteMaskMV: 40
277+
- _StencilWriteMaskGBuffer: 15
278+
- _StencilWriteMaskMV: 41
263279
- _SubsurfaceMask: 1
264280
- _SupportDecals: 1
265281
- _SurfaceType: 0
266282
- _TexWorldScale: 1
267283
- _TexWorldScaleEmissive: 1
268284
- _Thickness: 1
269285
- _TransmissionEnable: 1
286+
- _TransmissionMask: 1
270287
- _TransparentBackfaceEnable: 0
271288
- _TransparentCullMode: 2
272289
- _TransparentDepthPostpassEnable: 0

‎Assets/Settings/Diffusion Profiles/Plastics.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ MonoBehaviour:
1313
m_Name: Plastics
1414
m_EditorClassIdentifier:
1515
profile:
16-
scatteringDistance: {r: 135.58704, g: 135.58704, b: 135.58704, a: 1}
16+
scatteringDistance: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
17+
scatteringDistanceMultiplier: 181.01933
1718
transmissionTint: {r: 1, g: 0.8933878, b: 0.7688679, a: 1}
1819
texturingMode: 0
1920
transmissionMode: 0
2021
thicknessRemap: {x: 0, y: 2}
2122
worldScale: 0.03
2223
ior: 1.6357
2324
hash: 1079858023
24-
m_Version: 1
25+
m_Version: 2

‎Assets/Settings/Diffusion Profiles/Plastics_Old.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ MonoBehaviour:
1313
m_Name: Plastics_Old
1414
m_EditorClassIdentifier:
1515
profile:
16-
scatteringDistance: {r: 0.8603976, g: 0.8603976, b: 0.8603976, a: 1}
16+
scatteringDistance: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
17+
scatteringDistanceMultiplier: 1.1486983
1718
transmissionTint: {r: 1, g: 0.6406258, b: 0.3160377, a: 1}
1819
texturingMode: 0
1920
transmissionMode: 0
2021
thicknessRemap: {x: 0, y: 2}
2122
worldScale: 0.01
2223
ior: 1.6
2324
hash: 1075532174
24-
m_Version: 1
25+
m_Version: 2

‎Assets/Settings/Diffusion Profiles/ThickerPlastic.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ MonoBehaviour:
1313
m_Name: ThickerPlastic
1414
m_EditorClassIdentifier:
1515
profile:
16-
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
16+
scatteringDistance: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
17+
scatteringDistanceMultiplier: 0.66753924
1718
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
1819
texturingMode: 0
1920
transmissionMode: 0
2021
thicknessRemap: {x: 0, y: 2}
2122
worldScale: 0.01
2223
ior: 1.6
2324
hash: 1079717041
24-
m_Version: 1
25+
m_Version: 2

‎Assets/Settings/Diffusion Profiles/Translite.asset‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ MonoBehaviour:
1313
m_Name: Translite
1414
m_EditorClassIdentifier:
1515
profile:
16-
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
16+
scatteringDistance: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
17+
scatteringDistanceMultiplier: 0.66753924
1718
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
1819
texturingMode: 0
1920
transmissionMode: 1
2021
thicknessRemap: {x: 0, y: 6}
2122
worldScale: 0.03
2223
ior: 1.787
2324
hash: 1076073284
24-
m_Version: 1
25+
m_Version: 2

0 commit comments

Comments
 (0)