Skip to content

Commit af8670b

Browse files
peeweekpeeweek
authored
Updating to 2019.3 / 7.2.0 (#14)
* Updated to 7.2.0 + Fixed Assets * Rebuilt VFX * Fixed GrassWind Ambient, Fixed Chomper SSS Profile * Rebuilt VFX, Fixed Voxelized Terrain UI labels disappearing in 1440p * Updated Changelog
1 parent 98b6549 commit af8670b

File tree

95 files changed

+1368
-1557
lines changed

Some content is hidden

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

95 files changed

+1368
-1557
lines changed

‎Assets/HDRP/HDRenderPipelineAsset.asset

+13-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3}
1313
m_Name: HDRenderPipelineAsset
1414
m_EditorClassIdentifier:
15-
m_Version: 11
15+
m_Version: 14
1616
m_ObsoleteFrameSettings:
1717
overrides: 0
1818
enableShadow: 0
@@ -151,13 +151,12 @@ MonoBehaviour:
151151
m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7,
152152
type: 2}
153153
m_RenderPipelineRayTracingResources: {fileID: 0}
154-
m_DefaultVolumeProfile: {fileID: 11400000, guid: 3043edc9d9a47704fad99f10fea80a08,
155-
type: 2}
154+
m_DefaultVolumeProfile: {fileID: 0}
156155
m_DefaultLookDevProfile: {fileID: 0}
157156
m_RenderingPathDefaultCameraFrameSettings:
158157
bitDatas:
159158
data1: 52688510517085
160-
data2: 4539628424926265344
159+
data2: 4539628425463136256
161160
lodBias: 1
162161
lodBiasMode: 0
163162
lodBiasQualityLevel: 0
@@ -219,14 +218,14 @@ MonoBehaviour:
219218
supportDitheringCrossFade: 1
220219
supportTerrainHole: 0
221220
supportRayTracing: 0
222-
supportedRaytracingTier: 2
223221
lightLoopSettings:
224-
cookieSize: 128
225-
cookieTexArraySize: 16
222+
cookieAtlasSize: 2048
223+
cookieFormat: 74
226224
pointCookieSize: 128
227225
cubeCookieTexArraySize: 16
228-
planarReflectionProbeCacheSize: 2
229-
planarReflectionTextureSize: 256
226+
cookieAtlasLastValidMip: 0
227+
cookieTexArraySize: 16
228+
planarReflectionAtlasSize: 4096
230229
reflectionProbeCacheSize: 4
231230
reflectionCubemapSize: 128
232231
reflectionCacheCompressed: 0
@@ -241,6 +240,7 @@ MonoBehaviour:
241240
maxAreaLightsOnScreen: 64
242241
maxEnvLightsOnScreen: 64
243242
maxDecalsOnScreen: 512
243+
maxPlanarReflectionOnScreen: 16
244244
hdShadowInitParams:
245245
maxShadowRequests: 128
246246
directionalShadowsDepthBits: 32
@@ -269,7 +269,8 @@ MonoBehaviour:
269269
maxPunctualShadowMapResolution: 2048
270270
maxAreaShadowMapResolution: 2048
271271
supportScreenSpaceShadows: 0
272-
maxScreenSpaceShadows: 2
272+
maxScreenSpaceShadowSlots: 4
273+
screenSpaceShadowBufferFormat: 48
273274
decalSettings:
274275
drawDistance: 1000
275276
atlasWidth: 4096
@@ -278,6 +279,7 @@ MonoBehaviour:
278279
postProcessSettings:
279280
m_LutSize: 32
280281
lutFormat: 48
282+
bufferFormat: 74
281283
dynamicResolutionSettings:
282284
enabled: 1
283285
maxPercentage: 100
@@ -349,6 +351,7 @@ MonoBehaviour:
349351
- {fileID: 11400000, guid: fa0bd868de6beb242b58530817c2fa99, type: 2}
350352
- {fileID: 11400000, guid: a6e49c92568d36640bf75bae8006ad8f, type: 2}
351353
- {fileID: 11400000, guid: 6e1a48f5bc9e7a94b9d007084193aace, type: 2}
354+
- {fileID: 11400000, guid: 13713b45b71602b4aa14178bc2aaf1c4, type: 2}
352355
beforeTransparentCustomPostProcesses: []
353356
beforePostProcessCustomPostProcesses: []
354357
afterPostProcessCustomPostProcesses: []

