Skip to content

Commit e968ecf

Browse files
svc-reach-platform-supportEvergreen
svc-reach-platform-support
authored and
Evergreen
committed
[Port] [6000.4] [URP] Fix low UP issues on URP package sample.
1 parent 62e7954 commit e968ecf

8 files changed

Lines changed: 813 additions & 1001 deletions

File tree

‎Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/CameraStacking/MixedFOV/MixedFOV.unity‎

Lines changed: 3 additions & 869 deletions
Large diffs are not rendered by default.

‎Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/CameraStacking/SplitScreen/SplitScreen.unity‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ Canvas:
277277
m_OverridePixelPerfect: 0
278278
m_SortingBucketNormalizedSize: 0
279279
m_VertexColorAlwaysGammaSpace: 1
280+
m_UseReflectionProbes: 0
280281
m_AdditionalShaderChannelsFlag: 1
281282
m_UpdateRectTransformForStandalone: 0
282283
m_SortingLayerID: 0
@@ -380,6 +381,7 @@ Canvas:
380381
m_OverridePixelPerfect: 0
381382
m_SortingBucketNormalizedSize: 0
382383
m_VertexColorAlwaysGammaSpace: 1
384+
m_UseReflectionProbes: 0
383385
m_AdditionalShaderChannelsFlag: 25
384386
m_UpdateRectTransformForStandalone: 0
385387
m_SortingLayerID: 0
@@ -677,6 +679,7 @@ Canvas:
677679
m_OverridePixelPerfect: 0
678680
m_SortingBucketNormalizedSize: 0
679681
m_VertexColorAlwaysGammaSpace: 1
682+
m_UseReflectionProbes: 0
680683
m_AdditionalShaderChannelsFlag: 0
681684
m_UpdateRectTransformForStandalone: 0
682685
m_SortingLayerID: 0
@@ -793,7 +796,7 @@ Camera:
793796
serializedVersion: 2
794797
x: 0
795798
y: 0
796-
width: 1
799+
width: 0.5
797800
height: 1
798801
near clip plane: 0.3
799802
far clip plane: 1000
@@ -1180,7 +1183,7 @@ Light:
11801183
m_PrefabAsset: {fileID: 0}
11811184
m_GameObject: {fileID: 705507993}
11821185
m_Enabled: 1
1183-
serializedVersion: 12
1186+
serializedVersion: 13
11841187
m_Type: 1
11851188
m_Color: {r: 1, g: 1, b: 1, a: 1}
11861189
m_Intensity: 1
@@ -1232,7 +1235,7 @@ Light:
12321235
m_UseBoundingSphereOverride: 0
12331236
m_UseViewFrustumForShadowCasterCull: 1
12341237
m_ForceVisible: 0
1235-
m_ShadowRadius: 0
1238+
m_ShapeRadius: 0
12361239
m_ShadowAngle: 0
12371240
m_LightUnit: 1
12381241
m_LuxAtDistance: 1
@@ -1394,6 +1397,7 @@ Canvas:
13941397
m_OverridePixelPerfect: 0
13951398
m_SortingBucketNormalizedSize: 0
13961399
m_VertexColorAlwaysGammaSpace: 1
1400+
m_UseReflectionProbes: 0
13971401
m_AdditionalShaderChannelsFlag: 25
13981402
m_UpdateRectTransformForStandalone: 0
13991403
m_SortingLayerID: 0
@@ -1506,6 +1510,7 @@ MeshRenderer:
15061510
m_SortingLayerID: 0
15071511
m_SortingLayer: 0
15081512
m_SortingOrder: 0
1513+
m_MaskInteraction: 0
15091514
m_AdditionalVertexStreams: {fileID: 0}
15101515
--- !u!33 &1144119804
15111516
MeshFilter:
@@ -1619,6 +1624,7 @@ MeshRenderer:
16191624
m_SortingLayerID: 0
16201625
m_SortingLayer: 0
16211626
m_SortingOrder: 0
1627+
m_MaskInteraction: 0
16221628
m_AdditionalVertexStreams: {fileID: 0}
16231629
--- !u!33 &1158032496
16241630
MeshFilter:
@@ -1720,6 +1726,7 @@ Canvas:
17201726
m_OverridePixelPerfect: 0
17211727
m_SortingBucketNormalizedSize: 0
17221728
m_VertexColorAlwaysGammaSpace: 1
1729+
m_UseReflectionProbes: 0
17231730
m_AdditionalShaderChannelsFlag: 25
17241731
m_UpdateRectTransformForStandalone: 0
17251732
m_SortingLayerID: 0
@@ -2043,9 +2050,9 @@ Camera:
20432050
m_LensShift: {x: 0, y: 0}
20442051
m_NormalizedViewPortRect:
20452052
serializedVersion: 2
2046-
x: 0
2053+
x: 0.5
20472054
y: 0
2048-
width: 1
2055+
width: 0.5
20492056
height: 1
20502057
near clip plane: 0.3
20512058
far clip plane: 1000
@@ -2339,7 +2346,7 @@ Light:
23392346
m_PrefabAsset: {fileID: 0}
23402347
m_GameObject: {fileID: 1862309426}
23412348
m_Enabled: 1
2342-
serializedVersion: 12
2349+
serializedVersion: 13
23432350
m_Type: 1
23442351
m_Color: {r: 1, g: 1, b: 1, a: 1}
23452352
m_Intensity: 0.7
@@ -2391,7 +2398,7 @@ Light:
23912398
m_UseBoundingSphereOverride: 0
23922399
m_UseViewFrustumForShadowCasterCull: 1
23932400
m_ForceVisible: 0
2394-
m_ShadowRadius: 0
2401+
m_ShapeRadius: 0
23952402
m_ShadowAngle: 0
23962403
m_LightUnit: 1
23972404
m_LuxAtDistance: 1
@@ -2528,6 +2535,7 @@ MeshRenderer:
25282535
m_SortingLayerID: 0
25292536
m_SortingLayer: 0
25302537
m_SortingOrder: 0
2538+
m_MaskInteraction: 0
25312539
m_AdditionalVertexStreams: {fileID: 0}
25322540
--- !u!33 &1913427153
25332541
MeshFilter:

