diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/002-HDMaterials.png index 788c895bf6d..c193b6c36ce 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/002-HDMaterials.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/002-HDMaterials.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08f7ffc16e18df0abb457c6d991898ed728085c39aacea61b9575e043d0269ba -size 2078109 +oid sha256:9af88a41ffc0d074d5a562407ac17a975f5c4ca7ec8d574578d0a88906130981 +size 2073641 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png index efa34ddaa75..7d16ff3b99e 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67634cdb264ce8eaaf3927792ee241396f1446b345591a923739394600370bad -size 2096613 +oid sha256:c41b3003b5b3745ba61719d6568ffb8b14298d635370ce46547c3f44f0ccfb9c +size 2096633 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/002-HDMaterials.png index cc8f0542d38..92eb07581fb 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/002-HDMaterials.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/002-HDMaterials.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:699313f5c07d14896d275a292017e7987c615a8ad770684be6a086779990ec11 -size 2082365 +oid sha256:6c8e6c1a386ab9ae24cb984b853fd691223f80d923a0e982ac7884675f525758 +size 2072609 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png index 4260f4f7cdf..8a683f19380 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c20adf6c08e40b15a597e6d8fc31775dddb55de3e64941482a0abd6d04e87725 -size 2082512 +oid sha256:f4723e54826823b6b93e21310806a4ae1e6eca1a338630eb8845d9b45df2bc17 +size 2072476 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/002-HDMaterials.png index 5fe590cd84c..76d123f2c9f 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/002-HDMaterials.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/002-HDMaterials.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68c9741fb8837d8ed2b158fcbd0cd076ca26b7b16f16ea07862d5c3f872c5aa6 -size 2079408 +oid sha256:a12398a45767e4bc5f41674894fb7924061e9d74731b41991f62e5e7b4dc7fc7 +size 2073610 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity index 257e8751d61..e2dfc4d822d 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity +++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity @@ -978,6 +978,35 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -1203,7 +1232,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -1366,7 +1395,7 @@ MonoBehaviour: invertFade: 0 distanceFadeStart: 10000 distanceFadeEnd: 10000 - textureOffset: {x: -0, y: -0, z: 0} + textureOffset: {x: -0, y: -0, z: -0} falloffMode: 0 m_Version: 2 --- !u!4 &289937389 @@ -1376,14 +1405,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289937387} - m_LocalRotation: {x: 0.38268322, y: -0, z: -0, w: 0.9238797} + m_LocalRotation: {x: 0.9238792, y: -0, z: -0, w: 0.38268423} m_LocalPosition: {x: -9.65, y: 14.476662, z: -13.446383} m_LocalScale: {x: 2.2014, y: 2.2013998, z: 1.5467696} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1576122520} m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 45.000004, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} --- !u!1 &379148968 GameObject: m_ObjectHideFlags: 0 @@ -2007,6 +2036,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -3812,6 +3842,35 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -4301,6 +4360,7 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.05 @@ -5460,6 +5520,7 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5723,7 +5784,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -6138,7 +6199,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 3 + serializedVersion: 5 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -6151,7 +6212,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -6178,7 +6239,7 @@ LightingSettings: m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 1 + m_PVREnvironmentImportanceSampling: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -6192,6 +6253,7 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 --- !u!1 &1521259788 GameObject: m_ObjectHideFlags: 0 @@ -7134,6 +7196,35 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -7473,6 +7564,7 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -7902,6 +7994,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes.unity index ea6623d3d96..733aae09953 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes.unity @@ -153,6 +153,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.03525746, y: -0.03413081, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480297283} m_RootOrder: 3 @@ -285,7 +286,7 @@ MonoBehaviour: invertFade: 0 distanceFadeStart: 10000 distanceFadeEnd: 10000 - textureOffset: {x: -0, y: -0, z: 0} + textureOffset: {x: -0, y: -0, z: -0} falloffMode: 0 m_Version: 2 --- !u!4 &243339205 @@ -295,13 +296,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243339203} - m_LocalRotation: {x: -0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalRotation: {x: -0.92387974, y: -0, z: -0, w: 0.3826831} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2018619095} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -45, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -135, y: 0, z: 0} --- !u!1 &386829906 GameObject: m_ObjectHideFlags: 0 @@ -335,6 +337,7 @@ MonoBehaviour: m_Profile: {fileID: 11400000, guid: 60355684f9174744d9e48ee93f0f3a7e, type: 2} m_StaticLightingSkyUniqueID: 2 m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!114 &386829908 MonoBehaviour: m_ObjectHideFlags: 0 @@ -347,7 +350,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -362,6 +365,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -395,6 +399,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 2.5082512, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2018619095} m_RootOrder: 0 @@ -594,6 +599,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -609,7 +615,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -693,6 +698,7 @@ Transform: m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -724,6 +730,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.5, w: 0.8660254} m_LocalPosition: {x: 0.8660258, y: -0.49999934, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1679543826} m_RootOrder: 2 @@ -787,6 +794,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153552880} m_RootOrder: 4 @@ -852,6 +860,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.03525746, y: 0.4024787, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480297283} m_RootOrder: 0 @@ -1017,7 +1026,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -1085,6 +1094,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153552880} m_RootOrder: 3 @@ -1148,6 +1158,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4, y: 0, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153552880} m_RootOrder: 5 @@ -1211,6 +1222,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4, y: 0, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153552880} m_RootOrder: 1 @@ -1273,6 +1285,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1480297283} - {fileID: 1113038753} @@ -1312,6 +1325,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.031877518, y: 2.5082512, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1800054801} m_RootOrder: 0 @@ -1429,6 +1443,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: -0.03413081, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480297283} m_RootOrder: 2 @@ -1542,6 +1557,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 0, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1153552880} m_RootOrder: 2 @@ -1607,6 +1623,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.9669957, y: -0.03413081, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480297283} m_RootOrder: 5 @@ -1719,6 +1736,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 897164415} - {fileID: 2084315281} @@ -1758,6 +1776,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.9658692, y: -0.03413081, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480297283} m_RootOrder: 4 @@ -1871,6 +1890,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0000022576353, y: 1, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1679543826} m_RootOrder: 1 @@ -1933,6 +1953,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1847253253} - {fileID: 1561861768} @@ -1967,6 +1988,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8, y: -4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1271361944} - {fileID: 1928825978} @@ -2002,6 +2024,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.031877518, y: 2.7381868, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1679543826} m_RootOrder: 0 @@ -2115,6 +2138,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.2588191, w: 0.9659258} m_LocalPosition: {x: -0.86602354, y: -0.5000033, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1679543826} m_RootOrder: 3 @@ -2178,6 +2202,7 @@ Transform: m_LocalRotation: {x: -0.3696438, y: -0.23911758, z: -0.099045746, w: 0.89239913} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3.5, z: 3.5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1800054801} m_RootOrder: 1 @@ -2211,7 +2236,7 @@ MonoBehaviour: invertFade: 0 distanceFadeStart: 10000 distanceFadeEnd: 10000 - textureOffset: {x: -0, y: -0, z: 0} + textureOffset: {x: -0, y: -0, z: -0} falloffMode: 0 m_Version: 2 --- !u!1 &2018619094 @@ -2240,6 +2265,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 421069095} - {fileID: 243339205} @@ -2275,6 +2301,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9647427, y: -0.03413081, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480297283} m_RootOrder: 1 diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index a68fd624b56..e75d2fec0ed 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed a build-time warning regarding light loop variants (case 1372256). - Fixed an infinite import loop of materials when there is no HDMetaData generated by the ShaderGraph. - Fixed issue with path traced shadows and layer masks (case 1375638). +- Fixed Z axis orientation when sampling 3D textures in local volumetric fog. ### Changed - Use RayTracingAccelerationStructure.CullInstances to filter Renderers and populate the acceleration structure with ray tracing instances for improved CPU performance on the main thread. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md index 3bc8cbc7590..b72fc2097e3 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md @@ -45,6 +45,9 @@ If a Scene uses Density Volumes, HDRP automatically changes the GameObjects to u However, if you reference a **Density Volume** through a C# script, a warning appears (**DensityVolume has been deprecated (UnityUpgradable) -> Local Volumetric Fog**) in the Console window. This warning may stop your Project from compiling in future versions of HDRP. To resolve this, change your code to target the new component. +The sampling axis of **3DTexture** in the **Density Volume** component has been corrected to match Unity's axis convention. +To accommodate this change you will have to mirror the **3DTextures** you are using along their **Z axis**. + ## ClearFlag HDRP 2021.2 includes the new `ClearFlag.Stencil` function. Use this to clear all flags from a stencil. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs index a12d191cccf..4f609aa8c99 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs @@ -94,10 +94,8 @@ internal void Update(float time) //Update scrolling based on deltaTime if (volumeMask != null) { - textureOffset = (textureScrollingSpeed * time); // Switch from right-handed to left-handed coordinate system. - textureOffset.x = -textureOffset.x; - textureOffset.y = -textureOffset.y; + textureOffset = -(textureScrollingSpeed * time); } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumeVoxelization.compute b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumeVoxelization.compute index fd47d6b08fa..306c115b9df 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumeVoxelization.compute +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumeVoxelization.compute @@ -65,9 +65,6 @@ float ComputeFadeFactor(float3 coordNDC, float dist, float3 rcpPosFaceFade, float3 rcpNegFaceFade, bool invertFade, float rcpDistFadeLen, float endTimesRcpDistFadeLen, int falloffMode) { - // We have to account for handedness. - coordNDC.z = 1 - coordNDC.z; - float3 posF = Remap10(coordNDC, rcpPosFaceFade, rcpPosFaceFade); float3 negF = Remap01(coordNDC, rcpNegFaceFade, 0); float dstF = Remap10(dist, rcpDistFadeLen, endTimesRcpDistFadeLen); @@ -189,7 +186,7 @@ void FillVolumetricDensityBuffer(PositionInputs posInput, uint tileIndex, Jitter const OrientedBBox obb = _VolumeBounds[volumeIndex]; - const float3x3 obbFrame = float3x3(obb.right, obb.up, cross(obb.up, obb.right)); + const float3x3 obbFrame = float3x3(obb.right, obb.up, cross(obb.right, obb.up)); const float3 obbExtents = float3(obb.extentX, obb.extentY, obb.extentZ); // Express the voxel center in the local coordinate system of the box.