‎Assets/Samples/ARRadar/ARRadar.vfx

+11-5
Original file line numberDiff line numberDiff line change
@@ -3228,7 +3228,7 @@ VisualEffectResource:
32283228
\"Packages/com.unity.visualeffectgraph/Shaders/VFXCommon.hlsl\"\n\n\r\n\r\nvoid
32293229
Turbulence_18D(float3 position, inout float3 velocity, float mass, float4x4
32303230
InvFieldTransform, float4x4 FieldTransform, float Intensity, float Drag, float
3231-
frequency, float roughness, float lacunarity, int octaves, float deltaTime)
3231+
frequency, int octaves, float roughness, float lacunarity, float deltaTime)
32323232
/*Mode:Relative NoiseType:Value */\n{\n float3 vectorFieldCoord = mul(InvFieldTransform,
32333233
float4(position,1.0f)).xyz;\n \n float3 value = GenerateValueCurlNoise(vectorFieldCoord
32343234
+ 0.5f, frequency, octaves, roughness, lacunarity);\n value = mul(FieldTransform,float4(value,0.0f)).xyz
@@ -3260,7 +3260,7 @@ VisualEffectResource:
32603260
InitStripAttributes(index, attributes, stripData);\r\n#endif\r\n\t\t\t\r\n\t\t\t{\n\t\t\t
32613261
Turbulence_18D(attributes.position, /*inout */attributes.velocity, attributes.mass,
32623262
float4x4(1.42857146,0,0,0,0,4.99999952,0,0,0,0,1.42857146,0,0,0,0,1), float4x4(0.699999988,0,0,0,0,0.200000003,0,0,0,0,0.699999988,0,0,0,0,1),
3263-
(float)0.200000003, (float)0.200000003, (float)1.5, (float)1, (float)2, (int)4,
3263+
(float)0.200000003, (float)0.200000003, (float)1.5, (int)4, (float)1, (float)2,
32643264
deltaTime_a);\n\t\t\t}\n\t\t\t{\n\t\t\t float3 tmp_z = attributes.position
32653265
- attributes.targetPosition;\n\t\t\t float3 tmp_ba = tmp_z * tmp_z;\n\t\t\t
32663266
float tmp_bb = tmp_ba[2];\n\t\t\t float tmp_bc = tmp_ba[1];\n\t\t\t float
@@ -3304,7 +3304,7 @@ VisualEffectResource:
33043304
InitStripAttributes(index, attributes, stripData);\r\n#endif\r\n\t\t\r\n\t\t{\n\t\t
33053305
Turbulence_18D(attributes.position, /*inout */attributes.velocity, attributes.mass,
33063306
float4x4(1.42857146,0,0,0,0,4.99999952,0,0,0,0,1.42857146,0,0,0,0,1), float4x4(0.699999988,0,0,0,0,0.200000003,0,0,0,0,0.699999988,0,0,0,0,1),
3307-
(float)0.200000003, (float)0.200000003, (float)1.5, (float)1, (float)2, (int)4,
3307+
(float)0.200000003, (float)0.200000003, (float)1.5, (int)4, (float)1, (float)2,
33083308
deltaTime_a);\n\t\t}\n\t\t{\n\t\t float3 tmp_z = attributes.position - attributes.targetPosition;\n\t\t
33093309
float3 tmp_ba = tmp_z * tmp_z;\n\t\t float tmp_bb = tmp_ba[2];\n\t\t
33103310
float tmp_bc = tmp_ba[1];\n\t\t float tmp_bd = tmp_bb + tmp_bc;\n\t\t
@@ -7213,8 +7213,8 @@ VisualEffectResource:
72137213
= float4(_ObjectId, _PassValue, 1.0, 1.0);\n\t\t\t\t#elif VFX_PASSDEPTH ==
72147214
VFX_PASSDEPTH_ACTUAL\n\t\t\t\t\t//void\n\t\t\t\t#else\n\t\t\t\t\t#error VFX_PASSDEPTH
72157215
undefined\n\t\t\t\t#endif\n\t\t\t}\n\t\t\t\n\t\t\n\t\t\n\t\t\tENDHLSL\n\t\t}\n\t\t\n\r\n\t\t\r\n\t\tPass\n\t\t{\t\t\n\t\t\tTags
7216-
{ \"LightMode\"=\"GBuffer\" }\n\t\t\t\n\t\t\tStencil\n\t\t\t{\n\t\t\t\tWriteMask
7217-
7\n\t\t\t\tRef 2\n\t\t\t\tComp Always\n\t\t\t\tPass Replace\n\t\t\t}\t\n\t\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma
7216+
{ \"LightMode\"=\"GBuffer\" }\n\t\t\n\t\t Stencil\n\t\t {\n\t\t WriteMask
7217+
6\n\t\t Ref 2\n\t\t Comp Always\n\t\t Pass Replace\n\t\t }\n\n\t\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma
72187218
target 4.5\n\t\t\t\n\t\t\t#pragma multi_compile _ LIGHT_LAYERS\n\t\t\t#pragma
72197219
multi_compile _ DEBUG_DISPLAY\n\t\t\t\n\t\t\t#define UNITY_MATERIAL_LIT\n\t\t\t\t\n\t\t\t#define
72207220
HDRP_NEEDS_UVS (HDRP_USE_BASE_COLOR_MAP || HDRP_USE_MASK_MAP || USE_NORMAL_MAP
@@ -60740,6 +60740,12 @@ MonoBehaviour:
6074060740
m_SerializableType: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral,
6074160741
PublicKeyToken=b77a5c561934e089
6074260742
attributes:
60743+
- m_Type: 0
60744+
m_Min: 1
60745+
m_Max: 8
60746+
m_Tooltip:
60747+
m_Regex:
60748+
m_RegexMaxLength: 0
6074360749
- m_Type: 3
6074460750
m_Min: -Infinity
6074560751
m_Max: Infinity

‎Assets/Samples/ARRadar/Materials/Ground.mat

+13-12
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 2
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Ground
2424
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
25-
m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE _SPECULAR_OCCLUSION_FROM_AMBIENT_OCCLUSION
25+
m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 0
2828
m_DoubleSidedGI: 0
@@ -216,16 +216,16 @@ Material:
216216
- _SpecularAAThreshold: 0.2
217217
- _SpecularOcclusionMode: 1
218218
- _SrcBlend: 1
219-
- _StencilRef: 2
220-
- _StencilRefDepth: 0
221-
- _StencilRefDistortionVec: 64
222-
- _StencilRefGBuffer: 2
223-
- _StencilRefMV: 128
224-
- _StencilWriteMask: 3
225-
- _StencilWriteMaskDepth: 48
226-
- _StencilWriteMaskDistortionVec: 64
227-
- _StencilWriteMaskGBuffer: 51
228-
- _StencilWriteMaskMV: 176
219+
- _StencilRef: 0
220+
- _StencilRefDepth: 8
221+
- _StencilRefDistortionVec: 4
222+
- _StencilRefGBuffer: 10
223+
- _StencilRefMV: 40
224+
- _StencilWriteMask: 6
225+
- _StencilWriteMaskDepth: 8
226+
- _StencilWriteMaskDistortionVec: 4
227+
- _StencilWriteMaskGBuffer: 14
228+
- _StencilWriteMaskMV: 40
229229
- _Stiffness: 1
230230
- _SubsurfaceMask: 1
231231
- _SupportDecals: 1
@@ -241,6 +241,7 @@ Material:
241241
- _TransparentDepthPrepassEnable: 0
242242
- _TransparentSortPriority: 0
243243
- _TransparentWritingMotionVec: 0
244+
- _TransparentZWrite: 0
244245
- _UVBase: 0
245246
- _UVDetail: 0
246247
- _UVEmissive: 0

‎Assets/Samples/BonFire/Trees-Wind/BonFire-Leaves.mat

+12-11
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,16 @@ Material:
256256
- _SpecularHighlights: 1
257257
- _SpecularOcclusionMode: 1
258258
- _SrcBlend: 1
259-
- _StencilRef: 2
260-
- _StencilRefDepth: 0
261-
- _StencilRefDistortionVec: 64
262-
- _StencilRefGBuffer: 2
263-
- _StencilRefMV: 128
264-
- _StencilWriteMask: 3
265-
- _StencilWriteMaskDepth: 48
266-
- _StencilWriteMaskDistortionVec: 64
267-
- _StencilWriteMaskGBuffer: 51
268-
- _StencilWriteMaskMV: 176
259+
- _StencilRef: 0
260+
- _StencilRefDepth: 8
261+
- _StencilRefDistortionVec: 4
262+
- _StencilRefGBuffer: 10
263+
- _StencilRefMV: 40
264+
- _StencilWriteMask: 6
265+
- _StencilWriteMaskDepth: 8
266+
- _StencilWriteMaskDistortionVec: 4
267+
- _StencilWriteMaskGBuffer: 14
268+
- _StencilWriteMaskMV: 40
269269
- _Stiffness: 0.1
270270
- _SubsurfaceMask: 1
271271
- _SupportDecals: 1
@@ -281,6 +281,7 @@ Material:
281281
- _TransparentDepthPrepassEnable: 0
282282
- _TransparentSortPriority: 0
283283
- _TransparentWritingMotionVec: 0
284+
- _TransparentZWrite: 0
284285
- _UVBase: 0
285286
- _UVDetail: 0
286287
- _UVEmissive: 0
@@ -324,4 +325,4 @@ MonoBehaviour:
324325
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
325326
m_Name:
326327
m_EditorClassIdentifier:
327-
version: 1
328+
version: 2

‎Assets/Samples/BonFire/Trees-Wind/BonFire-Wood.mat

+12-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 2
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -269,16 +269,16 @@ Material:
269269
- _SpecularHighlights: 1
270270
- _SpecularOcclusionMode: 1
271271
- _SrcBlend: 1
272-
- _StencilRef: 2
273-
- _StencilRefDepth: 0
274-
- _StencilRefDistortionVec: 64
275-
- _StencilRefGBuffer: 2
276-
- _StencilRefMV: 128
277-
- _StencilWriteMask: 3
278-
- _StencilWriteMaskDepth: 48
279-
- _StencilWriteMaskDistortionVec: 64
280-
- _StencilWriteMaskGBuffer: 51
281-
- _StencilWriteMaskMV: 176
272+
- _StencilRef: 0
273+
- _StencilRefDepth: 8
274+
- _StencilRefDistortionVec: 4
275+
- _StencilRefGBuffer: 10
276+
- _StencilRefMV: 40
277+
- _StencilWriteMask: 6
278+
- _StencilWriteMaskDepth: 8
279+
- _StencilWriteMaskDistortionVec: 4
280+
- _StencilWriteMaskGBuffer: 14
281+
- _StencilWriteMaskMV: 40
282282
- _Stiffness: 0.1
283283
- _SubsurfaceMask: 1
284284
- _SupportDecals: 1
@@ -294,6 +294,7 @@ Material:
294294
- _TransparentDepthPrepassEnable: 0
295295
- _TransparentSortPriority: 0
296296
- _TransparentWritingMotionVec: 0
297+
- _TransparentZWrite: 0
297298
- _UVBase: 0
298299
- _UVDetail: 0
299300
- _UVEmissive: 0

‎Assets/Samples/BonFire/VFX/BonFire.vfx

+20-8
Original file line numberDiff line numberDiff line change
@@ -1388,9 +1388,9 @@ VisualEffectResource:
13881388
deltaTime) /*Mode:Relative */\n{\n velocity += (Velocity - velocity) * min(1.0f,Drag
13891389
* deltaTime / mass);\n}\nvoid Turbulence_18C(float3 position, inout float3
13901390
velocity, float mass, float4x4 InvFieldTransform, float4x4 FieldTransform,
1391-
float Intensity, float Drag, float frequency, float roughness, float lacunarity,
1392-
int octaves, float deltaTime) /*Mode:Relative NoiseType:Perlin */\n{\n float3
1393-
vectorFieldCoord = mul(InvFieldTransform, float4(position,1.0f)).xyz;\n
1391+
float Intensity, float Drag, float frequency, int octaves, float roughness,
1392+
float lacunarity, float deltaTime) /*Mode:Relative NoiseType:Perlin */\n{\n
1393+
float3 vectorFieldCoord = mul(InvFieldTransform, float4(position,1.0f)).xyz;\n
13941394
\n float3 value = GeneratePerlinCurlNoise(vectorFieldCoord + 0.5f, frequency,
13951395
octaves, roughness, lacunarity);\n value = mul(FieldTransform,float4(value,0.0f)).xyz
13961396
* Intensity;\n \n velocity += (value - velocity) * min(1.0f,Drag * deltaTime
@@ -1425,7 +1425,7 @@ VisualEffectResource:
14251425
tmp_bt);\n\t\t\t Force_1( /*inout */attributes.velocity, attributes.mass,
14261426
tmp_bu, (float)0.5, deltaTime_a);\n\t\t\t}\n\t\t\t{\n\t\t\t Turbulence_18C(attributes.position,
14271427
/*inout */attributes.velocity, attributes.mass, InvFieldTransform_b, FieldTransform_b,
1428-
(float)5, (float)1, (float)3, (float)0.5, (float)2, (int)3, deltaTime_a);\n\t\t\t}\n\t\t\tEulerIntegration(
1428+
(float)5, (float)1, (float)3, (int)3, (float)0.5, (float)2, deltaTime_a);\n\t\t\t}\n\t\t\tEulerIntegration(
14291429
/*inout */attributes.position, attributes.velocity, deltaTime_a);\n\t\t\tAge(
14301430
/*inout */attributes.age, deltaTime_a);\n\t\t\tReap(attributes.age, attributes.lifetime,
14311431
/*inout */attributes.alive);\n\t\t\t\n\r\n\r\n\t\t\tif (attributes.alive)\r\n\t\t\t{\r\n\t\t\t\tattributeBuffer.Store3((index
@@ -1465,8 +1465,8 @@ VisualEffectResource:
14651465
float3 tmp_bu = mul((float3x3)uniform_b, tmp_bt);\n\t\t Force_1( /*inout
14661466
*/attributes.velocity, attributes.mass, tmp_bu, (float)0.5, deltaTime_a);\n\t\t}\n\t\t{\n\t\t
14671467
Turbulence_18C(attributes.position, /*inout */attributes.velocity, attributes.mass,
1468-
InvFieldTransform_b, FieldTransform_b, (float)5, (float)1, (float)3, (float)0.5,
1469-
(float)2, (int)3, deltaTime_a);\n\t\t}\n\t\tEulerIntegration( /*inout */attributes.position,
1468+
InvFieldTransform_b, FieldTransform_b, (float)5, (float)1, (float)3, (int)3,
1469+
(float)0.5, (float)2, deltaTime_a);\n\t\t}\n\t\tEulerIntegration( /*inout */attributes.position,
14701470
attributes.velocity, deltaTime_a);\n\t\tAge( /*inout */attributes.age, deltaTime_a);\n\t\tReap(attributes.age,
14711471
attributes.lifetime, /*inout */attributes.alive);\n\t\t\n\r\n\t\tattributeBuffer.Store3((index
14721472
* 0x4 + 0x0) << 2,asuint(attributes.position));\n\t\tattributeBuffer.Store3((index
@@ -4770,15 +4770,15 @@ VisualEffectResource:
47704770
m_NamedObject:
47714771
m_Array:
47724772
- m_ExpressionIndex: 47
4773-
m_Value: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4773+
m_Value: {fileID: 2800000, guid: 46c0dd137cb0dfb4782f9acac67b7423, type: 3}
47744774
- m_ExpressionIndex: 48
47754775
m_Value: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
47764776
- m_ExpressionIndex: 55
47774777
m_Value: {fileID: 2800000, guid: 94b4eb19099365a41ac1ee284d537678, type: 3}
47784778
- m_ExpressionIndex: 56
47794779
m_Value: {fileID: 2800000, guid: ee05b597174590c41a0929d87f45e68b, type: 3}
47804780
- m_ExpressionIndex: 83
4781-
m_Value: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4781+
m_Value: {fileID: 2800000, guid: 46c0dd137cb0dfb4782f9acac67b7423, type: 3}
47824782
- m_ExpressionIndex: 84
47834783
m_Value: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
47844784
- m_ExpressionIndex: 87
@@ -8032,6 +8032,12 @@ MonoBehaviour:
80328032
m_SerializableType: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral,
80338033
PublicKeyToken=b77a5c561934e089
80348034
attributes:
8035+
- m_Type: 0
8036+
m_Min: 1
8037+
m_Max: 8
8038+
m_Tooltip:
8039+
m_Regex:
8040+
m_RegexMaxLength: 0
80358041
- m_Type: 3
80368042
m_Min: -Infinity
80378043
m_Max: Infinity
@@ -12310,6 +12316,12 @@ MonoBehaviour:
1231012316
m_SerializableType: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral,
1231112317
PublicKeyToken=b77a5c561934e089
1231212318
attributes:
12319+
- m_Type: 0
12320+
m_Min: 1
12321+
m_Max: 8
12322+
m_Tooltip:
12323+
m_Regex:
12324+
m_RegexMaxLength: 0
1231312325
- m_Type: 3
1231412326
m_Min: -Infinity
1231512327
m_Max: Infinity

0 commit comments

Comments
 (0)