From e0aab7ad2af1b35f1da2eaab53de6c1f6bbb75cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= Date: Tue, 30 Jun 2020 15:14:50 +0200 Subject: [PATCH] Fixed reseed on play overdraw vfx --- .../Common/Materials/UnlitCanvasMat.mat | 11 +- .../StaticAnalysis/Lit_ShaderGraph.mat | 3 +- .../Assets/Scenes/0000_LitCube/0000_Cube.mat | 3 +- .../Scenes/0002_TransparentOverdraw.unity | 16 +- .../Scenes/0002_TransparentOverdraw/0002.vfx | 287 ++---------------- .../0003_TesselationShadow/Tesselation.mat | 3 +- .../Tesselation_Floor.mat | 3 +- .../ProjectSettings/HDRPProjectSettings.asset | 3 - 8 files changed, 57 insertions(+), 272 deletions(-) diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat b/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat index 16dbc116e7f..46192d29496 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat +++ b/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat @@ -20,6 +20,8 @@ Material: disabledShaderPasses: - MOTIONVECTORS - TransparentBackface + - TransparentDepthPrepass + - TransparentDepthPostpass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,16 +30,20 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaCutoffEnable: 0 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _BlendMode: 0 - _CullMode: 2 - _CullModeForward: 2 + - _DepthOffsetEnable: 0 - _DoubleSidedEnable: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 0 - _EnableFogOnTransparent: 1 + - _OpaqueCullMode: 2 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 - _RenderQueueType: 1 @@ -56,7 +62,10 @@ Material: - _SurfaceType: 0 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 - _TransparentZWrite: 1 - _UseShadowThreshold: 0 - _ZTestDepthEqualForOpaque: 3 @@ -79,4 +88,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 5 diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat b/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat index d550c7a11ba..e81cb11eaff 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat +++ b/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -196,6 +196,7 @@ Material: - _Metallic: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat index 8354fc5250a..853f0902c2c 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat +++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -195,6 +195,7 @@ Material: - _Metallic: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw.unity b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw.unity index 425cafd7442..1574a8f8ae8 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw.unity +++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw.unity @@ -194,7 +194,8 @@ VisualEffect: m_InitialEventName: OnPlay m_InitialEventNameOverriden: 0 m_StartSeed: 0 - m_ResetSeedOnPlay: 1 + m_ResetSeedOnPlay: 0 + m_ResourceVersion: 1 m_PropertySheet: m_Float: m_Array: [] @@ -392,6 +393,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -400,6 +402,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 70297877217101 @@ -410,6 +413,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -494,7 +500,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -506,6 +512,7 @@ MonoBehaviour: m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 @@ -524,6 +531,8 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -575,6 +584,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -593,6 +603,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1667150050 Light: m_ObjectHideFlags: 0 @@ -652,6 +663,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1667150051 diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw/0002.vfx b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw/0002.vfx index 7aea8890dea..db19ae1779d 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw/0002.vfx +++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0002_TransparentOverdraw/0002.vfx @@ -20,7 +20,7 @@ MonoBehaviour: x: 43 y: -236 width: 424 - height: 1946 + height: 1945 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -46,6 +46,7 @@ MonoBehaviour: m_ParameterInfo: [] m_ImportDependencies: [] m_GraphVersion: 4 + m_ResourceVersion: 1 m_saved: 1 m_SubgraphDependencies: [] m_CategoryPath: @@ -90,7 +91,7 @@ MonoBehaviour: m_InputSlots: [] m_OutputSlots: [] m_Label: Spawn system - m_Data: {fileID: 0} + m_Data: {fileID: 8926484042661614737} m_InputFlowSlot: - link: [] - link: [] @@ -154,19 +155,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 1 - m_Min: 0 - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the number of particles to be spawned per second. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614669 @@ -234,14 +222,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEditor.VFX.AABox, Unity.VisualEffectGraph.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: The culling bounds of this system. The Visual Effect is only visible - if the bounding box specified here is visible to the camera. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614671 @@ -277,13 +257,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the center of the box. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614672 @@ -316,7 +289,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614673 @@ -349,7 +321,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614674 @@ -382,7 +353,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614675 @@ -418,13 +388,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the size of the box along each axis. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614676 @@ -457,7 +420,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614677 @@ -490,7 +452,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614678 @@ -523,7 +484,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614679 @@ -609,13 +569,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEditor.VFX.ArcSphere, Unity.VisualEffectGraph.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the sphere used for positioning the particles. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614682 @@ -650,7 +603,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEditor.VFX.Sphere, Unity.VisualEffectGraph.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614683 @@ -686,13 +638,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the center of the sphere. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614684 @@ -725,7 +670,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614685 @@ -758,7 +702,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614686 @@ -791,7 +734,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614687 @@ -824,13 +766,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the radius of the sphere. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614688 @@ -863,25 +798,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 4 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 0 - m_Min: 0 - m_Max: 6.2831855 - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Controls how much of the sphere is used. The value is in radians. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614689 @@ -942,14 +858,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: "Indicates how long the particle can stay alive. If the particle\u2019s - age exceeds its lifetime, the particle is destroyed." - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614691 @@ -983,14 +891,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: "Indicates how long the particle can stay alive. If the particle\u2019s - age exceeds its lifetime, the particle is destroyed." - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614692 @@ -1027,6 +927,7 @@ MonoBehaviour: angularIntegration: 0 ageParticles: 1 reapParticles: 1 + skipZeroDeltaUpdate: 0 --- !u!114 &8926484042661614694 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1090,14 +991,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEditor.VFX.Transform, Unity.VisualEffectGraph.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the transform with which to position, scale, or rotate the - field. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614696 @@ -1133,13 +1026,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the transform position. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614697 @@ -1172,7 +1058,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614698 @@ -1205,7 +1090,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614699 @@ -1238,7 +1122,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614700 @@ -1274,19 +1157,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 4 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the euler angles of the transform. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614701 @@ -1319,7 +1189,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614702 @@ -1352,7 +1221,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614703 @@ -1385,7 +1253,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614704 @@ -1421,13 +1288,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the scale of the transform along each axis. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614705 @@ -1460,7 +1320,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614706 @@ -1493,7 +1352,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614707 @@ -1526,7 +1384,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614708 @@ -1560,14 +1417,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the intensity of the field. Higher values increase the particle - velocity. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614709 @@ -1601,20 +1450,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 1 - m_Min: 0 - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the drag coefficient. Higher drag leads to a stronger force - influence over the particle velocity. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614710 @@ -1648,14 +1483,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the period in which the noise is sampled. Higher frequencies - result in more frequent noise change. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614711 @@ -1689,20 +1516,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 0 - m_Min: 1 - m_Max: 8 - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the number of layers of noise. More octaves create a more varied - look, but are also more expensive to calculate. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614712 @@ -1736,19 +1549,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 0 - m_Min: 0 - m_Max: 1 - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: 'Sets the scaling factor applied to each octave (also known as persistence.) ' - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614713 @@ -1782,21 +1582,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 1 - m_Min: 0 - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Sets the rate of change of the frequency for each successive octave. - A lacunarity value of 1 results in each octave having the same frequency. - Higher values result in more details, and values below 1 produce less details. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614714 @@ -1882,13 +1667,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: Specifies the base color (RGB) and opacity (A) of the particle. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614718 @@ -1989,7 +1767,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614722 @@ -2052,7 +1829,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.AnimationCurve, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614724 @@ -2088,13 +1864,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 1 - m_Min: 0 - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614725 @@ -2127,7 +1896,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614726 @@ -2160,7 +1928,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614727 @@ -2215,14 +1982,13 @@ MonoBehaviour: m_Type: m_SerializableType: UnityEngine.Gradient, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_SerializableObject: '{"colorKeys":[{"color":{"r":2.2706029415130617,"g":2.044731378555298,"b":1.5335485935211182,"a":1.0},"time":0.06176852062344551},{"color":{"r":4.735749244689941,"g":3.423793077468872,"b":0.5584609508514404,"a":1.0},"time":0.29117265343666079},{"color":{"r":1.8274509906768799,"g":0.3529411852359772,"b":0.19607843458652497,"a":1.0},"time":0.6235294342041016},{"color":{"r":0.5943396091461182,"g":0.0,"b":0.017823228612542154,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":0.0,"time":0.0},{"alpha":1.0,"time":0.06764324754476547},{"alpha":1.0,"time":0.7676509022712708},{"alpha":0.0,"time":0.9882352948188782}],"gradientMode":0}' + m_SerializableObject: '{"colorKeys":[{"color":{"r":6.0745015144348148,"g":4.823916435241699,"b":2.561737298965454,"a":1.0},"time":0.06176852062344551},{"color":{"r":30.609424591064454,"g":14.993967056274414,"b":0.27219662070274355,"a":1.0},"time":0.29117265343666079},{"color":{"r":3.767564058303833,"g":0.10224174708127976,"b":0.03189602866768837,"a":1.0},"time":0.6235294342041016},{"color":{"r":0.3119799494743347,"g":0.0,"b":0.0013795068953186274,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":0.0,"time":0.0},{"alpha":1.0,"time":0.06764324754476547},{"alpha":1.0,"time":0.7676509022712708},{"alpha":0.0,"time":0.9882352948188782}],"gradientMode":0}' m_Space: 2147483647 m_Property: name: Color m_serializedType: m_SerializableType: UnityEngine.Gradient, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614731 @@ -2286,19 +2052,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - attributes: - - m_Type: 5 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 - - m_Type: 3 - m_Min: -Infinity - m_Max: Infinity - m_Tooltip: The color of the particle. - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614733 @@ -2331,7 +2084,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614734 @@ -2364,7 +2116,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614735 @@ -2397,7 +2148,6 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: [] m_Direction: 0 m_LinkedSlots: [] --- !u!114 &8926484042661614736 @@ -2431,12 +2181,25 @@ MonoBehaviour: m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - attributes: - - m_Type: 0 - m_Min: 0 - m_Max: 1 - m_Tooltip: - m_Regex: - m_RegexMaxLength: 0 m_Direction: 0 m_LinkedSlots: [] +--- !u!114 &8926484042661614737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f68759077adc0b143b6e1c101e82065e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Parent: {fileID: 114350483966674976} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + title: + m_Owners: + - {fileID: 8926484042661614666} diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat index a90fbed97a1..c91cbf12b1e 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat +++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -194,6 +194,7 @@ Material: - _Metallic: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat index 41bbe86978d..a1dde6963d2 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat +++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -194,6 +194,7 @@ Material: - _Metallic: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 diff --git a/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset index 396b7a34b6a..ea9f5a7b9d5 100644 --- a/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset +++ b/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset @@ -13,9 +13,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1 - m_DefaultScenePrefabSaved: {fileID: 4893056312182120781, guid: a1dfdae16e0448542a6124642d4c13e9, - type: 3} - m_DefaultDXRScenePrefabSaved: {fileID: 0} m_ProjectSettingFolderPath: HDRPDefaultResources m_WizardPopupAtStart: 0 m_WizardPopupAlreadyShownOnce: 0