‎Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/Decals/BlobShadow/BlobShadow.unity‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ MeshRenderer:
209209
m_SortingLayerID: 0
210210
m_SortingLayer: 0
211211
m_SortingOrder: 0
212+
m_MaskInteraction: 0
212213
m_AdditionalVertexStreams: {fileID: 0}
213214
--- !u!33 &8901079
214215
MeshFilter:
@@ -336,6 +337,7 @@ MeshRenderer:
336337
m_SortingLayerID: 0
337338
m_SortingLayer: 0
338339
m_SortingOrder: 0
340+
m_MaskInteraction: 0
339341
m_AdditionalVertexStreams: {fileID: 0}
340342
--- !u!33 &23733559
341343
MeshFilter:
@@ -425,6 +427,7 @@ MeshRenderer:
425427
m_SortingLayerID: 0
426428
m_SortingLayer: 0
427429
m_SortingOrder: 0
430+
m_MaskInteraction: 0
428431
m_AdditionalVertexStreams: {fileID: 0}
429432
--- !u!33 &61096877
430433
MeshFilter:
@@ -798,6 +801,7 @@ MeshRenderer:
798801
m_SortingLayerID: 0
799802
m_SortingLayer: 0
800803
m_SortingOrder: 0
804+
m_MaskInteraction: 0
801805
m_AdditionalVertexStreams: {fileID: 0}
802806
--- !u!33 &902575297
803807
MeshFilter:
@@ -882,7 +886,7 @@ Light:
882886
m_PrefabAsset: {fileID: 0}
883887
m_GameObject: {fileID: 1090784525}
884888
m_Enabled: 1
885-
serializedVersion: 12
889+
serializedVersion: 13
886890
m_Type: 1
887891
m_Color: {r: 1, g: 1, b: 1, a: 1}
888892
m_Intensity: 1
@@ -934,7 +938,7 @@ Light:
934938
m_UseBoundingSphereOverride: 0
935939
m_UseViewFrustumForShadowCasterCull: 1
936940
m_ForceVisible: 0
937-
m_ShadowRadius: 0
941+
m_ShapeRadius: 0
938942
m_ShadowAngle: 0
939943
m_LightUnit: 1
940944
m_LuxAtDistance: 1
@@ -995,14 +999,6 @@ PrefabInstance:
995999
propertyPath: m_Name
9961000
value: MainPanel
9971001
objectReference: {fileID: 0}
998-
- target: {fileID: 155458132493177538, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
999-
propertyPath: m_IsActive
1000-
value: 1
1001-
objectReference: {fileID: 0}
1002-
- target: {fileID: 1638750836712682043, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
1003-
propertyPath: m_Text
1004-
value: Blob Shadow
1005-
objectReference: {fileID: 0}
10061002
- target: {fileID: 2877385409968955045, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
10071003
propertyPath: m_Pivot.x
10081004
value: 1
@@ -1011,10 +1007,6 @@ PrefabInstance:
10111007
propertyPath: m_Pivot.y
10121008
value: 0
10131009
objectReference: {fileID: 0}
1014-
- target: {fileID: 2877385409968955045, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
1015-
propertyPath: m_RootOrder
1016-
value: 1
1017-
objectReference: {fileID: 0}
10181010
- target: {fileID: 2877385409968955045, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
10191011
propertyPath: m_AnchorMax.x
10201012
value: 1
@@ -1087,16 +1079,6 @@ PrefabInstance:
10871079
propertyPath: m_LocalEulerAnglesHint.z
10881080
value: 0
10891081
objectReference: {fileID: 0}
1090-
- target: {fileID: 3119812475398170508, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
1091-
propertyPath: m_Color.a
1092-
value: 0.4392157
1093-
objectReference: {fileID: 0}
1094-
- target: {fileID: 4039968741557396746, guid: d5fa55a16b49d4da3a93a4958cdc3180, type: 3}
1095-
propertyPath: m_Text
1096-
value: 'This sample shows how to use the decal projector to cast a proxy shadow
1097-
under a character. This method is cheaper than using traditional shadow maps
1098-
and is suited for low end devices. '
1099-
objectReference: {fileID: 0}
11001082
m_RemovedComponents: []
11011083
m_RemovedGameObjects: []
11021084
m_AddedGameObjects: []
@@ -1187,6 +1169,7 @@ MeshRenderer:
11871169
m_SortingLayerID: 0
11881170
m_SortingLayer: 0
11891171
m_SortingOrder: 0
1172+
m_MaskInteraction: 0
11901173
m_AdditionalVertexStreams: {fileID: 0}
11911174
--- !u!33 &1235401132
11921175
MeshFilter:
@@ -1261,6 +1244,7 @@ MeshRenderer:
12611244
m_SortingLayerID: 0
12621245
m_SortingLayer: 0
12631246
m_SortingOrder: 0
1247+
m_MaskInteraction: 0
12641248
m_AdditionalVertexStreams: {fileID: 0}
12651249
--- !u!33 &1693658611
12661250
MeshFilter:
@@ -1405,7 +1389,7 @@ Light:
14051389
m_PrefabAsset: {fileID: 0}
14061390
m_GameObject: {fileID: 1722892045}
14071391
m_Enabled: 1
1408-
serializedVersion: 12
1392+
serializedVersion: 13
14091393
m_Type: 1
14101394
m_Color: {r: 1, g: 1, b: 1, a: 1}
14111395
m_Intensity: 0.7
@@ -1457,7 +1441,7 @@ Light:
14571441
m_UseBoundingSphereOverride: 0
14581442
m_UseViewFrustumForShadowCasterCull: 1
14591443
m_ForceVisible: 0
1460-
m_ShadowRadius: 0
1444+
m_ShapeRadius: 0
14611445
m_ShadowAngle: 0
14621446
m_LightUnit: 1
14631447
m_LuxAtDistance: 1
@@ -1571,6 +1555,7 @@ MeshRenderer:
15711555
m_SortingLayerID: 0
15721556
m_SortingLayer: 0
15731557
m_SortingOrder: 0
1558+
m_MaskInteraction: 0
15741559
m_AdditionalVertexStreams: {fileID: 0}
15751560
--- !u!33 &1728013592
15761561
MeshFilter:
@@ -1660,6 +1645,7 @@ MeshRenderer:
16601645
m_SortingLayerID: 0
16611646
m_SortingLayer: 0
16621647
m_SortingOrder: 0
1648+
m_MaskInteraction: 0
16631649
m_AdditionalVertexStreams: {fileID: 0}
16641650
--- !u!33 &1748639258
16651651
MeshFilter:
@@ -1746,6 +1732,7 @@ Canvas:
17461732
m_OverridePixelPerfect: 0
17471733
m_SortingBucketNormalizedSize: 0
17481734
m_VertexColorAlwaysGammaSpace: 1
1735+
m_UseReflectionProbes: 0
17491736
m_AdditionalShaderChannelsFlag: 0
17501737
m_UpdateRectTransformForStandalone: 0
17511738
m_SortingLayerID: 0
@@ -1830,6 +1817,7 @@ MonoBehaviour:
18301817
m_Offset: {x: 0, y: 0, z: 1.25}
18311818
m_Size: {x: 1.2, y: 1.2, z: 2.5}
18321819
m_FadeFactor: 1
1820+
m_VisibleInScene: 1
18331821
version: 1
18341822
m_DecalLayerMask: 1
18351823
--- !u!1660057539 &9223372036854775807

‎Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/Lighting/Reflection Probes/Animation/New Lighting Settings.lighting‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/Lighting/Reflection Probes/Animation/New Lighting Settings.lighting.meta‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Packages/com.unity.render-pipelines.universal/Samples~/URPPackageSamples/RendererFeatures/BlitToRTHandle/BlitToRTHandlePass.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
// This pass creates an RTHandle and blits the camera color to it after rendering transparent objects.
88
// The RTHandle is then set as a global texture, which is available to shaders in the scene. The RTHandle is preserved in all frames while the renderer feature is running to create a recursive rendering effect.
99
public class BlitToRTHandlePass : ScriptableRenderPass
10-
{
11-
private class PassData
12-
{
13-
}
14-
10+
{
1511
private ProfilingSampler m_ProfilingSampler = new ProfilingSampler("BlitToRTHandle_CopyColor");
1612
private RTHandle m_InputHandle;
1713
private RTHandle m_OutputHandle;

0 commit comments

Comments
 (0)