diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index e67bb2df8f3..a5e1852b74b 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -12,6 +12,8 @@ All_HDRP_trunk: rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk rerun: on-new-revision + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk + rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk @@ -32,6 +34,8 @@ All_HDRP_trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_trunk + rerun: on-new-revision - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_trunk rerun: on-new-revision All_HDRP_fast-trunk: @@ -43,6 +47,8 @@ All_HDRP_fast-trunk: rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk rerun: on-new-revision + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_fast-trunk + rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk @@ -63,6 +69,8 @@ All_HDRP_fast-trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_fast-trunk + rerun: on-new-revision - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_fast-trunk rerun: on-new-revision All_HDRP_CUSTOM-REVISION: @@ -74,6 +82,8 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION + rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION @@ -94,6 +104,8 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION + rerun: always - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_CUSTOM-REVISION rerun: always variables: diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml index c03ad383cb7..3da948c28d9 100644 --- a/.yamato/all-hdrp_dxr.yml +++ b/.yamato/all-hdrp_dxr.yml @@ -10,6 +10,8 @@ All_HDRP_DXR_trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_trunk + rerun: on-new-revision All_HDRP_DXR_fast-trunk: name: All HDRP_DXR CI - fast-trunk dependencies: @@ -17,6 +19,8 @@ All_HDRP_DXR_fast-trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_fast-trunk + rerun: on-new-revision All_HDRP_DXR_CUSTOM-REVISION: name: All HDRP_DXR CI - CUSTOM-REVISION dependencies: @@ -24,5 +28,7 @@ All_HDRP_DXR_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION + rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index a3483f33c66..6ac35d2d193 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -14,6 +14,7 @@ test_platforms: Standalone: --suite=playmode --platform=Standalone playmode: --suite=playmode playmode_XR: --suite=playmode --extra-editor-arg="-xr-tests" + playmode_RenderGraph: --suite=playmode --extra-editor-arg="-rendergraph-tests" editmode: --suite=editor --platform=editmode project_platforms: Win: diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index 7f230682d37..6b71125970a 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -1,10 +1,11 @@ project: - name: HDRP + name: HDRP folder: HDRP_Tests folder_standalone: HDRP_RuntimeTests test_platforms: - playmode - playmode_XR + - playmode_RenderGraph - editmode - Standalone platforms: @@ -36,11 +37,11 @@ platforms: components: - editor - il2cpp - - name: OSX + - name: OSX apis: - Metal - name: Linux - apis: + apis: - Vulkan all: dependencies: @@ -50,6 +51,7 @@ all: - editmode - playmode - playmode_XR + - playmode_RenderGraph - Standalone - platform: Win api: DX12 @@ -72,11 +74,12 @@ all: api: Vulkan test_platforms: - editmode - - playmode + - playmode - project: HDRP_DXR platform: Win api: DX12 test_platforms: - playmode + - playmode_XR - project: HDRP_Hybrid all: true diff --git a/.yamato/config/hdrp_dxr.metafile b/.yamato/config/hdrp_dxr.metafile index 5d2bb715f53..03b6f96a707 100644 --- a/.yamato/config/hdrp_dxr.metafile +++ b/.yamato/config/hdrp_dxr.metafile @@ -4,6 +4,7 @@ project: test_platforms: - Standalone - playmode + - playmode_XR platforms: - name: Win os: windows @@ -24,3 +25,4 @@ all: test_platforms: - Standalone - playmode + - playmode_XR diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index b329a2b4245..e214d177a24 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -24,6 +24,27 @@ HDRP_Linux_Vulkan_playmode_trunk: logs: paths: - "**/test-results/**" +HDRP_Linux_Vulkan_playmode_RenderGraph_trunk: + name: HDRP on Linux_Vulkan_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:linux + rerun: on-new-revision + commands: + - sudo -H pip install --upgrade pip + - sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Linux_Vulkan_editmode_trunk: name: HDRP on Linux_Vulkan_editmode on version trunk agent: @@ -87,6 +108,27 @@ HDRP_Linux_Vulkan_playmode_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Linux_Vulkan_playmode_RenderGraph_fast-trunk: + name: HDRP on Linux_Vulkan_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:linux + rerun: on-new-revision + commands: + - sudo -H pip install --upgrade pip + - sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Linux_Vulkan_editmode_fast-trunk: name: HDRP on Linux_Vulkan_editmode on version fast-trunk agent: @@ -151,6 +193,28 @@ HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Linux_Vulkan_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Linux_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + commands: + - sudo -H pip install --upgrade pip + - sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index 0cb2128cc36..4e5f02e026a 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -59,6 +59,34 @@ HDRP_OSX_Metal_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_OSX_Metal_playmode_RenderGraph_trunk: + name: HDRP on OSX_Metal_playmode_RenderGraph on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:macos + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' + - |5- + + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results' + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_Tests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_OSX_Metal_editmode_trunk: name: HDRP on OSX_Metal_editmode on version trunk agent: @@ -171,6 +199,34 @@ HDRP_OSX_Metal_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_OSX_Metal_playmode_RenderGraph_fast-trunk: + name: HDRP on OSX_Metal_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:macos + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' + - |5- + + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results' + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_Tests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_OSX_Metal_editmode_fast-trunk: name: HDRP on OSX_Metal_editmode on version fast-trunk agent: @@ -285,6 +341,35 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_OSX_Metal_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on OSX_Metal_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' + - |5- + + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results' + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_Tests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_OSX_Metal_editmode_CUSTOM-REVISION: name: HDRP on OSX_Metal_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index c35ca9709ab..3d2c1504d9a 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -45,6 +45,27 @@ HDRP_Win_DX11_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_trunk: + name: HDRP on Win_DX11_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_trunk: name: HDRP on Win_DX11_editmode on version trunk agent: @@ -155,6 +176,27 @@ HDRP_Win_DX11_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_DX11_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_fast-trunk: name: HDRP on Win_DX11_editmode on version fast-trunk agent: @@ -267,6 +309,28 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_DX11_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-dx12.yml b/.yamato/hdrp-win-dx12.yml index 5cb2a742f27..055465b4df7 100644 --- a/.yamato/hdrp-win-dx12.yml +++ b/.yamato/hdrp-win-dx12.yml @@ -45,6 +45,27 @@ HDRP_Win_DX12_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX12_playmode_RenderGraph_trunk: + name: HDRP on Win_DX12_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX12_editmode_trunk: name: HDRP on Win_DX12_editmode on version trunk agent: @@ -155,6 +176,27 @@ HDRP_Win_DX12_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_DX12_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_DX12_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX12_editmode_fast-trunk: name: HDRP on Win_DX12_editmode on version fast-trunk agent: @@ -267,6 +309,28 @@ HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_DX12_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_DX12_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_DX12_editmode_CUSTOM-REVISION: name: HDRP on Win_DX12_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-vulkan.yml b/.yamato/hdrp-win-vulkan.yml index 110397da470..b8d25c20853 100644 --- a/.yamato/hdrp-win-vulkan.yml +++ b/.yamato/hdrp-win-vulkan.yml @@ -45,6 +45,27 @@ HDRP_Win_Vulkan_playmode_XR_trunk: logs: paths: - "**/test-results/**" +HDRP_Win_Vulkan_playmode_RenderGraph_trunk: + name: HDRP on Win_Vulkan_playmode_RenderGraph on version trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_Vulkan_editmode_trunk: name: HDRP on Win_Vulkan_editmode on version trunk agent: @@ -155,6 +176,27 @@ HDRP_Win_Vulkan_playmode_XR_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_Win_Vulkan_playmode_RenderGraph_fast-trunk: + name: HDRP on Win_Vulkan_playmode_RenderGraph on version fast-trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_Vulkan_editmode_fast-trunk: name: HDRP on Win_Vulkan_editmode on version fast-trunk agent: @@ -267,6 +309,28 @@ HDRP_Win_Vulkan_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_Win_Vulkan_playmode_RenderGraph_CUSTOM-REVISION: + name: HDRP on Win_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Win_Vulkan_editmode on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_dxr-win-dx12.yml b/.yamato/hdrp_dxr-win-dx12.yml index 3a53357a74c..3346708c295 100644 --- a/.yamato/hdrp_dxr-win-dx12.yml +++ b/.yamato/hdrp_dxr-win-dx12.yml @@ -72,6 +72,27 @@ HDRP_DXR_Win_DX12_playmode_trunk: logs: paths: - "**/test-results/**" +HDRP_DXR_Win_DX12_playmode_XR_trunk: + name: HDRP_DXR on Win_DX12_playmode_XR on version trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.large + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_DXR_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_DXR_Tests && utr\utr --suite=playmode --extra-editor-arg="-xr-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_DXR_Win_DX12_Standalone_fast-trunk: name: HDRP_DXR on Win_DX12_Standalone on version fast-trunk agent: @@ -141,6 +162,27 @@ HDRP_DXR_Win_DX12_playmode_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_DXR_Win_DX12_playmode_XR_fast-trunk: + name: HDRP_DXR on Win_DX12_playmode_XR on version fast-trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.large + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_DXR_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_DXR_Tests && utr\utr --suite=playmode --extra-editor-arg="-xr-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_DXR_Win_DX12_Standalone_CUSTOM-REVISION: name: HDRP_DXR on Win_DX12_Standalone on version CUSTOM-REVISION agent: @@ -213,3 +255,25 @@ HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION: + name: HDRP_DXR on Win_DX12_playmode_XR on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.large + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_DXR_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_DXR_Tests && utr\utr --suite=playmode --extra-editor-arg="-xr-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity index 50ed79d6ae7..07cf6a12084 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity @@ -490,6 +490,11 @@ PrefabInstance: propertyPath: waitFrames value: 5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5229108846403476070 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity index d7622e3b31c..97467ad9db1 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity @@ -1521,7 +1521,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity index 8024f2b1fec..c8c79705311 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity @@ -592,7 +592,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity index fae58abb3ad..b83fc78db88 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity @@ -693,7 +693,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity index 0fbe9352ea6..b054b71ac28 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity @@ -277,6 +277,11 @@ PrefabInstance: propertyPath: waitFrames value: 64 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &930401665 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity index 1d1c03c22d5..7bde589ee80 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity @@ -1766,7 +1766,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity index 9055a1ebfab..65f4e803d34 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity @@ -2676,7 +2676,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity index c397e1352d1..b68492892ab 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity @@ -4987,6 +4987,11 @@ PrefabInstance: propertyPath: waitFrames value: 1 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1441973135 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity index c5c20a097df..922dd9035e0 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity @@ -1667,6 +1667,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0.00012 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1441973135 diff --git a/TestProjects/HDRP_DXR_Tests/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs b/TestProjects/HDRP_DXR_Tests/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs index 21a5d052928..f08a3d2a206 100644 --- a/TestProjects/HDRP_DXR_Tests/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs +++ b/TestProjects/HDRP_DXR_Tests/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs @@ -4,14 +4,6 @@ namespace UnityEngine.Rendering.HighDefinition { - [GenerateHLSL(PackingRules.Exact)] - public enum HDShadowFilteringQuality - { - Low = 0, - Medium = 1, - High = 2, - } - [GenerateHLSL(PackingRules.Exact)] public enum ProbeVolumesEvaluationModes { @@ -68,9 +60,6 @@ public enum ShaderOptions AreaLights = 1, - [System.Obsolete("Deferred shadow can now assume any value, so this field is not used anymore.")] - DeferredShadowFiltering = HDShadowFilteringQuality.Medium, - BarnDoor = 0 }; @@ -91,7 +80,5 @@ public class ShaderConfig public static ProbeVolumesEncodingModes s_ProbeVolumesEncodingMode = (ProbeVolumesEncodingModes)ShaderOptions.ProbeVolumesEncodingMode; public static int s_AreaLights = (int)ShaderOptions.AreaLights; public static int s_BarnDoor = (int)ShaderOptions.BarnDoor; - [System.Obsolete("Deferred shadow can now assume any value, so this field is not used anymore.")] - public static HDShadowFilteringQuality s_DeferredShadowFiltering = (HDShadowFilteringQuality)ShaderOptions.DeferredShadowFiltering; } } diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity index 868997590c3..f957e14a6e1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2402_Area_Rect_Shadow.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.031361558, g: 0.040105402, b: 0.051489316, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: d1e6b80487b4523419f8b0808a8fe032, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -128,11 +131,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (2) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -193,6 +191,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (2) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &189362331 @@ -225,11 +228,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 6 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 1024 m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 200 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 @@ -241,12 +247,11 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_LightTypeExtent: 1 - m_SpotLightShape: 0 m_ShapeWidth: 0.5 m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -257,7 +262,21 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15.5 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -265,10 +284,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -280,13 +298,18 @@ MonoBehaviour: m_VolumetricShadowDimmer: 1 m_ShadowFadeDistance: 10000 m_UseContactShadow: - m_Level: 0 - m_UseOverride: 1 m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 - m_ConstantBias: 0.15 + m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -303,6 +326,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &189362334 Light: m_ObjectHideFlags: 0 @@ -362,6 +388,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 10} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &189362335 @@ -385,11 +412,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (3) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -450,84 +472,13 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (3) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} ---- !u!114 &557812783 -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: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1001 &972798640 PrefabInstance: m_ObjectHideFlags: 0 @@ -535,11 +486,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane (1) - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -600,6 +546,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane (1) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1001 &1071061321 @@ -609,11 +560,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, - type: 3} - propertyPath: m_Name - value: HoledPlane - objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} propertyPath: m_LocalPosition.x @@ -674,6 +620,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dda1ff2ae570bff48a10ed7067b83b48, type: 2} + - target: {fileID: -927199367670048503, guid: 96f7011ee0dda2d4586bc0ae75403519, + type: 3} + propertyPath: m_Name + value: HoledPlane + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96f7011ee0dda2d4586bc0ae75403519, type: 3} --- !u!1 &1126674573 @@ -708,9 +659,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: a435593e8df5fec4ab2279b9647b1816, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 557812783} - m_SkySettingsFromProfile: {fileID: -8584095877685573462, guid: a435593e8df5fec4ab2279b9647b1816, - type: 2} --- !u!114 &1126674575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,6 +761,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2115918006 @@ -844,9 +797,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2115918008 MeshRenderer: @@ -863,6 +816,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity index 32b374d9d61..fd382b4c0df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers.unity @@ -358,7 +358,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 @@ -406,6 +406,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -438,6 +439,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -456,6 +458,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &58980334 Light: m_ObjectHideFlags: 0 @@ -515,6 +518,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.7318046} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &65356095 @@ -561,7 +565,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 @@ -609,6 +613,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -641,6 +646,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -659,6 +665,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &65356099 Light: m_ObjectHideFlags: 0 @@ -718,6 +725,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.6893601} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &96461834 @@ -1811,7 +1819,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 @@ -1859,6 +1867,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1891,6 +1900,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1909,6 +1919,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &253966103 Light: m_ObjectHideFlags: 0 @@ -1968,6 +1979,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &266337115 @@ -2146,107 +2158,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274728986} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &306112926 -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: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 200 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} - enableBackplate: - m_OverrideState: 0 - m_Value: 0 - backplateType: - m_OverrideState: 0 - m_Value: 0 - groundLevel: - m_OverrideState: 0 - m_Value: 0 - scale: - m_OverrideState: 0 - m_Value: {x: 32, y: 32} - projectionDistance: - m_OverrideState: 0 - m_Value: 16 - min: 0.0000001 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 100 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 --- !u!1 &331787933 GameObject: m_ObjectHideFlags: 0 @@ -2732,7 +2643,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 @@ -2780,6 +2691,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2812,6 +2724,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2830,6 +2743,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &677342031 Light: m_ObjectHideFlags: 0 @@ -2889,6 +2803,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!1 &698110940 @@ -3308,6 +3223,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4190,7 +4108,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 @@ -4238,6 +4156,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4270,6 +4189,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4288,6 +4208,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &985985205 Light: m_ObjectHideFlags: 0 @@ -4347,6 +4268,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &990865355 @@ -5679,7 +5601,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 @@ -5727,6 +5649,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5759,6 +5682,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5777,6 +5701,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386441945 Light: m_ObjectHideFlags: 0 @@ -5836,6 +5761,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!1 &1422636729 @@ -5882,7 +5808,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 @@ -5930,6 +5856,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -5962,6 +5889,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5980,6 +5908,7 @@ MonoBehaviour: showAdditionalSettings: 9 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1422636733 Light: m_ObjectHideFlags: 0 @@ -6039,6 +5968,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 1.441993, w: 3.2154703} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1433395784 @@ -6664,7 +6594,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 @@ -6712,6 +6642,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6744,6 +6675,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6762,6 +6694,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1687167846 Light: m_ObjectHideFlags: 0 @@ -6821,6 +6754,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1730395417 @@ -7271,6 +7205,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -7687,6 +7626,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -8951,6 +8893,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -8960,6 +8907,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -8978,6 +8926,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9055,6 +9006,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -9064,6 +9020,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -9082,6 +9039,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity index ac782911aea..68d9cc8b2ae 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2601_SSAO_HalfRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: a5b7c221c4f9f984c9dfa998b2f282ce, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -257,15 +261,42 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264148765 + value: 70005818654557 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -477,32 +508,15 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 + propertyPath: checkMemoryAllocation + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +552,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -562,6 +578,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820961446 MeshFilter: m_ObjectHideFlags: 0 @@ -630,6 +647,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -654,6 +673,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1832587852 MeshFilter: m_ObjectHideFlags: 0 @@ -722,6 +742,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -746,6 +768,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1873845493 MeshFilter: m_ObjectHideFlags: 0 @@ -779,7 +802,6 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} - - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -787,7 +809,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700540 +--- !u!114 &2023700541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -796,98 +818,110 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 ---- !u!114 &2023700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023700539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 - m_Version: 5 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - lightlayersMask: 1 - linkShadowLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -896,8 +930,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -946,6 +981,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 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity index 65d9f609cd2..fdb0950f687 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2602_SSAO_FullRes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 87f2cf15e682aa241982fc3c774314bc, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -257,15 +261,42 @@ PrefabInstance: propertyPath: near clip plane value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_SkySettings + value: + objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, + type: 2} + - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_CommonSettings + value: + objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, + type: 2} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.r + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.g + value: 0.18447503 + objectReference: {fileID: 0} + - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: backgroundColorHDR.b + value: 0.18447503 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264148765 + value: 70005818654557 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -477,32 +508,10 @@ PrefabInstance: propertyPath: waitFrames value: 20 objectReference: {fileID: 0} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_SkySettings - value: - objectReference: {fileID: 11400000, guid: cc7b7e628a645144db38289e55e360a8, - type: 2} - - target: {fileID: 114110876577682668, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_CommonSettings - value: - objectReference: {fileID: 11400000, guid: 23b7439fe7a306c4889c52e465f40911, - type: 2} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.r - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.g - value: 0.18447503 - objectReference: {fileID: 0} - - target: {fileID: 114482499083377642, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.18447503 + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -538,6 +547,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -562,6 +573,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &908551374 MeshFilter: m_ObjectHideFlags: 0 @@ -630,6 +642,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -654,6 +668,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1063449301 MeshFilter: m_ObjectHideFlags: 0 @@ -722,6 +737,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -746,6 +763,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1931848246 MeshFilter: m_ObjectHideFlags: 0 @@ -779,7 +797,6 @@ GameObject: - component: {fileID: 2023700543} - component: {fileID: 2023700542} - component: {fileID: 2023700541} - - component: {fileID: 2023700540} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -787,7 +804,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2023700540 +--- !u!114 &2023700541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -796,98 +813,110 @@ MonoBehaviour: m_GameObject: {fileID: 2023700539} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 ---- !u!114 &2023700541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023700539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 - m_Version: 5 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - lightlayersMask: 1 - linkShadowLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2023700542 Light: m_ObjectHideFlags: 0 @@ -896,8 +925,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023700539} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -946,6 +976,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 &2023700543 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity index c06dd265b91..c5d8ab351eb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -164,7 +166,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -470,7 +472,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -518,6 +520,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -550,6 +553,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -566,6 +570,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &280720572 Light: m_ObjectHideFlags: 0 @@ -625,6 +632,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 &280720573 @@ -779,7 +787,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -896,8 +904,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &491657228 Transform: m_ObjectHideFlags: 1 @@ -1401,7 +1407,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1625,7 +1631,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1850,7 +1856,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2520,7 +2526,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2711,7 +2717,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2807,7 +2813,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2903,7 +2909,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2985,7 +2991,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3095,7 +3101,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3224,7 +3230,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3548,6 +3554,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 3558f110980f9af48b96167a74d9bf69, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &2024456295 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity index f7f9b1a295d..e68822c81df 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3002_DebugLightLayers.unity @@ -121,7 +121,7 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 maxJobWorkers: 0 - keepTiles: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -155,7 +155,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -203,6 +203,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -235,6 +236,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -251,6 +253,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &16453702 Light: m_ObjectHideFlags: 0 @@ -310,6 +315,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &16453703 @@ -356,7 +362,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -404,6 +410,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -436,6 +443,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -452,6 +460,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &83800134 Light: m_ObjectHideFlags: 0 @@ -511,6 +522,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.34} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &83800135 @@ -653,8 +665,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -856,6 +866,11 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: DebugViewController, Unity.RenderPipelines.HighDefinition-Tests.Runtime objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &719009298 @@ -1359,7 +1374,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1407,6 +1422,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1439,6 +1455,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1455,6 +1472,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1629224201 Light: m_ObjectHideFlags: 0 @@ -1514,6 +1534,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1629224202 @@ -2093,6 +2114,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0.53 --- !u!4 &2035111235 @@ -2121,7 +2143,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 2 m_ObsoleteUseShadowQualitySettings: 1 m_ObsoleteCustomShadowResolution: 1024 @@ -2169,6 +2191,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2201,6 +2224,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.005 - 0.015 @@ -2217,6 +2241,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &2132904863 GameObject: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity index e95f3cfdc26..7871e0c33d1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur_PerObject.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c35a6f302d21bc0409b93c78214222e3, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -174,6 +178,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -198,6 +204,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &102126622 Transform: m_ObjectHideFlags: 0 @@ -267,31 +274,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -315,12 +297,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -512,6 +494,41 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteRenderingPath + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &177840196 stripped @@ -596,6 +613,8 @@ MeshRenderer: m_MotionVectors: 0 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -620,6 +639,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -706,6 +726,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -730,6 +752,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &428956473 MeshFilter: m_ObjectHideFlags: 0 @@ -816,6 +839,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -840,6 +865,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &710282033 MeshFilter: m_ObjectHideFlags: 0 @@ -873,7 +899,6 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} - - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -881,7 +906,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016620 +--- !u!114 &795016621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -890,100 +915,110 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &795016621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795016619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -992,8 +1027,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -1042,6 +1078,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 &795016623 @@ -1122,6 +1159,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1146,6 +1185,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1071859215 MeshFilter: m_ObjectHideFlags: 0 @@ -1222,6 +1262,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1246,6 +1288,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1316705464 Transform: m_ObjectHideFlags: 0 @@ -1387,6 +1430,8 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1411,6 +1456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1934046221 MeshFilter: m_ObjectHideFlags: 0 @@ -1487,6 +1533,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1511,6 +1559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &2058568487 Transform: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity index cc313b94bbd..7c0300c865a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 65750d7cf7c87af4bb393c06fcbc9907, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -175,41 +179,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: waitFrames - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: captureFramerate - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 320 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 180 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderingPath @@ -233,12 +202,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -430,6 +399,51 @@ PrefabInstance: propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteRenderingPath + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: captureFramerate + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &309473258 @@ -496,6 +510,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -520,6 +536,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309473262 MeshFilter: m_ObjectHideFlags: 0 @@ -553,7 +570,6 @@ GameObject: - component: {fileID: 795016623} - component: {fileID: 795016622} - component: {fileID: 795016621} - - component: {fileID: 795016620} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -561,7 +577,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &795016620 +--- !u!114 &795016621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -570,100 +586,110 @@ MonoBehaviour: m_GameObject: {fileID: 795016619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 1 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &795016621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795016619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &795016622 Light: m_ObjectHideFlags: 0 @@ -672,8 +698,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795016619} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -722,6 +749,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 &795016623 @@ -830,9 +858,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1483280835 MeshRenderer: @@ -848,6 +876,8 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -872,6 +902,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1483280836 MeshFilter: m_ObjectHideFlags: 0 @@ -932,6 +963,7 @@ MonoBehaviour: settingType: 1 gBuffer: 0 fullScreenDebugMode: 14 + lightlayers: 0 --- !u!114 &1618510980 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity index 733a1cfd5be..f144fd69883 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4021_LensDistortion.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 1219cfc7625a6e34e9b81f20088b6c94, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,6 +204,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -224,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -314,12 +321,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -521,5 +528,10 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity index 8f377bac91c..bc8bd1f9681 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 1dea28949d52d764fa2f6f75a37f742c, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -200,6 +204,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -224,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &896969950 MeshFilter: m_ObjectHideFlags: 0 @@ -319,12 +326,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -526,5 +533,10 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 256 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity index 590ae2d5a80..8944b649e7b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4051_SMAA.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8dc0d3965082d3b44a051ebc67373c24, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -180,6 +184,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -204,6 +210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &40006672 MeshFilter: m_ObjectHideFlags: 0 @@ -328,6 +335,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -352,6 +361,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158095357 MeshFilter: m_ObjectHideFlags: 0 @@ -420,6 +430,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -444,6 +456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172909229 MeshFilter: m_ObjectHideFlags: 0 @@ -512,6 +525,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -536,6 +551,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &234304205 MeshFilter: m_ObjectHideFlags: 0 @@ -604,6 +620,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -628,6 +646,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &307441730 MeshFilter: m_ObjectHideFlags: 0 @@ -696,6 +715,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -720,6 +741,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &329988774 MeshFilter: m_ObjectHideFlags: 0 @@ -788,6 +810,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -812,6 +836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385520400 MeshFilter: m_ObjectHideFlags: 0 @@ -880,6 +905,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -904,6 +931,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &396827034 MeshFilter: m_ObjectHideFlags: 0 @@ -972,6 +1000,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -996,6 +1026,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403782451 MeshFilter: m_ObjectHideFlags: 0 @@ -1064,6 +1095,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1088,6 +1121,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &408685716 MeshFilter: m_ObjectHideFlags: 0 @@ -1156,6 +1190,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1180,6 +1216,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &438277602 MeshFilter: m_ObjectHideFlags: 0 @@ -1248,6 +1285,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1272,6 +1311,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447990307 MeshFilter: m_ObjectHideFlags: 0 @@ -1340,6 +1380,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1364,6 +1406,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &466247374 MeshFilter: m_ObjectHideFlags: 0 @@ -1432,6 +1475,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1456,6 +1501,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &470233058 MeshFilter: m_ObjectHideFlags: 0 @@ -1524,6 +1570,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1548,6 +1596,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475510514 MeshFilter: m_ObjectHideFlags: 0 @@ -1616,6 +1665,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1640,6 +1691,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545534896 MeshFilter: m_ObjectHideFlags: 0 @@ -1677,9 +1729,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -1695,6 +1747,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1719,6 +1773,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &552920928 MeshFilter: m_ObjectHideFlags: 0 @@ -1801,6 +1856,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1825,6 +1882,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &574338704 MeshFilter: m_ObjectHideFlags: 0 @@ -1893,6 +1951,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1917,6 +1977,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &590011005 MeshFilter: m_ObjectHideFlags: 0 @@ -1985,6 +2046,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2009,6 +2072,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &627111561 MeshFilter: m_ObjectHideFlags: 0 @@ -2077,6 +2141,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2101,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &663310342 MeshFilter: m_ObjectHideFlags: 0 @@ -2169,6 +2236,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2193,6 +2262,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &692812422 MeshFilter: m_ObjectHideFlags: 0 @@ -2261,6 +2331,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2285,6 +2357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &695012948 MeshFilter: m_ObjectHideFlags: 0 @@ -2353,6 +2426,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2377,6 +2452,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &747987085 MeshFilter: m_ObjectHideFlags: 0 @@ -2445,6 +2521,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2469,6 +2547,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &769543522 MeshFilter: m_ObjectHideFlags: 0 @@ -2537,6 +2616,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2561,6 +2642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &794411577 MeshFilter: m_ObjectHideFlags: 0 @@ -2629,6 +2711,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2653,6 +2737,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809298687 MeshFilter: m_ObjectHideFlags: 0 @@ -2721,6 +2806,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2745,6 +2832,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &810879982 MeshFilter: m_ObjectHideFlags: 0 @@ -2813,6 +2901,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2837,6 +2927,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &815359632 MeshFilter: m_ObjectHideFlags: 0 @@ -2905,6 +2996,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2929,6 +3022,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &835098136 MeshFilter: m_ObjectHideFlags: 0 @@ -2997,6 +3091,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3021,6 +3117,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &865880060 MeshFilter: m_ObjectHideFlags: 0 @@ -3089,6 +3186,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3113,6 +3212,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &927672921 MeshFilter: m_ObjectHideFlags: 0 @@ -3181,6 +3281,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3205,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &973608318 MeshFilter: m_ObjectHideFlags: 0 @@ -3273,6 +3376,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3297,6 +3402,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1017656388 MeshFilter: m_ObjectHideFlags: 0 @@ -3365,6 +3471,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3389,6 +3497,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1042596661 MeshFilter: m_ObjectHideFlags: 0 @@ -3457,6 +3566,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3481,6 +3592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1060853707 MeshFilter: m_ObjectHideFlags: 0 @@ -3500,7 +3612,6 @@ GameObject: - component: {fileID: 1079224357} - component: {fileID: 1079224356} - component: {fileID: 1079224355} - - component: {fileID: 1079224354} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -3508,7 +3619,7 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1079224354 +--- !u!114 &1079224355 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3517,100 +3628,110 @@ MonoBehaviour: m_GameObject: {fileID: 1079224353} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6c2871f720b2af4e9210febdac74517, type: 3} + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 - shadowResolution: 512 - shadowDimmer: 1 - volumetricShadowDimmer: 1 - shadowFadeDistance: 10000 - contactShadows: 0 - viewBiasMin: 0.2 - viewBiasMax: 100 - viewBiasScale: 1 - normalBiasMin: 0.5 - normalBiasMax: 0.5 - normalBiasScale: 1 - sampleBiasScale: 0 - edgeLeakFixup: 0 - edgeToleranceNormal: 1 - edgeTolerance: 1 - shadowCascadeCount: 4 - shadowCascadeRatios: + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 3.1415927 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 2 + m_FadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 0 + m_NumRayTracingSamples: 4 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 16 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.01 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 1 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_ShadowCascadeRatios: - 0.05 - 0.2 - 0.3 - shadowCascadeBorders: + m_ShadowCascadeBorders: - 0.2 - 0.2 - 0.2 - 0.2 - shadowAlgorithm: 0 - shadowVariant: 0 - shadowPrecision: 0 - shadowData: - format: 0 - data: - shadowDatas: [] ---- !u!114 &1079224355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079224353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 4 - m_Version: 4 - directionalIntensity: 3.1415927 - punctualIntensity: 600 - areaIntensity: 200 - enableSpotReflector: 0 - luxAtDistance: 1 - m_InnerSpotPercent: 0 - lightDimmer: 1 - m_VolumetricDimmer: 1 - lightUnit: 2 - sunDiskSize: 1 - sunHaloSize: 0.1 - fadeDistance: 10000 - affectDiffuse: 1 - affectSpecular: 1 - nonLightmappedOnly: 0 - lightTypeExtent: 0 - m_SpotLightShape: 0 - shapeWidth: 0.5 - shapeHeight: 0.5 - aspectRatio: 1 - shapeRadius: 0 - maxSmoothness: 0.99 - applyRangeAttenuation: 1 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 useOldInspector: 0 useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 - displayLightIntensity: 3.1415927 - displayAreaLightEmissiveMesh: 0 - areaLightCookie: {fileID: 0} - areaLightShadowCone: 120 - evsmExponent: 15 - evsmLightLeakBias: 0 - evsmVarianceBias: 0.00001 - evsmBlurPasses: 0 - lightLayers: 1 - shadowNearPlane: 0.1 - shadowSoftness: 0.5 - blockerSampleCount: 24 - filterSampleCount: 16 - minFilterSize: 0.00001 - kernelSize: 5 - lightAngle: 1 - maxDepthBias: 0.001 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -3619,8 +3740,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079224353} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 3.1415927 m_Range: 10 @@ -3669,6 +3791,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 &1079224357 @@ -3753,12 +3876,12 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 69284264410909 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -3985,6 +4108,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 512 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 @@ -4047,6 +4175,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4071,6 +4201,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1121401768 MeshFilter: m_ObjectHideFlags: 0 @@ -4139,6 +4270,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4163,6 +4296,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1141094899 MeshFilter: m_ObjectHideFlags: 0 @@ -4231,6 +4365,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4255,6 +4391,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1158666092 MeshFilter: m_ObjectHideFlags: 0 @@ -4323,6 +4460,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4347,6 +4486,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1164744979 MeshFilter: m_ObjectHideFlags: 0 @@ -4415,6 +4555,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4439,6 +4581,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1212374789 MeshFilter: m_ObjectHideFlags: 0 @@ -4507,6 +4650,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4531,6 +4676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321506414 MeshFilter: m_ObjectHideFlags: 0 @@ -4599,6 +4745,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4623,6 +4771,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1403629108 MeshFilter: m_ObjectHideFlags: 0 @@ -4691,6 +4840,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4715,6 +4866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417593602 MeshFilter: m_ObjectHideFlags: 0 @@ -4783,6 +4935,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4807,6 +4961,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460963255 MeshFilter: m_ObjectHideFlags: 0 @@ -4875,6 +5030,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4899,6 +5056,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1489396295 MeshFilter: m_ObjectHideFlags: 0 @@ -4967,6 +5125,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4991,6 +5151,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1556045220 MeshFilter: m_ObjectHideFlags: 0 @@ -5059,6 +5220,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5083,6 +5246,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1578692525 MeshFilter: m_ObjectHideFlags: 0 @@ -5151,6 +5315,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5175,6 +5341,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591606731 MeshFilter: m_ObjectHideFlags: 0 @@ -5243,6 +5410,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5267,6 +5436,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1636842448 MeshFilter: m_ObjectHideFlags: 0 @@ -5335,6 +5505,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5359,6 +5531,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1662777384 MeshFilter: m_ObjectHideFlags: 0 @@ -5427,6 +5600,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5451,6 +5626,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680240288 MeshFilter: m_ObjectHideFlags: 0 @@ -5519,6 +5695,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5543,6 +5721,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1702910558 MeshFilter: m_ObjectHideFlags: 0 @@ -5611,6 +5790,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5635,6 +5816,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1718495713 MeshFilter: m_ObjectHideFlags: 0 @@ -5703,6 +5885,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5727,6 +5911,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1768881573 MeshFilter: m_ObjectHideFlags: 0 @@ -5795,6 +5980,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5819,6 +6006,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1812995122 MeshFilter: m_ObjectHideFlags: 0 @@ -5887,6 +6075,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5911,6 +6101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1837835318 MeshFilter: m_ObjectHideFlags: 0 @@ -6016,6 +6207,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6040,6 +6233,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1913705761 MeshFilter: m_ObjectHideFlags: 0 @@ -6108,6 +6302,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6132,6 +6328,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1988598091 MeshFilter: m_ObjectHideFlags: 0 @@ -6256,6 +6453,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6280,6 +6479,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2077504822 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity index a9175d91f8a..936393226d7 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA.unity @@ -120,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -873,7 +875,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1030,6 +1032,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1039,6 +1046,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1057,6 +1065,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2012,9 +2023,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &552920927 MeshRenderer: @@ -3914,7 +3925,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3960,7 +3971,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3993,6 +4006,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4009,6 +4023,9 @@ MonoBehaviour: useVolumetric: 0 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1079224356 Light: m_ObjectHideFlags: 0 @@ -4068,6 +4085,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 &1079224357 @@ -4400,6 +4418,11 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity index 55a06d44306..f2d252f5ab5 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha.unity @@ -4418,6 +4418,11 @@ PrefabInstance: propertyPath: xrThresholdMultiplier value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1121401764 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity index c1fae6ede32..e17fe8c8418 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess.unity @@ -553,6 +553,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0.0001 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1106217728 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity index cdc8bb1f5af..b07a4044f28 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -373,6 +375,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -387,7 +390,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -496,6 +499,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 &803629126 @@ -524,7 +528,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -570,7 +574,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -603,6 +609,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -619,6 +626,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -799,6 +809,11 @@ PrefabInstance: propertyPath: backgroundColorHDR.b value: 0.29107332 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1175354105 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity index a32049a39e2..12be196607f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -374,6 +376,7 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 @@ -388,7 +391,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -497,6 +500,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 &803629126 @@ -525,7 +529,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -571,7 +575,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -604,6 +610,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -620,6 +627,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &862203486 GameObject: m_ObjectHideFlags: 0 @@ -811,6 +821,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: d39c8f0447409a541a78d12c526207ee, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1122444516 @@ -842,7 +857,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1094,6 +1109,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1103,6 +1123,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -1121,6 +1142,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity index 790cabb29f8..e8899896feb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5009_HDRI_Sky_Flow.unity @@ -283,7 +283,12 @@ PrefabInstance: type: 3} propertyPath: renderPipelineAsset value: - objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, + objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity index 91936fec90c..36d34a60910 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass.unity @@ -215,6 +215,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -224,6 +229,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -242,6 +248,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -331,6 +340,8 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0.001 AverageCorrectnessThreshold: 0.0001 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -338,6 +349,7 @@ MonoBehaviour: waitFrames: 0 xrCompatible: 0 xrThresholdMultiplier: 1 + renderGraphCompatible: 0 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} @@ -447,6 +459,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -456,6 +473,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -474,6 +492,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -743,7 +764,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -791,6 +812,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -823,6 +845,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -839,6 +862,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &214615002 Light: m_ObjectHideFlags: 0 @@ -898,6 +924,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 &214615003 @@ -2906,6 +2933,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2915,6 +2947,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2933,6 +2966,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3042,8 +3078,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: d96c2fdce7fa1e24fa2e6a67853cec3f, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &2102952965 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity index 225992a0eb6..475be4f7c07 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,7 +153,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -170,6 +172,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -279,6 +282,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -373,6 +377,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -435,7 +440,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -454,6 +459,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -625,7 +631,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -644,6 +650,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -753,6 +760,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -847,6 +855,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1008,7 +1017,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1027,6 +1036,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1136,6 +1146,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1202,7 +1213,7 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: 62ad55275245cad4290c3d0f370a6be8, type: 2} + sharedProfile: {fileID: 0} --- !u!4 &701793308 Transform: m_ObjectHideFlags: 0 @@ -1358,6 +1369,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetWidth value: 1290 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &717487235 @@ -1389,7 +1405,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1408,6 +1424,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1517,6 +1534,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1550,98 +1568,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759676931} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!21 &776767567 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Area Light - m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _DistortionVectorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _UnlitColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAffectEmissive: 0 - - _AlphaCutoff: 0.5 - - _AlphaCutoffEnable: 0 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _BlendMode: 0 - - _CullMode: 2 - - _Cutoff: 0.5 - - _DistortionBlendMode: 0 - - _DistortionBlurBlendMode: 0 - - _DistortionBlurDstBlend: 0 - - _DistortionBlurRemapMax: 1 - - _DistortionBlurRemapMin: 0 - - _DistortionBlurScale: 1 - - _DistortionBlurSrcBlend: 0 - - _DistortionDepthTest: 1 - - _DistortionDstBlend: 0 - - _DistortionEnable: 0 - - _DistortionOnly: 0 - - _DistortionScale: 1 - - _DistortionSrcBlend: 0 - - _DistortionVectorBias: -1 - - _DistortionVectorScale: 2 - - _DoubleSidedEnable: 0 - - _DstBlend: 0 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - - _EnableFogOnTransparent: 0 - - _HdrpVersion: 2 - - _IncludeIndirectLighting: 0 - - _SrcBlend: 1 - - _StencilRef: 0 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 64 - - _StencilRefMV: 128 - - _StencilWriteMask: 3 - - _StencilWriteMaskDepth: 32 - - _StencilWriteMaskDistortionVec: 64 - - _StencilWriteMaskMV: 128 - - _SurfaceType: 0 - - _TransparentCullMode: 2 - - _TransparentSortPriority: 0 - - _UseEmissiveIntensity: 0 - - _ZTestDepthEqualForOpaque: 4 - - _ZTestModeDistortion: 8 - - _ZTestTransparent: 4 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 0.12732396, g: 0.12732396, b: 0.12732396, a: 0.12732396} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - - _UnlitColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] --- !u!1 &831104153 GameObject: m_ObjectHideFlags: 0 @@ -1672,7 +1598,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1706,6 +1632,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1713,6 +1644,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1745,6 +1679,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1761,6 +1696,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &831104155 Light: m_ObjectHideFlags: 0 @@ -1820,6 +1758,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &831104156 @@ -1991,6 +1930,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2085,6 +2025,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2147,7 +2088,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2166,6 +2107,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2225,8 +2167,6 @@ GameObject: - component: {fileID: 1062541562} - component: {fileID: 1062541561} - component: {fileID: 1062541560} - - component: {fileID: 1062541559} - - component: {fileID: 1062541558} m_Layer: 0 m_Name: Area Light m_TagString: Untagged @@ -2234,54 +2174,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!33 &1062541558 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062541557} - m_Mesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} ---- !u!23 &1062541559 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062541557} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 776767567} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1062541560 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2294,7 +2186,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2328,6 +2220,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2335,6 +2232,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 10 m_EvsmLightLeakBias: 0.448 m_EvsmVarianceBias: 0 @@ -2367,6 +2267,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2383,6 +2284,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 12 + m_AreaLightEmissiveMeshShadowCastingMode: 1 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 1 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1062541561 Light: m_ObjectHideFlags: 0 @@ -2442,6 +2346,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 64} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1062541562 @@ -2519,6 +2424,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2613,6 +2519,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2707,6 +2614,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2770,7 +2678,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2804,6 +2712,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2811,6 +2724,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2843,6 +2759,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2859,6 +2776,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1562174630 Light: m_ObjectHideFlags: 0 @@ -2918,6 +2838,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 &1562174631 @@ -2963,7 +2884,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -2982,6 +2903,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3091,6 +3013,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3153,7 +3076,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3172,6 +3095,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3249,7 +3173,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3268,6 +3192,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3345,7 +3270,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3364,6 +3289,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3441,7 +3367,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3460,6 +3386,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3537,7 +3464,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -3556,6 +3483,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3634,7 +3562,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3668,6 +3596,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3675,6 +3608,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3707,6 +3643,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3723,6 +3660,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1992832556 Light: m_ObjectHideFlags: 0 @@ -3782,6 +3722,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 &1992832557 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity index e7d6c6dfe9d..4e0883eca5f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardBoth.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.05057154, g: 0.06200072, b: 0.075889885, a: 1} + m_IndirectSpecularColor: {r: 0.042444438, g: 0.05500048, b: 0.0708929, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: adeb6e0e8d1cb2a4f88df26fcda87bac, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -196,6 +200,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: ea1589d4340c02946897a7c2f9ade2f0, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1693911544 @@ -205,11 +214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, - type: 3} - propertyPath: m_Name - value: MSAATestPrefab - objectReference: {fileID: 0} - target: {fileID: 4624023023346815260, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} propertyPath: m_LocalPosition.x @@ -265,7 +269,44 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111666879982180, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_MinFilterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5493111667044481731, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_ShadowResolution.m_Level + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7897940750528371561, guid: 6e970b6acef289042af8a6f6d0c1e6fb, + type: 3} + propertyPath: m_Name + value: MSAATestPrefab + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5493111667044481730, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} + - {fileID: 5493111666879982179, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6e970b6acef289042af8a6f6d0c1e6fb, type: 3} --- !u!1 &1916420829 GameObject: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity index 03022a17eea..742c65ecd0c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAAForwardOnly.unity @@ -268,6 +268,11 @@ PrefabInstance: propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5493111667791475096 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity index d4032c6bd49..7ff9f32fa58 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-Graph.unity @@ -156,8 +156,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -352,6 +350,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -540,6 +543,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.36045727 objectReference: {fileID: 0} + - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} - target: {fileID: 4722329110712897087, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_LocalScale.x diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity index 20f002649cc..cfe54217c21 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask-HDRP.unity @@ -156,8 +156,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &313761475 Transform: m_ObjectHideFlags: 1 @@ -352,6 +350,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8650072ee85219341b65a263bf871815, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!115 &1841999134 @@ -635,6 +638,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 20cc6a2b7d30ae54c9bd8673cafeac38, type: 2} + - target: {fileID: 4722329110318162791, guid: 788468ec810cab144bdb8014e3b29cc1, + type: 3} + propertyPath: m_Version + value: 11 + objectReference: {fileID: 0} - target: {fileID: 4722329110318162793, guid: 788468ec810cab144bdb8014e3b29cc1, type: 3} propertyPath: m_RootOrder diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity index ccd36a54ee2..76c89b16f8d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -96,8 +96,10 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c751d73340dd34b42bbd5ae17c28848c, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -127,6 +131,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -196,13 +208,10 @@ PrefabInstance: propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Name - value: HDRP_Test_Camera - objectReference: {fileID: 0} - - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_IsActive - value: 1 + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -384,6 +393,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -408,6 +418,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828622937 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity index d3a23be3c72..b2d28d062bb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching-Off.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -686,6 +688,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -695,6 +702,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -713,6 +721,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -792,7 +803,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -826,6 +837,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -833,6 +849,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -865,6 +884,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -881,6 +901,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &316708079 Light: m_ObjectHideFlags: 0 @@ -940,6 +963,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &316708080 @@ -1034,6 +1058,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1898,8 +1923,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &627418905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2102,7 +2125,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2136,6 +2159,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2143,6 +2171,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2175,6 +2206,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2191,6 +2223,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &739942738 Light: m_ObjectHideFlags: 0 @@ -2250,6 +2285,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &739942739 @@ -2510,7 +2546,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2544,6 +2580,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2551,6 +2592,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2583,6 +2627,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2599,6 +2644,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &803090226 Light: m_ObjectHideFlags: 0 @@ -2658,6 +2706,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &803090227 @@ -2844,7 +2893,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2878,6 +2927,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2885,6 +2939,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2917,6 +2974,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2933,6 +2991,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &928375464 Light: m_ObjectHideFlags: 0 @@ -2992,6 +3053,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &928375465 @@ -3159,7 +3221,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3176,6 +3238,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -3184,7 +3251,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3201,6 +3268,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -3269,7 +3341,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3286,6 +3358,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -3819,7 +3896,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3853,6 +3930,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3860,6 +3942,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3892,6 +3977,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3908,6 +3994,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1237229781 Light: m_ObjectHideFlags: 0 @@ -3967,6 +4056,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1237229782 @@ -4050,7 +4140,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4084,6 +4174,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4091,6 +4186,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4123,6 +4221,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4139,6 +4238,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1274396916 Light: m_ObjectHideFlags: 0 @@ -4198,6 +4300,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1274396917 @@ -5488,6 +5591,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1789434830 stripped @@ -5601,6 +5709,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5610,6 +5723,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5628,6 +5742,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6087,7 +6204,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6121,6 +6238,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6128,6 +6250,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6160,6 +6285,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6176,6 +6302,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2010550058 Light: m_ObjectHideFlags: 0 @@ -6235,6 +6364,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 &2010550059 @@ -6398,6 +6528,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6407,6 +6542,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6425,6 +6561,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity index bd63f5f084e..c5feef8b2a1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9602_SkinnedMeshBatching-On.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -675,8 +677,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!114 &160564957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1095,7 +1095,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1129,6 +1129,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1136,6 +1141,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1168,6 +1176,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1184,6 +1193,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &376190249 Light: m_ObjectHideFlags: 0 @@ -1243,6 +1255,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 &376190250 @@ -1609,7 +1622,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1643,6 +1656,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1650,6 +1668,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1682,6 +1703,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1698,6 +1720,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &597864850 Light: m_ObjectHideFlags: 0 @@ -1757,6 +1782,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.628511} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &597864851 @@ -1803,7 +1829,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1837,6 +1863,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1844,6 +1875,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1876,6 +1910,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1892,6 +1927,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &632939249 Light: m_ObjectHideFlags: 0 @@ -1951,6 +1989,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &632939250 @@ -2117,7 +2156,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -2151,6 +2190,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -2158,6 +2202,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -2190,6 +2237,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2206,6 +2254,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &667701177 Light: m_ObjectHideFlags: 0 @@ -2265,6 +2316,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &667701178 @@ -3510,6 +3562,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3517,6 +3574,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3549,6 +3609,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3565,6 +3626,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1190946901 Light: m_ObjectHideFlags: 0 @@ -3624,6 +3688,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 &1190946902 @@ -3729,6 +3794,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -3738,6 +3808,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3756,6 +3827,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3866,6 +3940,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4335,6 +4410,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1311907884 @@ -4484,7 +4564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4518,6 +4598,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4525,6 +4610,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4557,6 +4645,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4573,6 +4662,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1313756196 Light: m_ObjectHideFlags: 0 @@ -4632,6 +4724,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1313756197 @@ -4905,7 +4998,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4939,6 +5032,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4946,6 +5044,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4978,6 +5079,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4994,6 +5096,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1503478094 Light: m_ObjectHideFlags: 0 @@ -5053,6 +5158,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0.57085574, w: 0.77375686} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1503478095 @@ -5718,7 +5824,7 @@ PrefabInstance: - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5735,6 +5841,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460634817957696, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: version @@ -5743,7 +5854,7 @@ PrefabInstance: - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5760,6 +5871,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635176206052, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5166460635194736116, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Name @@ -5828,7 +5944,7 @@ PrefabInstance: - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} propertyPath: m_Version - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5845,6 +5961,11 @@ PrefabInstance: propertyPath: m_MinFilterSize value: 1 objectReference: {fileID: 0} + - target: {fileID: 5166460635888423118, guid: 1320610a60284bc4a94a401eb4f7cbf2, + type: 3} + propertyPath: m_ShadowNearPlane + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5166460635888423117, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} - {fileID: 5166460635176206075, guid: 1320610a60284bc4a94a401eb4f7cbf2, type: 3} @@ -5953,6 +6074,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -5962,6 +6088,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -5980,6 +6107,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6273,7 +6403,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6307,6 +6437,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6314,6 +6449,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6346,6 +6484,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -6362,6 +6501,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1970729143 Light: m_ObjectHideFlags: 0 @@ -6421,6 +6563,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.2} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1970729144 @@ -6807,6 +6950,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -6816,6 +6964,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -6834,6 +6983,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity index 0c143444d60..b45c2598498 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9603_MeshRendererBatching-Off.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 96be6728ca2a96a4595a4df0242dfd52, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -128,16 +131,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -208,46 +241,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &36551380 @@ -283,6 +286,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -307,6 +311,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &36551382 MeshFilter: m_ObjectHideFlags: 0 @@ -362,6 +367,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -386,6 +392,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &46421382 MeshFilter: m_ObjectHideFlags: 0 @@ -441,6 +448,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -465,6 +473,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &60506766 MeshFilter: m_ObjectHideFlags: 0 @@ -520,6 +529,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -544,6 +554,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65113829 MeshFilter: m_ObjectHideFlags: 0 @@ -599,6 +610,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -623,6 +635,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &66120961 MeshFilter: m_ObjectHideFlags: 0 @@ -678,6 +691,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -702,6 +716,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77076703 MeshFilter: m_ObjectHideFlags: 0 @@ -753,9 +768,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &101861481 MeshRenderer: @@ -772,6 +787,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -796,6 +812,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &101861482 MeshFilter: m_ObjectHideFlags: 0 @@ -850,9 +867,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1500180839} - m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, - type: 2} --- !u!114 &115701100 MonoBehaviour: m_ObjectHideFlags: 0 @@ -917,6 +931,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -941,6 +956,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &127095559 MeshFilter: m_ObjectHideFlags: 0 @@ -970,16 +986,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(OFF) test with 4 materials + + and 4 meshes checking + shadow behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -1050,51 +1101,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: 'Batching(OFF) test with 4 materials - - and 4 meshes checking - shadow behavior - - with different light type shadows' - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &150582942 @@ -1130,6 +1146,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1154,6 +1171,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &150582944 MeshFilter: m_ObjectHideFlags: 0 @@ -1209,6 +1227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1233,6 +1252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &153531923 MeshFilter: m_ObjectHideFlags: 0 @@ -1288,6 +1308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1312,6 +1333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &155155688 MeshFilter: m_ObjectHideFlags: 0 @@ -1367,6 +1389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1391,6 +1414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &170534014 MeshFilter: m_ObjectHideFlags: 0 @@ -1446,6 +1470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1470,6 +1495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &174301839 MeshFilter: m_ObjectHideFlags: 0 @@ -1525,6 +1551,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1549,6 +1576,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &182072262 MeshFilter: m_ObjectHideFlags: 0 @@ -1604,6 +1632,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1628,6 +1657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &186477293 MeshFilter: m_ObjectHideFlags: 0 @@ -1683,6 +1713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1707,6 +1738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &200455129 MeshFilter: m_ObjectHideFlags: 0 @@ -1762,6 +1794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1786,6 +1819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &204257016 MeshFilter: m_ObjectHideFlags: 0 @@ -1841,6 +1875,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1865,6 +1900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &227477080 MeshFilter: m_ObjectHideFlags: 0 @@ -1920,6 +1956,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1944,6 +1981,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &238349023 MeshFilter: m_ObjectHideFlags: 0 @@ -1973,16 +2011,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2053,46 +2121,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &243558409 @@ -2128,6 +2166,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2152,6 +2191,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &243558411 MeshFilter: m_ObjectHideFlags: 0 @@ -2207,6 +2247,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2231,6 +2272,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &253909733 MeshFilter: m_ObjectHideFlags: 0 @@ -2286,6 +2328,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2310,6 +2353,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259622049 MeshFilter: m_ObjectHideFlags: 0 @@ -2365,6 +2409,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2389,6 +2434,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &261850620 MeshFilter: m_ObjectHideFlags: 0 @@ -2444,6 +2490,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2468,6 +2515,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &264730788 MeshFilter: m_ObjectHideFlags: 0 @@ -2523,6 +2571,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2547,6 +2596,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &265628708 MeshFilter: m_ObjectHideFlags: 0 @@ -2602,6 +2652,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2626,6 +2677,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &268124353 MeshFilter: m_ObjectHideFlags: 0 @@ -2677,9 +2729,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &286673898 MeshRenderer: @@ -2696,6 +2748,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2720,6 +2773,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286673899 MeshFilter: m_ObjectHideFlags: 0 @@ -2775,6 +2829,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2799,6 +2854,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &288435795 MeshFilter: m_ObjectHideFlags: 0 @@ -2828,15 +2884,45 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -2908,46 +2994,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &311832186 @@ -2983,6 +3039,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3007,6 +3064,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311832188 MeshFilter: m_ObjectHideFlags: 0 @@ -3062,6 +3120,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3086,6 +3145,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &315335065 MeshFilter: m_ObjectHideFlags: 0 @@ -3141,6 +3201,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3165,6 +3226,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &323337983 MeshFilter: m_ObjectHideFlags: 0 @@ -3220,6 +3282,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3244,6 +3307,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &347980535 MeshFilter: m_ObjectHideFlags: 0 @@ -3299,6 +3363,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3323,6 +3388,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &353743933 MeshFilter: m_ObjectHideFlags: 0 @@ -3378,6 +3444,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3402,6 +3469,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &358891137 MeshFilter: m_ObjectHideFlags: 0 @@ -3457,6 +3525,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3481,6 +3550,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &371112390 MeshFilter: m_ObjectHideFlags: 0 @@ -3536,6 +3606,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3560,6 +3631,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &385211676 MeshFilter: m_ObjectHideFlags: 0 @@ -3615,6 +3687,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3639,6 +3712,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &393485934 MeshFilter: m_ObjectHideFlags: 0 @@ -3694,6 +3768,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3718,6 +3793,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414712806 MeshFilter: m_ObjectHideFlags: 0 @@ -3773,6 +3849,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3797,6 +3874,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &442248312 MeshFilter: m_ObjectHideFlags: 0 @@ -3852,6 +3930,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3876,6 +3955,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &451218266 MeshFilter: m_ObjectHideFlags: 0 @@ -3931,6 +4011,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3955,6 +4036,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &454545252 MeshFilter: m_ObjectHideFlags: 0 @@ -4024,6 +4106,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4048,6 +4131,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &456409600 MeshFilter: m_ObjectHideFlags: 0 @@ -4089,6 +4173,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4113,6 +4198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &463589548 MeshFilter: m_ObjectHideFlags: 0 @@ -4168,6 +4254,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4192,6 +4279,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &475376730 MeshFilter: m_ObjectHideFlags: 0 @@ -4247,6 +4335,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4271,6 +4360,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &481317919 MeshFilter: m_ObjectHideFlags: 0 @@ -4326,6 +4416,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4350,6 +4441,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483495094 MeshFilter: m_ObjectHideFlags: 0 @@ -4405,6 +4497,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4429,6 +4522,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &483928023 MeshFilter: m_ObjectHideFlags: 0 @@ -4484,6 +4578,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4508,6 +4603,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &485852219 MeshFilter: m_ObjectHideFlags: 0 @@ -4559,9 +4655,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &507304597 MeshRenderer: @@ -4578,6 +4674,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4602,6 +4699,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &507304598 MeshFilter: m_ObjectHideFlags: 0 @@ -4657,6 +4755,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4681,6 +4780,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515052764 MeshFilter: m_ObjectHideFlags: 0 @@ -4732,9 +4832,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &515113725 MeshRenderer: @@ -4751,6 +4851,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4775,6 +4876,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515113726 MeshFilter: m_ObjectHideFlags: 0 @@ -4830,6 +4932,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4854,6 +4957,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &515981675 MeshFilter: m_ObjectHideFlags: 0 @@ -4909,6 +5013,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4933,6 +5038,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &524115670 MeshFilter: m_ObjectHideFlags: 0 @@ -4988,6 +5094,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5012,6 +5119,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531014866 MeshFilter: m_ObjectHideFlags: 0 @@ -5067,6 +5175,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5091,6 +5200,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &535988451 MeshFilter: m_ObjectHideFlags: 0 @@ -5146,6 +5256,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5170,6 +5281,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545110250 MeshFilter: m_ObjectHideFlags: 0 @@ -5225,6 +5337,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5249,6 +5362,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545921550 MeshFilter: m_ObjectHideFlags: 0 @@ -5304,6 +5418,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5328,6 +5443,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &549211337 MeshFilter: m_ObjectHideFlags: 0 @@ -5419,6 +5535,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5443,6 +5560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &554062274 MeshFilter: m_ObjectHideFlags: 0 @@ -5498,6 +5616,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5522,6 +5641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &585238646 MeshFilter: m_ObjectHideFlags: 0 @@ -5577,6 +5697,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5601,6 +5722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &593985934 MeshFilter: m_ObjectHideFlags: 0 @@ -5656,6 +5778,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5680,6 +5803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &600499765 MeshFilter: m_ObjectHideFlags: 0 @@ -5735,6 +5859,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5759,6 +5884,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602785436 MeshFilter: m_ObjectHideFlags: 0 @@ -5814,6 +5940,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5838,6 +5965,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &606501518 MeshFilter: m_ObjectHideFlags: 0 @@ -5893,6 +6021,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5917,6 +6046,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &635086611 MeshFilter: m_ObjectHideFlags: 0 @@ -5972,6 +6102,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5996,6 +6127,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &644832025 MeshFilter: m_ObjectHideFlags: 0 @@ -6047,9 +6179,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &675722532 MeshRenderer: @@ -6066,6 +6198,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6090,6 +6223,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &675722533 MeshFilter: m_ObjectHideFlags: 0 @@ -6145,6 +6279,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6169,6 +6304,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &680093780 MeshFilter: m_ObjectHideFlags: 0 @@ -6224,6 +6360,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6248,6 +6385,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &705903101 MeshFilter: m_ObjectHideFlags: 0 @@ -6303,6 +6441,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6327,6 +6466,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &728083195 MeshFilter: m_ObjectHideFlags: 0 @@ -6382,6 +6522,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6406,6 +6547,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &734490762 MeshFilter: m_ObjectHideFlags: 0 @@ -6461,6 +6603,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6485,6 +6628,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &737650306 MeshFilter: m_ObjectHideFlags: 0 @@ -6540,6 +6684,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6564,6 +6709,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &751044735 MeshFilter: m_ObjectHideFlags: 0 @@ -6619,6 +6765,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6643,6 +6790,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &756692492 MeshFilter: m_ObjectHideFlags: 0 @@ -6698,6 +6846,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6722,6 +6871,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &757283832 MeshFilter: m_ObjectHideFlags: 0 @@ -6777,6 +6927,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6801,6 +6952,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &772931098 MeshFilter: m_ObjectHideFlags: 0 @@ -6856,6 +7008,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6880,6 +7033,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &774742369 MeshFilter: m_ObjectHideFlags: 0 @@ -6935,6 +7089,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6959,6 +7114,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &777150796 MeshFilter: m_ObjectHideFlags: 0 @@ -7014,6 +7170,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7038,6 +7195,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &784485898 MeshFilter: m_ObjectHideFlags: 0 @@ -7093,6 +7251,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7117,6 +7276,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &824852118 MeshFilter: m_ObjectHideFlags: 0 @@ -7172,6 +7332,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7196,6 +7357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &831555554 MeshFilter: m_ObjectHideFlags: 0 @@ -7251,6 +7413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7275,6 +7438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &841086743 MeshFilter: m_ObjectHideFlags: 0 @@ -7330,6 +7494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7354,6 +7519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886695358 MeshFilter: m_ObjectHideFlags: 0 @@ -7409,6 +7575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7433,6 +7600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901920340 MeshFilter: m_ObjectHideFlags: 0 @@ -7488,6 +7656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7512,6 +7681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &913545789 MeshFilter: m_ObjectHideFlags: 0 @@ -7567,6 +7737,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7591,6 +7762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917358696 MeshFilter: m_ObjectHideFlags: 0 @@ -7646,6 +7818,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7670,6 +7843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &917574245 MeshFilter: m_ObjectHideFlags: 0 @@ -7725,6 +7899,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7749,6 +7924,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &939069929 MeshFilter: m_ObjectHideFlags: 0 @@ -7804,6 +7980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7828,6 +8005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &942091866 MeshFilter: m_ObjectHideFlags: 0 @@ -7883,6 +8061,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7907,6 +8086,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &943532141 MeshFilter: m_ObjectHideFlags: 0 @@ -7962,6 +8142,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7986,6 +8167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &987125021 MeshFilter: m_ObjectHideFlags: 0 @@ -8041,6 +8223,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8065,6 +8248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991365373 MeshFilter: m_ObjectHideFlags: 0 @@ -8120,6 +8304,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8144,6 +8329,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1008620057 MeshFilter: m_ObjectHideFlags: 0 @@ -8213,6 +8399,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8237,6 +8424,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1021467115 MeshFilter: m_ObjectHideFlags: 0 @@ -8278,6 +8466,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8302,6 +8491,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1056257243 MeshFilter: m_ObjectHideFlags: 0 @@ -8357,6 +8547,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8381,6 +8572,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1062953899 MeshFilter: m_ObjectHideFlags: 0 @@ -8436,6 +8628,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8460,6 +8653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064303137 MeshFilter: m_ObjectHideFlags: 0 @@ -8515,6 +8709,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8539,6 +8734,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1064782782 MeshFilter: m_ObjectHideFlags: 0 @@ -8594,6 +8790,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8618,6 +8815,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1069142520 MeshFilter: m_ObjectHideFlags: 0 @@ -8673,6 +8871,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8697,6 +8896,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1090690753 MeshFilter: m_ObjectHideFlags: 0 @@ -8795,6 +8995,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8819,6 +9020,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1101367492 MeshFilter: m_ObjectHideFlags: 0 @@ -8874,6 +9076,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8898,6 +9101,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1102238839 MeshFilter: m_ObjectHideFlags: 0 @@ -8953,6 +9157,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8977,6 +9182,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1114955574 MeshFilter: m_ObjectHideFlags: 0 @@ -9032,6 +9238,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9056,6 +9263,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1115857959 MeshFilter: m_ObjectHideFlags: 0 @@ -9111,6 +9319,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9135,6 +9344,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123583534 MeshFilter: m_ObjectHideFlags: 0 @@ -9190,6 +9400,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9214,6 +9425,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1136865338 MeshFilter: m_ObjectHideFlags: 0 @@ -9269,6 +9481,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9293,6 +9506,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1139714605 MeshFilter: m_ObjectHideFlags: 0 @@ -9348,6 +9562,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9372,6 +9587,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1146692006 MeshFilter: m_ObjectHideFlags: 0 @@ -9427,6 +9643,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9451,6 +9668,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1150003263 MeshFilter: m_ObjectHideFlags: 0 @@ -9506,6 +9724,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9530,6 +9749,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1155367716 MeshFilter: m_ObjectHideFlags: 0 @@ -9585,6 +9805,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9609,6 +9830,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167055085 MeshFilter: m_ObjectHideFlags: 0 @@ -9664,6 +9886,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9688,6 +9911,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169402463 MeshFilter: m_ObjectHideFlags: 0 @@ -9743,6 +9967,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9767,6 +9992,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1169459259 MeshFilter: m_ObjectHideFlags: 0 @@ -9822,6 +10048,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9846,6 +10073,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173661556 MeshFilter: m_ObjectHideFlags: 0 @@ -9901,6 +10129,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9925,6 +10154,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1173941889 MeshFilter: m_ObjectHideFlags: 0 @@ -9991,7 +10221,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -10014,6 +10244,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -10024,6 +10255,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -10031,6 +10267,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -10038,10 +10277,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -10058,9 +10296,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10077,6 +10319,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1186812977 Light: m_ObjectHideFlags: 0 @@ -10136,6 +10381,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!1 &1189427210 @@ -10171,6 +10417,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10195,6 +10442,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1189427212 MeshFilter: m_ObjectHideFlags: 0 @@ -10250,6 +10498,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10274,6 +10523,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1191893181 MeshFilter: m_ObjectHideFlags: 0 @@ -10329,6 +10579,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10353,6 +10604,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1200757313 MeshFilter: m_ObjectHideFlags: 0 @@ -10408,6 +10660,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10432,6 +10685,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1219120707 MeshFilter: m_ObjectHideFlags: 0 @@ -10487,6 +10741,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10511,6 +10766,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1222561854 MeshFilter: m_ObjectHideFlags: 0 @@ -10566,6 +10822,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10590,6 +10847,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1224740520 MeshFilter: m_ObjectHideFlags: 0 @@ -10645,6 +10903,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10669,6 +10928,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236603816 MeshFilter: m_ObjectHideFlags: 0 @@ -10738,6 +10998,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10762,6 +11023,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1242223686 MeshFilter: m_ObjectHideFlags: 0 @@ -10803,6 +11065,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10827,6 +11090,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1243024348 MeshFilter: m_ObjectHideFlags: 0 @@ -10882,6 +11146,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10906,6 +11171,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1247850078 MeshFilter: m_ObjectHideFlags: 0 @@ -10961,6 +11227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10985,6 +11252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1259711087 MeshFilter: m_ObjectHideFlags: 0 @@ -11040,6 +11308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11064,6 +11333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1262205734 MeshFilter: m_ObjectHideFlags: 0 @@ -11119,6 +11389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11143,6 +11414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275508096 MeshFilter: m_ObjectHideFlags: 0 @@ -11198,6 +11470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11222,6 +11495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1275917559 MeshFilter: m_ObjectHideFlags: 0 @@ -11277,6 +11551,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11301,6 +11576,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1287832517 MeshFilter: m_ObjectHideFlags: 0 @@ -11356,6 +11632,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11380,6 +11657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1289313402 MeshFilter: m_ObjectHideFlags: 0 @@ -11435,6 +11713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11459,6 +11738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1298995558 MeshFilter: m_ObjectHideFlags: 0 @@ -11514,6 +11794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11538,6 +11819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1302983124 MeshFilter: m_ObjectHideFlags: 0 @@ -11593,6 +11875,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11617,6 +11900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1310388112 MeshFilter: m_ObjectHideFlags: 0 @@ -11672,6 +11956,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11696,6 +11981,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1313496688 MeshFilter: m_ObjectHideFlags: 0 @@ -11751,6 +12037,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11775,6 +12062,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1321236503 MeshFilter: m_ObjectHideFlags: 0 @@ -11841,7 +12129,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -11864,6 +12152,7 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -11874,6 +12163,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -11881,6 +12175,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -11888,10 +12185,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -11908,9 +12204,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11927,6 +12227,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1334092060 Light: m_ObjectHideFlags: 0 @@ -11986,6 +12289,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1344180423 @@ -12035,6 +12339,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12059,6 +12364,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344180426 MeshFilter: m_ObjectHideFlags: 0 @@ -12100,6 +12406,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12124,6 +12431,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1350933908 MeshFilter: m_ObjectHideFlags: 0 @@ -12179,6 +12487,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12203,6 +12512,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368252137 MeshFilter: m_ObjectHideFlags: 0 @@ -12258,6 +12568,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12282,6 +12593,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1368802139 MeshFilter: m_ObjectHideFlags: 0 @@ -12337,6 +12649,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12361,6 +12674,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1381569253 MeshFilter: m_ObjectHideFlags: 0 @@ -12416,6 +12730,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12440,6 +12755,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1383163231 MeshFilter: m_ObjectHideFlags: 0 @@ -12495,6 +12811,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12519,6 +12836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1396529170 MeshFilter: m_ObjectHideFlags: 0 @@ -12574,6 +12892,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12598,6 +12917,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1402937276 MeshFilter: m_ObjectHideFlags: 0 @@ -12653,6 +12973,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12677,6 +12998,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1414587696 MeshFilter: m_ObjectHideFlags: 0 @@ -12732,6 +13054,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12756,6 +13079,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1417253615 MeshFilter: m_ObjectHideFlags: 0 @@ -12811,6 +13135,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12835,6 +13160,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1419332792 MeshFilter: m_ObjectHideFlags: 0 @@ -12890,6 +13216,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12914,6 +13241,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1434700136 MeshFilter: m_ObjectHideFlags: 0 @@ -12969,6 +13297,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12993,6 +13322,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1453744377 MeshFilter: m_ObjectHideFlags: 0 @@ -13048,6 +13378,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13072,6 +13403,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1476022556 MeshFilter: m_ObjectHideFlags: 0 @@ -13124,7 +13456,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13147,6 +13479,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -13157,6 +13490,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13164,6 +13502,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13171,10 +13512,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13191,9 +13531,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13210,6 +13554,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1481024265 Light: m_ObjectHideFlags: 0 @@ -13269,6 +13616,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 &1481024266 @@ -13318,6 +13666,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13342,6 +13691,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1490167730 MeshFilter: m_ObjectHideFlags: 0 @@ -13364,82 +13714,6 @@ Transform: m_Father: {fileID: 1603355434} m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1500180839 -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: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1505593270 GameObject: m_ObjectHideFlags: 0 @@ -13473,6 +13747,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13497,6 +13772,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1505593272 MeshFilter: m_ObjectHideFlags: 0 @@ -13552,6 +13828,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13576,6 +13853,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1507424699 MeshFilter: m_ObjectHideFlags: 0 @@ -13631,6 +13909,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13655,6 +13934,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1514978764 MeshFilter: m_ObjectHideFlags: 0 @@ -13710,6 +13990,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13734,6 +14015,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1519772559 MeshFilter: m_ObjectHideFlags: 0 @@ -13789,6 +14071,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13813,6 +14096,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1538025914 MeshFilter: m_ObjectHideFlags: 0 @@ -13868,6 +14152,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13892,6 +14177,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1543193733 MeshFilter: m_ObjectHideFlags: 0 @@ -13947,6 +14233,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13971,6 +14258,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1545245265 MeshFilter: m_ObjectHideFlags: 0 @@ -14026,6 +14314,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14050,6 +14339,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1574710584 MeshFilter: m_ObjectHideFlags: 0 @@ -14105,6 +14395,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14129,6 +14420,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1598618972 MeshFilter: m_ObjectHideFlags: 0 @@ -14420,6 +14712,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14444,6 +14737,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1645498030 MeshFilter: m_ObjectHideFlags: 0 @@ -14499,6 +14793,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14523,6 +14818,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1655537782 MeshFilter: m_ObjectHideFlags: 0 @@ -14578,6 +14874,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14602,6 +14899,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1677565070 MeshFilter: m_ObjectHideFlags: 0 @@ -14657,6 +14955,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14681,6 +14980,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1680464722 MeshFilter: m_ObjectHideFlags: 0 @@ -14736,6 +15036,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14760,6 +15061,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1694320345 MeshFilter: m_ObjectHideFlags: 0 @@ -14815,6 +15117,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14839,6 +15142,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1701473976 MeshFilter: m_ObjectHideFlags: 0 @@ -14894,6 +15198,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14918,6 +15223,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723268422 MeshFilter: m_ObjectHideFlags: 0 @@ -14947,16 +15253,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: overrideTestSettings + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15027,51 +15368,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Anchor - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Alignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: targetCamera - value: + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Enabled + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: overrideTestSettings - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1733495935 @@ -15107,6 +15413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15131,6 +15438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1733495937 MeshFilter: m_ObjectHideFlags: 0 @@ -15186,6 +15494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15210,6 +15519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1737097214 MeshFilter: m_ObjectHideFlags: 0 @@ -15265,6 +15575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15289,6 +15600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1742747597 MeshFilter: m_ObjectHideFlags: 0 @@ -15344,6 +15656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15368,6 +15681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1745614621 MeshFilter: m_ObjectHideFlags: 0 @@ -15423,6 +15737,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15447,6 +15762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750054272 MeshFilter: m_ObjectHideFlags: 0 @@ -15502,6 +15818,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15526,6 +15843,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1770933946 MeshFilter: m_ObjectHideFlags: 0 @@ -15581,6 +15899,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15605,6 +15924,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1772511680 MeshFilter: m_ObjectHideFlags: 0 @@ -15660,6 +15980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15684,6 +16005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777553420 MeshFilter: m_ObjectHideFlags: 0 @@ -15771,6 +16093,21 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -15832,21 +16169,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1788602647 @@ -15856,16 +16183,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (3) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Pyramid Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15936,46 +16293,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1791778916 @@ -16011,6 +16338,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16035,6 +16363,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791778918 MeshFilter: m_ObjectHideFlags: 0 @@ -16090,6 +16419,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16114,6 +16444,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1795726768 MeshFilter: m_ObjectHideFlags: 0 @@ -16169,6 +16500,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16193,6 +16525,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805369059 MeshFilter: m_ObjectHideFlags: 0 @@ -16248,6 +16581,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16272,6 +16606,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1805418746 MeshFilter: m_ObjectHideFlags: 0 @@ -16327,6 +16662,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16351,6 +16687,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1806486486 MeshFilter: m_ObjectHideFlags: 0 @@ -16406,6 +16743,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16430,6 +16768,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1811672316 MeshFilter: m_ObjectHideFlags: 0 @@ -16485,6 +16824,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16509,6 +16849,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1820677218 MeshFilter: m_ObjectHideFlags: 0 @@ -16564,6 +16905,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16588,6 +16930,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828202885 MeshFilter: m_ObjectHideFlags: 0 @@ -16643,6 +16986,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16667,6 +17011,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1828337667 MeshFilter: m_ObjectHideFlags: 0 @@ -16722,6 +17067,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16746,6 +17092,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1845195892 MeshFilter: m_ObjectHideFlags: 0 @@ -16801,6 +17148,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16825,6 +17173,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1851237859 MeshFilter: m_ObjectHideFlags: 0 @@ -16880,6 +17229,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16904,6 +17254,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1905441408 MeshFilter: m_ObjectHideFlags: 0 @@ -16959,6 +17310,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16983,6 +17335,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1922813201 MeshFilter: m_ObjectHideFlags: 0 @@ -17038,6 +17391,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17062,6 +17416,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1924402466 MeshFilter: m_ObjectHideFlags: 0 @@ -17117,6 +17472,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17141,6 +17497,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1930622162 MeshFilter: m_ObjectHideFlags: 0 @@ -17207,7 +17564,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17230,6 +17587,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -17240,6 +17598,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17247,6 +17610,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17254,10 +17620,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17274,9 +17639,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17293,6 +17662,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1934754985 Light: m_ObjectHideFlags: 0 @@ -17352,6 +17724,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1944444714 @@ -17387,6 +17760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17411,6 +17785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1944444716 MeshFilter: m_ObjectHideFlags: 0 @@ -17466,6 +17841,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17490,6 +17866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1950934447 MeshFilter: m_ObjectHideFlags: 0 @@ -17545,6 +17922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17569,6 +17947,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1951027920 MeshFilter: m_ObjectHideFlags: 0 @@ -17624,6 +18003,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17648,6 +18028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1952346156 MeshFilter: m_ObjectHideFlags: 0 @@ -17703,6 +18084,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17727,6 +18109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1972269529 MeshFilter: m_ObjectHideFlags: 0 @@ -17782,6 +18165,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17806,6 +18190,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1973997287 MeshFilter: m_ObjectHideFlags: 0 @@ -17858,7 +18243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -17881,6 +18266,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -17891,6 +18277,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -17898,6 +18289,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -17905,10 +18299,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -17925,9 +18318,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -17944,6 +18341,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2000975652 Light: m_ObjectHideFlags: 0 @@ -18003,6 +18403,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 &2000975653 @@ -18052,6 +18453,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18076,6 +18478,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2004796537 MeshFilter: m_ObjectHideFlags: 0 @@ -18131,6 +18534,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18155,6 +18559,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2007878966 MeshFilter: m_ObjectHideFlags: 0 @@ -18210,6 +18615,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18234,6 +18640,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2009971746 MeshFilter: m_ObjectHideFlags: 0 @@ -18289,6 +18696,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18313,6 +18721,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2012882290 MeshFilter: m_ObjectHideFlags: 0 @@ -18368,6 +18777,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18392,6 +18802,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2041816170 MeshFilter: m_ObjectHideFlags: 0 @@ -18447,6 +18858,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18471,6 +18883,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2055222863 MeshFilter: m_ObjectHideFlags: 0 @@ -18526,6 +18939,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18550,6 +18964,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2057234449 MeshFilter: m_ObjectHideFlags: 0 @@ -18616,7 +19031,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -18639,6 +19054,7 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -18649,6 +19065,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -18656,6 +19077,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -18663,10 +19087,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -18683,9 +19106,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -18702,6 +19129,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &2063225983 Light: m_ObjectHideFlags: 0 @@ -18761,6 +19191,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2073048139 @@ -18796,6 +19227,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18820,6 +19252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2073048141 MeshFilter: m_ObjectHideFlags: 0 @@ -18875,6 +19308,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18899,6 +19333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079882538 MeshFilter: m_ObjectHideFlags: 0 @@ -18954,6 +19389,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18978,6 +19414,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099243441 MeshFilter: m_ObjectHideFlags: 0 @@ -19033,6 +19470,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19057,6 +19495,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2099775709 MeshFilter: m_ObjectHideFlags: 0 @@ -19126,6 +19565,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19150,6 +19590,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2103916467 MeshFilter: m_ObjectHideFlags: 0 @@ -19205,6 +19646,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19229,6 +19671,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2111003287 MeshFilter: m_ObjectHideFlags: 0 @@ -19270,6 +19713,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19294,6 +19738,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2121451157 MeshFilter: m_ObjectHideFlags: 0 @@ -19349,6 +19794,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19373,6 +19819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2133598721 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity index 5747be64a64..60e90f83425 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9604_MeshRendererBatching-On.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8dcf44329359b844c8aa48f80ab59bbb, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +171,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -192,6 +196,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1710004 MeshFilter: m_ObjectHideFlags: 0 @@ -247,6 +252,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -271,6 +277,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &18051140 MeshFilter: m_ObjectHideFlags: 0 @@ -326,6 +333,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -350,6 +358,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &27279487 MeshFilter: m_ObjectHideFlags: 0 @@ -390,9 +399,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 516f572551099b046abfe364a6456bb0, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1907606003} - m_SkySettingsFromProfile: {fileID: 114193648145939074, guid: 516f572551099b046abfe364a6456bb0, - type: 2} --- !u!114 &63803591 MonoBehaviour: m_ObjectHideFlags: 0 @@ -471,6 +477,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -495,6 +502,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &65574162 MeshFilter: m_ObjectHideFlags: 0 @@ -550,6 +558,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -574,6 +583,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &77199700 MeshFilter: m_ObjectHideFlags: 0 @@ -629,6 +639,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -653,6 +664,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &115102200 MeshFilter: m_ObjectHideFlags: 0 @@ -708,6 +720,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -732,6 +745,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &118990961 MeshFilter: m_ObjectHideFlags: 0 @@ -787,6 +801,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -811,6 +826,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &119543197 MeshFilter: m_ObjectHideFlags: 0 @@ -866,6 +882,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -890,6 +907,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &121141773 MeshFilter: m_ObjectHideFlags: 0 @@ -945,6 +963,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -969,6 +988,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &144936673 MeshFilter: m_ObjectHideFlags: 0 @@ -1021,7 +1041,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1044,6 +1064,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -1054,6 +1075,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1061,6 +1087,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1068,10 +1097,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1088,9 +1116,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1107,6 +1139,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &154133178 Light: m_ObjectHideFlags: 0 @@ -1166,6 +1201,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!1 &158924534 @@ -1215,6 +1251,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1239,6 +1276,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &158924537 MeshFilter: m_ObjectHideFlags: 0 @@ -1294,6 +1332,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1318,6 +1357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &172004985 MeshFilter: m_ObjectHideFlags: 0 @@ -1373,6 +1413,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1397,6 +1438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &193875014 MeshFilter: m_ObjectHideFlags: 0 @@ -1452,6 +1494,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1476,6 +1519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &197171319 MeshFilter: m_ObjectHideFlags: 0 @@ -1531,6 +1575,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1555,6 +1600,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &206141925 MeshFilter: m_ObjectHideFlags: 0 @@ -1610,6 +1656,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1634,6 +1681,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &207934261 MeshFilter: m_ObjectHideFlags: 0 @@ -1686,7 +1734,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -1709,6 +1757,7 @@ MonoBehaviour: m_ShapeHeight: 18.922283 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -1719,6 +1768,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -1726,6 +1780,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -1733,10 +1790,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -1753,9 +1809,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1772,6 +1832,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &208533895 Light: m_ObjectHideFlags: 0 @@ -1831,6 +1894,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 6.068968, w: 11.673059} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &216458700 @@ -1916,6 +1980,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1940,6 +2005,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &230260784 MeshFilter: m_ObjectHideFlags: 0 @@ -1995,6 +2061,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2019,6 +2086,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &239392583 MeshFilter: m_ObjectHideFlags: 0 @@ -2074,6 +2142,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2098,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &259433369 MeshFilter: m_ObjectHideFlags: 0 @@ -2153,6 +2223,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2177,6 +2248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &270927042 MeshFilter: m_ObjectHideFlags: 0 @@ -2232,6 +2304,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2256,6 +2329,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &276492018 MeshFilter: m_ObjectHideFlags: 0 @@ -2311,6 +2385,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2335,6 +2410,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &279874603 MeshFilter: m_ObjectHideFlags: 0 @@ -2390,6 +2466,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2414,6 +2491,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &286864260 MeshFilter: m_ObjectHideFlags: 0 @@ -2469,6 +2547,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2493,6 +2572,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &290550682 MeshFilter: m_ObjectHideFlags: 0 @@ -2548,6 +2628,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2572,6 +2653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &296839945 MeshFilter: m_ObjectHideFlags: 0 @@ -2627,6 +2709,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2651,6 +2734,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303394831 MeshFilter: m_ObjectHideFlags: 0 @@ -2706,6 +2790,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2730,6 +2815,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &303878567 MeshFilter: m_ObjectHideFlags: 0 @@ -2785,6 +2871,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2809,6 +2896,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &311038003 MeshFilter: m_ObjectHideFlags: 0 @@ -2864,6 +2952,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2888,6 +2977,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &326053888 MeshFilter: m_ObjectHideFlags: 0 @@ -2903,16 +2993,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (2) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Cone Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -2983,46 +3103,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Cone Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (2) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &328796436 @@ -3072,6 +3162,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3096,6 +3187,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &328796439 MeshFilter: m_ObjectHideFlags: 0 @@ -3151,6 +3243,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3175,6 +3268,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &341756822 MeshFilter: m_ObjectHideFlags: 0 @@ -3230,6 +3324,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3254,6 +3349,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &350374762 MeshFilter: m_ObjectHideFlags: 0 @@ -3309,6 +3405,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3333,6 +3430,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &360110942 MeshFilter: m_ObjectHideFlags: 0 @@ -3388,6 +3486,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3412,6 +3511,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &372328438 MeshFilter: m_ObjectHideFlags: 0 @@ -3467,6 +3567,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3491,6 +3592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &395776440 MeshFilter: m_ObjectHideFlags: 0 @@ -3546,6 +3648,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3570,6 +3673,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &402203564 MeshFilter: m_ObjectHideFlags: 0 @@ -3625,6 +3729,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3649,6 +3754,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &403989726 MeshFilter: m_ObjectHideFlags: 0 @@ -3704,6 +3810,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3728,6 +3835,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &413571831 MeshFilter: m_ObjectHideFlags: 0 @@ -3783,6 +3891,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3807,6 +3916,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &414367076 MeshFilter: m_ObjectHideFlags: 0 @@ -3859,7 +3969,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3882,6 +3992,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -3892,6 +4003,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -3899,6 +4015,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3906,10 +4025,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -3926,9 +4044,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3945,6 +4067,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &426295405 Light: m_ObjectHideFlags: 0 @@ -4004,6 +4129,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 7.179337} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &430017949 @@ -4035,9 +4161,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &430017951 MeshRenderer: @@ -4054,6 +4180,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4078,6 +4205,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &430017952 MeshFilter: m_ObjectHideFlags: 0 @@ -4147,6 +4275,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4171,6 +4300,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437055873 MeshFilter: m_ObjectHideFlags: 0 @@ -4226,6 +4356,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4250,6 +4381,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &437361371 MeshFilter: m_ObjectHideFlags: 0 @@ -4305,6 +4437,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4329,6 +4462,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &444731604 MeshFilter: m_ObjectHideFlags: 0 @@ -4384,6 +4518,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4408,6 +4543,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &447696771 MeshFilter: m_ObjectHideFlags: 0 @@ -4460,7 +4596,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -4483,6 +4619,7 @@ MonoBehaviour: m_ShapeHeight: 0.37620074 m_AspectRatio: 1.1498998 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -4493,6 +4630,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -4500,6 +4642,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -4507,10 +4652,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -4527,9 +4671,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 2.83 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4546,6 +4694,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &461319428 Light: m_ObjectHideFlags: 0 @@ -4605,6 +4756,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 3.8482158} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &469890627 @@ -4654,6 +4806,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4678,6 +4831,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &469890630 MeshFilter: m_ObjectHideFlags: 0 @@ -4733,6 +4887,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4757,6 +4912,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &505552224 MeshFilter: m_ObjectHideFlags: 0 @@ -4812,6 +4968,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4836,6 +4993,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &531559732 MeshFilter: m_ObjectHideFlags: 0 @@ -4891,6 +5049,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4915,6 +5074,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &557952777 MeshFilter: m_ObjectHideFlags: 0 @@ -4970,6 +5130,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4994,6 +5155,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559229149 MeshFilter: m_ObjectHideFlags: 0 @@ -5049,6 +5211,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5073,6 +5236,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &559689558 MeshFilter: m_ObjectHideFlags: 0 @@ -5128,6 +5292,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5152,6 +5317,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &572130308 MeshFilter: m_ObjectHideFlags: 0 @@ -5207,6 +5373,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5231,6 +5398,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &578472782 MeshFilter: m_ObjectHideFlags: 0 @@ -5286,6 +5454,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5310,6 +5479,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &588295910 MeshFilter: m_ObjectHideFlags: 0 @@ -5365,6 +5535,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5389,6 +5560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &602930598 MeshFilter: m_ObjectHideFlags: 0 @@ -5444,6 +5616,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5468,6 +5641,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &607221212 MeshFilter: m_ObjectHideFlags: 0 @@ -5523,6 +5697,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5547,6 +5722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &628528525 MeshFilter: m_ObjectHideFlags: 0 @@ -5602,6 +5778,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5626,6 +5803,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &637490629 MeshFilter: m_ObjectHideFlags: 0 @@ -5681,6 +5859,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5705,6 +5884,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &640826958 MeshFilter: m_ObjectHideFlags: 0 @@ -5760,6 +5940,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5784,6 +5965,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &642911914 MeshFilter: m_ObjectHideFlags: 0 @@ -5839,6 +6021,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5863,6 +6046,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &643134898 MeshFilter: m_ObjectHideFlags: 0 @@ -5918,6 +6102,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5942,6 +6127,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &645820563 MeshFilter: m_ObjectHideFlags: 0 @@ -5997,6 +6183,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6021,6 +6208,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &647684059 MeshFilter: m_ObjectHideFlags: 0 @@ -6076,6 +6264,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6100,6 +6289,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &648188782 MeshFilter: m_ObjectHideFlags: 0 @@ -6155,6 +6345,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6179,6 +6370,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &649749382 MeshFilter: m_ObjectHideFlags: 0 @@ -6234,6 +6426,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6258,6 +6451,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &668693072 MeshFilter: m_ObjectHideFlags: 0 @@ -6313,6 +6507,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6337,6 +6532,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &669754239 MeshFilter: m_ObjectHideFlags: 0 @@ -6392,6 +6588,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6416,6 +6613,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &671857626 MeshFilter: m_ObjectHideFlags: 0 @@ -6471,6 +6669,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6495,6 +6694,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &682974520 MeshFilter: m_ObjectHideFlags: 0 @@ -6550,6 +6750,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6574,6 +6775,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &697148330 MeshFilter: m_ObjectHideFlags: 0 @@ -6629,6 +6831,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6653,6 +6856,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &712399915 MeshFilter: m_ObjectHideFlags: 0 @@ -6708,6 +6912,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6732,6 +6937,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &719811194 MeshFilter: m_ObjectHideFlags: 0 @@ -6787,6 +6993,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6811,6 +7018,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &744018712 MeshFilter: m_ObjectHideFlags: 0 @@ -6866,6 +7074,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6890,6 +7099,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &758209044 MeshFilter: m_ObjectHideFlags: 0 @@ -6942,7 +7152,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -6965,6 +7175,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 m_MaxSmoothness: 0.99 @@ -6975,6 +7186,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -6982,6 +7198,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -6989,10 +7208,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -7009,9 +7227,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 1.87 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7028,6 +7250,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 8 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &762691883 Light: m_ObjectHideFlags: 0 @@ -7087,6 +7312,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!1 &777871935 @@ -7372,6 +7598,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7396,6 +7623,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &779875687 MeshFilter: m_ObjectHideFlags: 0 @@ -7451,6 +7679,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7475,6 +7704,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &781345256 MeshFilter: m_ObjectHideFlags: 0 @@ -7530,6 +7760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7554,6 +7785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &789731996 MeshFilter: m_ObjectHideFlags: 0 @@ -7609,6 +7841,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7633,6 +7866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &809657012 MeshFilter: m_ObjectHideFlags: 0 @@ -7688,6 +7922,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7712,6 +7947,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &813923243 MeshFilter: m_ObjectHideFlags: 0 @@ -7767,6 +8003,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7791,6 +8028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &820566438 MeshFilter: m_ObjectHideFlags: 0 @@ -7846,6 +8084,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7870,6 +8109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825050274 MeshFilter: m_ObjectHideFlags: 0 @@ -7925,6 +8165,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7949,6 +8190,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &825718158 MeshFilter: m_ObjectHideFlags: 0 @@ -8004,6 +8246,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8028,6 +8271,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &842571686 MeshFilter: m_ObjectHideFlags: 0 @@ -8083,6 +8327,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8107,6 +8352,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &853547569 MeshFilter: m_ObjectHideFlags: 0 @@ -8162,6 +8408,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8186,6 +8433,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &869079679 MeshFilter: m_ObjectHideFlags: 0 @@ -8241,6 +8489,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8265,6 +8514,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &875492872 MeshFilter: m_ObjectHideFlags: 0 @@ -8320,6 +8570,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8344,6 +8595,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &886690332 MeshFilter: m_ObjectHideFlags: 0 @@ -8399,6 +8651,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8423,6 +8676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &888245113 MeshFilter: m_ObjectHideFlags: 0 @@ -8478,6 +8732,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8502,6 +8757,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &891847955 MeshFilter: m_ObjectHideFlags: 0 @@ -8557,6 +8813,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8581,6 +8838,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &901521603 MeshFilter: m_ObjectHideFlags: 0 @@ -8636,6 +8894,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8660,6 +8919,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &904353995 MeshFilter: m_ObjectHideFlags: 0 @@ -8675,16 +8935,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (1) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Spot Box Shape + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -8755,46 +9045,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Box Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (1) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &921921080 @@ -8844,6 +9104,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8868,6 +9129,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &921921083 MeshFilter: m_ObjectHideFlags: 0 @@ -8923,6 +9185,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8947,6 +9210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &930171902 MeshFilter: m_ObjectHideFlags: 0 @@ -9002,6 +9266,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9026,6 +9291,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &953810097 MeshFilter: m_ObjectHideFlags: 0 @@ -9063,9 +9329,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &960424436 MeshRenderer: @@ -9082,6 +9348,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9106,6 +9373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &960424437 MeshFilter: m_ObjectHideFlags: 0 @@ -9175,6 +9443,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9199,6 +9468,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &965748961 MeshFilter: m_ObjectHideFlags: 0 @@ -9254,6 +9524,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9278,6 +9549,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &980798177 MeshFilter: m_ObjectHideFlags: 0 @@ -9333,6 +9605,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9357,6 +9630,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &981646854 MeshFilter: m_ObjectHideFlags: 0 @@ -9412,6 +9686,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9436,6 +9711,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &991737266 MeshFilter: m_ObjectHideFlags: 0 @@ -9491,6 +9767,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9515,6 +9792,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1001326874 MeshFilter: m_ObjectHideFlags: 0 @@ -9570,6 +9848,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9594,6 +9873,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1012989238 MeshFilter: m_ObjectHideFlags: 0 @@ -9649,6 +9929,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9673,6 +9954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1031276030 MeshFilter: m_ObjectHideFlags: 0 @@ -9728,6 +10010,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9752,6 +10035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1038229444 MeshFilter: m_ObjectHideFlags: 0 @@ -9807,6 +10091,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9831,6 +10116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1040771379 MeshFilter: m_ObjectHideFlags: 0 @@ -9886,6 +10172,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9910,6 +10197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1043930410 MeshFilter: m_ObjectHideFlags: 0 @@ -9965,6 +10253,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9989,6 +10278,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1046327772 MeshFilter: m_ObjectHideFlags: 0 @@ -10044,6 +10334,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10068,6 +10359,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1057088725 MeshFilter: m_ObjectHideFlags: 0 @@ -10123,6 +10415,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10147,6 +10440,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1061504061 MeshFilter: m_ObjectHideFlags: 0 @@ -10202,6 +10496,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10226,6 +10521,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1080468800 MeshFilter: m_ObjectHideFlags: 0 @@ -10281,6 +10577,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10305,6 +10602,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1096914707 MeshFilter: m_ObjectHideFlags: 0 @@ -10360,6 +10658,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10384,6 +10683,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1108541228 MeshFilter: m_ObjectHideFlags: 0 @@ -10439,6 +10739,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10463,6 +10764,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1123246062 MeshFilter: m_ObjectHideFlags: 0 @@ -10518,6 +10820,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10542,6 +10845,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1127700270 MeshFilter: m_ObjectHideFlags: 0 @@ -10597,6 +10901,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10621,6 +10926,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1166530868 MeshFilter: m_ObjectHideFlags: 0 @@ -10676,6 +10982,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10700,6 +11007,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1167094695 MeshFilter: m_ObjectHideFlags: 0 @@ -10755,6 +11063,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10779,6 +11088,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1168327892 MeshFilter: m_ObjectHideFlags: 0 @@ -10834,6 +11144,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10858,6 +11169,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1183782476 MeshFilter: m_ObjectHideFlags: 0 @@ -10913,6 +11225,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10937,6 +11250,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1184022654 MeshFilter: m_ObjectHideFlags: 0 @@ -10992,6 +11306,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11016,6 +11331,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1185794389 MeshFilter: m_ObjectHideFlags: 0 @@ -11071,6 +11387,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11095,6 +11412,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1204878890 MeshFilter: m_ObjectHideFlags: 0 @@ -11150,6 +11468,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11174,6 +11493,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1213431291 MeshFilter: m_ObjectHideFlags: 0 @@ -11229,6 +11549,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11253,6 +11574,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1215106502 MeshFilter: m_ObjectHideFlags: 0 @@ -11308,6 +11630,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11332,6 +11655,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1220612084 MeshFilter: m_ObjectHideFlags: 0 @@ -11387,6 +11711,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11411,6 +11736,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1221260582 MeshFilter: m_ObjectHideFlags: 0 @@ -11466,6 +11792,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11490,6 +11817,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1231156226 MeshFilter: m_ObjectHideFlags: 0 @@ -11545,6 +11873,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11569,6 +11898,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1234711635 MeshFilter: m_ObjectHideFlags: 0 @@ -11624,6 +11954,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11648,6 +11979,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236035745 MeshFilter: m_ObjectHideFlags: 0 @@ -11703,6 +12035,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11727,6 +12060,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1239462281 MeshFilter: m_ObjectHideFlags: 0 @@ -11782,6 +12116,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11806,6 +12141,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1257610671 MeshFilter: m_ObjectHideFlags: 0 @@ -11861,6 +12197,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11885,6 +12222,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1266980223 MeshFilter: m_ObjectHideFlags: 0 @@ -11940,6 +12278,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11964,6 +12303,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1282175057 MeshFilter: m_ObjectHideFlags: 0 @@ -12019,6 +12359,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12043,6 +12384,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1285940584 MeshFilter: m_ObjectHideFlags: 0 @@ -12098,6 +12440,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12122,6 +12465,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1293709081 MeshFilter: m_ObjectHideFlags: 0 @@ -12177,6 +12521,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12201,6 +12546,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1296742209 MeshFilter: m_ObjectHideFlags: 0 @@ -12274,6 +12620,21 @@ PrefabInstance: propertyPath: far clip plane value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: clearColorMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: doBeforeTest.m_PersistentCalls.m_Calls.Array.size @@ -12335,21 +12696,11 @@ PrefabInstance: propertyPath: xrLayout value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: clearColorMode + propertyPath: renderGraphCompatible value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1314322408 @@ -12399,6 +12750,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12423,6 +12775,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1314322411 MeshFilter: m_ObjectHideFlags: 0 @@ -12478,6 +12831,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12502,6 +12856,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1322864851 MeshFilter: m_ObjectHideFlags: 0 @@ -12557,6 +12912,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12581,6 +12937,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1325976481 MeshFilter: m_ObjectHideFlags: 0 @@ -12636,6 +12993,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12660,6 +13018,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1339361874 MeshFilter: m_ObjectHideFlags: 0 @@ -12715,6 +13074,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12739,6 +13099,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1344659076 MeshFilter: m_ObjectHideFlags: 0 @@ -12794,6 +13155,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12818,6 +13180,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1353796882 MeshFilter: m_ObjectHideFlags: 0 @@ -12873,6 +13236,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12897,6 +13261,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1355408080 MeshFilter: m_ObjectHideFlags: 0 @@ -12952,6 +13317,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12976,6 +13342,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1359668098 MeshFilter: m_ObjectHideFlags: 0 @@ -13031,6 +13398,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13055,6 +13423,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1361440978 MeshFilter: m_ObjectHideFlags: 0 @@ -13110,6 +13479,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13134,6 +13504,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1363775923 MeshFilter: m_ObjectHideFlags: 0 @@ -13189,6 +13560,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13213,6 +13585,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1378795295 MeshFilter: m_ObjectHideFlags: 0 @@ -13268,6 +13641,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13292,6 +13666,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1379653303 MeshFilter: m_ObjectHideFlags: 0 @@ -13344,7 +13719,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 8 + m_Version: 11 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -13367,6 +13742,7 @@ MonoBehaviour: m_ShapeHeight: 0.5 m_AspectRatio: 1 m_ShapeRadius: 0 + m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 2.7 m_MaxSmoothness: 0.99 @@ -13377,6 +13753,11 @@ MonoBehaviour: m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 @@ -13384,6 +13765,9 @@ MonoBehaviour: m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -13391,10 +13775,9 @@ MonoBehaviour: m_LightlayersMask: 1 m_LinkShadowLayers: 1 m_ShadowNearPlane: 0.1 - m_ShadowSoftness: 0.5 m_BlockerSampleCount: 24 m_FilterSampleCount: 16 - m_MinFilterSize: 0.00001 + m_MinFilterSize: 0.01 m_KernelSize: 5 m_LightAngle: 1 m_MaxDepthBias: 0.001 @@ -13411,9 +13794,13 @@ MonoBehaviour: m_Level: 0 m_RayTracedContactShadow: 0 m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13430,6 +13817,9 @@ MonoBehaviour: useVolumetric: 1 featuresFoldout: 1 showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1386862605 Light: m_ObjectHideFlags: 0 @@ -13489,6 +13879,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!1 &1388287949 @@ -13538,6 +13929,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13562,6 +13954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1388287952 MeshFilter: m_ObjectHideFlags: 0 @@ -13617,6 +14010,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13641,6 +14035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1389526138 MeshFilter: m_ObjectHideFlags: 0 @@ -13696,6 +14091,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13720,6 +14116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1422354403 MeshFilter: m_ObjectHideFlags: 0 @@ -13775,6 +14172,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13799,6 +14197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1428342881 MeshFilter: m_ObjectHideFlags: 0 @@ -13814,16 +14213,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (4) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Point Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -13894,46 +14323,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Point Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (4) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1460143124 @@ -13983,6 +14382,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14007,6 +14407,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1460143127 MeshFilter: m_ObjectHideFlags: 0 @@ -14062,6 +14463,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14086,6 +14488,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1463956016 MeshFilter: m_ObjectHideFlags: 0 @@ -14141,6 +14544,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14165,6 +14569,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1482492333 MeshFilter: m_ObjectHideFlags: 0 @@ -14220,6 +14625,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14244,6 +14650,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1493613822 MeshFilter: m_ObjectHideFlags: 0 @@ -14299,6 +14706,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14323,6 +14731,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1511303639 MeshFilter: m_ObjectHideFlags: 0 @@ -14378,6 +14787,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14402,6 +14812,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1521266381 MeshFilter: m_ObjectHideFlags: 0 @@ -14457,6 +14868,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14481,6 +14893,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1528394421 MeshFilter: m_ObjectHideFlags: 0 @@ -14536,6 +14949,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14560,6 +14974,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1531121810 MeshFilter: m_ObjectHideFlags: 0 @@ -14615,6 +15030,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14639,6 +15055,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1566466870 MeshFilter: m_ObjectHideFlags: 0 @@ -14694,6 +15111,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14718,6 +15136,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1577879441 MeshFilter: m_ObjectHideFlags: 0 @@ -14773,6 +15192,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14797,6 +15217,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1587290154 MeshFilter: m_ObjectHideFlags: 0 @@ -14852,6 +15273,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14876,6 +15298,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1591162017 MeshFilter: m_ObjectHideFlags: 0 @@ -14891,16 +15314,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: 'Batching(ON) test with 4 materials + + and 4 meshes checking shadow + behavior + + with different light type shadows' + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -14971,6 +15429,30 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 8.535574 objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Name + value: Text + objectReference: {fileID: 0} + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} +--- !u!1001 &1606173312 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_CharacterSize @@ -14979,12 +15461,7 @@ PrefabInstance: - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text - value: 'Batching(ON) test with 4 materials - - and 4 meshes checking shadow - behavior - - with different light type shadows' + value: Spot Pyramid Shape objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -15011,30 +15488,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} ---- !u!1001 &1606173312 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Name - value: Text (3) - objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -15105,46 +15558,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Spot Pyramid Shape - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (3) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &1621115680 @@ -15194,6 +15617,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15218,6 +15642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1621115683 MeshFilter: m_ObjectHideFlags: 0 @@ -15273,6 +15698,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15297,6 +15723,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1681693788 MeshFilter: m_ObjectHideFlags: 0 @@ -15352,6 +15779,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15376,6 +15804,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1687574455 MeshFilter: m_ObjectHideFlags: 0 @@ -15431,6 +15860,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15455,6 +15885,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1689229584 MeshFilter: m_ObjectHideFlags: 0 @@ -15510,6 +15941,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15534,6 +15966,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1696616959 MeshFilter: m_ObjectHideFlags: 0 @@ -15589,6 +16022,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15613,6 +16047,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705199462 MeshFilter: m_ObjectHideFlags: 0 @@ -15668,6 +16103,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15692,6 +16128,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1705921691 MeshFilter: m_ObjectHideFlags: 0 @@ -15747,6 +16184,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15771,6 +16209,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723596831 MeshFilter: m_ObjectHideFlags: 0 @@ -15826,6 +16265,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15850,6 +16290,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1726899976 MeshFilter: m_ObjectHideFlags: 0 @@ -15905,6 +16346,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15929,6 +16371,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1750460725 MeshFilter: m_ObjectHideFlags: 0 @@ -15966,9 +16409,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1771681643 MeshRenderer: @@ -15985,6 +16428,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16009,6 +16453,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1771681644 MeshFilter: m_ObjectHideFlags: 0 @@ -16078,6 +16523,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16102,6 +16548,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1777647186 MeshFilter: m_ObjectHideFlags: 0 @@ -16157,6 +16604,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16181,6 +16629,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1789371758 MeshFilter: m_ObjectHideFlags: 0 @@ -16236,6 +16685,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16260,6 +16710,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1791411182 MeshFilter: m_ObjectHideFlags: 0 @@ -16315,6 +16766,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16339,6 +16791,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1839709220 MeshFilter: m_ObjectHideFlags: 0 @@ -16394,6 +16847,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16418,6 +16872,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1841428342 MeshFilter: m_ObjectHideFlags: 0 @@ -16473,6 +16928,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16497,6 +16953,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1848109756 MeshFilter: m_ObjectHideFlags: 0 @@ -16534,9 +16991,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1856875282 MeshRenderer: @@ -16553,6 +17010,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16577,6 +17035,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1856875283 MeshFilter: m_ObjectHideFlags: 0 @@ -16646,6 +17105,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16670,6 +17130,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1866992478 MeshFilter: m_ObjectHideFlags: 0 @@ -16725,6 +17186,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16749,6 +17211,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1867244841 MeshFilter: m_ObjectHideFlags: 0 @@ -16804,6 +17267,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16828,6 +17292,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1877582089 MeshFilter: m_ObjectHideFlags: 0 @@ -16883,6 +17348,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16907,6 +17373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1885217152 MeshFilter: m_ObjectHideFlags: 0 @@ -16962,6 +17429,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -16986,6 +17454,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1887731496 MeshFilter: m_ObjectHideFlags: 0 @@ -17041,6 +17510,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17065,6 +17535,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1895596062 MeshFilter: m_ObjectHideFlags: 0 @@ -17120,6 +17591,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17144,6 +17616,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1901667384 MeshFilter: m_ObjectHideFlags: 0 @@ -17152,82 +17625,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901667381} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1907606003 -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: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &1926583767 GameObject: m_ObjectHideFlags: 0 @@ -17275,6 +17672,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17299,6 +17697,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1926583770 MeshFilter: m_ObjectHideFlags: 0 @@ -17354,6 +17753,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17378,6 +17778,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1928970123 MeshFilter: m_ObjectHideFlags: 0 @@ -17433,6 +17834,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17457,6 +17859,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1957957041 MeshFilter: m_ObjectHideFlags: 0 @@ -17512,6 +17915,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17536,6 +17940,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1970018806 MeshFilter: m_ObjectHideFlags: 0 @@ -17591,6 +17996,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17615,6 +18021,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1974510906 MeshFilter: m_ObjectHideFlags: 0 @@ -17670,6 +18077,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17694,6 +18102,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1981351887 MeshFilter: m_ObjectHideFlags: 0 @@ -17749,6 +18158,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17773,6 +18183,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2006189128 MeshFilter: m_ObjectHideFlags: 0 @@ -17828,6 +18239,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17852,6 +18264,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2019026764 MeshFilter: m_ObjectHideFlags: 0 @@ -17907,6 +18320,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -17931,6 +18345,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2027312071 MeshFilter: m_ObjectHideFlags: 0 @@ -17986,6 +18401,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18010,6 +18426,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2036693317 MeshFilter: m_ObjectHideFlags: 0 @@ -18065,6 +18482,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18089,6 +18507,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2037183620 MeshFilter: m_ObjectHideFlags: 0 @@ -18144,6 +18563,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18168,6 +18588,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2038469265 MeshFilter: m_ObjectHideFlags: 0 @@ -18223,6 +18644,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18247,6 +18669,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2039296765 MeshFilter: m_ObjectHideFlags: 0 @@ -18302,6 +18725,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18326,6 +18750,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2040827661 MeshFilter: m_ObjectHideFlags: 0 @@ -18341,16 +18766,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Name - value: Text (5) + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 0.07 objectReference: {fileID: 0} - - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_IsActive + propertyPath: m_Text + value: Rectangle Light + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Anchor + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: testSettings + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: targetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -18421,46 +18876,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 5.4803042 objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: Rectangle Light - objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Anchor - value: 4 + propertyPath: m_Name + value: Text (5) objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_Alignment + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: testSettings - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: targetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 2366749451762349873, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128708243605517320, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 306d620c715872046bf76568b7f382d4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} --- !u!1 &2064361793 @@ -18510,6 +18935,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18534,6 +18960,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2064361796 MeshFilter: m_ObjectHideFlags: 0 @@ -18589,6 +19016,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18613,6 +19041,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2070414141 MeshFilter: m_ObjectHideFlags: 0 @@ -18668,6 +19097,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18692,6 +19122,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079107238 MeshFilter: m_ObjectHideFlags: 0 @@ -18747,6 +19178,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18771,6 +19203,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2084708072 MeshFilter: m_ObjectHideFlags: 0 @@ -18826,6 +19259,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18850,6 +19284,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2090701780 MeshFilter: m_ObjectHideFlags: 0 @@ -18905,6 +19340,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -18929,6 +19365,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2096080274 MeshFilter: m_ObjectHideFlags: 0 @@ -18984,6 +19421,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19008,6 +19446,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2097382540 MeshFilter: m_ObjectHideFlags: 0 @@ -19045,9 +19484,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &2106720174 MeshRenderer: @@ -19064,6 +19503,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19088,6 +19528,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2106720175 MeshFilter: m_ObjectHideFlags: 0 @@ -19157,6 +19598,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19181,6 +19623,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2119204914 MeshFilter: m_ObjectHideFlags: 0 @@ -19236,6 +19679,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19260,6 +19704,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2127647011 MeshFilter: m_ObjectHideFlags: 0 @@ -19315,6 +19760,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -19339,6 +19785,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2136776845 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity index 0821d36bd72..d8a50c2b3a5 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen.unity @@ -318,6 +318,11 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity index 6f16b5df781..054b0799b05 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers.unity @@ -323,6 +323,11 @@ PrefabInstance: propertyPath: checkMemoryAllocation value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &65093930 stripped @@ -461,6 +466,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -479,6 +485,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &85208911 Light: m_ObjectHideFlags: 0 @@ -1107,8 +1114,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 8192 @@ -1399,8 +1404,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 10 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 1024 @@ -1543,8 +1546,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 4096 @@ -2809,6 +2810,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2827,6 +2829,7 @@ MonoBehaviour: showAdditionalSettings: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!108 &1302253251 Light: m_ObjectHideFlags: 0 @@ -3575,8 +3578,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 5 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 2048 @@ -4080,8 +4081,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 1 @@ -4158,8 +4157,6 @@ MonoBehaviour: filterFoldout: 1 rendererFoldout: 1 renderQueueType: 2 - passNames: - - Forward layerMask: serializedVersion: 2 m_Bits: 16384 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity index ad80798f82b..e18c7c2ef15 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9800_Compositor.unity @@ -124,41 +124,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!84 &8062103 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 640 - m_Height: 360 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &112555164 GameObject: m_ObjectHideFlags: 0 @@ -254,6 +219,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!84 &180892602 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &236318923 GameObject: m_ObjectHideFlags: 0 @@ -333,8 +334,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &341057513 Transform: m_ObjectHideFlags: 1 @@ -378,7 +377,7 @@ LightingSettings: m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -431,19 +430,19 @@ Material: serializedVersion: 3 m_TexEnvs: - GreenScreen: - m_Texture: {fileID: 1847047563} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Layer0: - m_Texture: {fileID: 707328070} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Layer1: - m_Texture: {fileID: 1416341668} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Logo: - m_Texture: {fileID: 8062103} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: [] @@ -626,41 +625,6 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: b6e11bd621edeeb43a64506cf2cac8c5, type: 2} ---- !u!84 &707328070 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 640 - m_Height: 360 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &775050991 GameObject: m_ObjectHideFlags: 0 @@ -709,6 +673,78 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: f702b32cef038544a92000621a19b27f, type: 2} +--- !u!84 &1140031896 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 +--- !u!84 &1186312954 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 960 + m_Height: 540 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &1323211074 GameObject: m_ObjectHideFlags: 0 @@ -804,6 +840,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 22.854002, z: 0} +--- !u!84 &1360668987 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 24 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &1378491895 GameObject: m_ObjectHideFlags: 0 @@ -881,6 +953,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 &1378491897 @@ -909,7 +982,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 @@ -990,6 +1063,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1008,41 +1082,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 ---- !u!84 &1416341668 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 320 - m_Height: 180 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 + m_AreaLightEmissiveMeshLayer: -1 --- !u!1 &1827381199 GameObject: m_ObjectHideFlags: 0 @@ -1138,41 +1178,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 22.476002, z: 0} ---- !u!84 &1847047563 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 640 - m_Height: 360 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 24 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1001 &1987531043 PrefabInstance: m_ObjectHideFlags: 0 @@ -1289,6 +1294,11 @@ PrefabInstance: propertyPath: waitFrames value: 5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!20 &1987531044 stripped @@ -1357,7 +1367,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 707328070} + m_RenderTarget: {fileID: 1140031896} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -1485,7 +1495,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 1416341668} + m_RenderTarget: {fileID: 1186312954} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -1549,7 +1559,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 8062103} + m_RenderTarget: {fileID: 180892602} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -1613,7 +1623,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 1847047563} + m_RenderTarget: {fileID: 1360668987} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity index 2464d215047..bc04e6e63c3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9901_AOV_buffers.unity @@ -714,6 +714,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -723,6 +728,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -741,6 +747,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -830,6 +839,8 @@ MonoBehaviour: PerPixelCorrectnessThreshold: 0 AverageCorrectnessThreshold: 0 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 doBeforeTest: m_PersistentCalls: m_Calls: [] @@ -837,6 +848,7 @@ MonoBehaviour: waitFrames: 5 xrCompatible: 1 xrThresholdMultiplier: 1 + renderGraphCompatible: 1 checkMemoryAllocation: 1 renderPipelineAsset: {fileID: 0} --- !u!1 &593565746 @@ -1143,6 +1155,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &764415611 @@ -1171,7 +1184,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: 2048 @@ -1252,6 +1265,7 @@ MonoBehaviour: m_ShadowUpdateMode: 0 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1270,6 +1284,7 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 --- !u!21 &808236715 Material: serializedVersion: 6 @@ -1438,6 +1453,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -1601,6 +1617,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &899885052 GameObject: @@ -1900,6 +1917,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -2063,6 +2081,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &1266377334 GameObject: @@ -2589,6 +2608,11 @@ MonoBehaviour: dithering: 0 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2598,6 +2622,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2616,6 +2641,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2795,6 +2823,11 @@ PrefabInstance: propertyPath: xrCompatible value: 0 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderGraphCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1569434673 @@ -3252,6 +3285,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3415,6 +3449,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2074857581 GameObject: @@ -3620,6 +3655,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -3783,6 +3819,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2085158283 GameObject: @@ -4047,6 +4084,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4210,6 +4248,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!1 &2099876030 GameObject: @@ -4475,6 +4514,7 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -4638,4 +4678,5 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UnlitColor: {r: 1, g: 1, b: 1, a: 1} + - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index 8722df245d9..ade0f6c4643 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -118,6 +118,7 @@ public enum TextureSizeMode Functor } +#if UNITY_2020_2_OR_NEWER /// /// Subset of the texture desc containing information for fast memory allocation (when platform supports it) /// @@ -130,6 +131,7 @@ public struct FastMemoryDesc ///How much of the render target is to be switched into fast memory (between 0 and 1). public float residencyFraction; } +#endif /// /// Descriptor used to create texture resources @@ -182,8 +184,10 @@ public struct TextureDesc public RenderTextureMemoryless memoryless; ///Texture name. public string name; +#if UNITY_2020_2_OR_NEWER ///Descriptor to determine how the texture will be in fast memory on platform that supports it. public FastMemoryDesc fastMemoryDesc; +#endif // Initial state. Those should not be used in the hash ///Texture needs to be cleared on first use. @@ -642,11 +646,13 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, TextureHandle { CreateTextureForPass(ref resource); +#if UNITY_2020_2_OR_NEWER var fastMemDesc = resource.desc.fastMemoryDesc; if(fastMemDesc.inFastMemory) { resource.rt.SwitchToFastMemory(rgContext.cmd, fastMemDesc.residencyFraction, fastMemDesc.flags); } +#endif if (resource.desc.clearBuffer || m_RenderGraphDebug.clearRenderTargetsAtCreation) { @@ -737,6 +743,9 @@ internal void PostRenderPassUnbindGlobalTextures(RenderGraphContext rgContext, L internal void ReleaseTexture(RenderGraphContext rgContext, TextureHandle resource) { ref var resourceDesc = ref GetTextureResource(resource); + if (resourceDesc.rt == null) + throw new InvalidOperationException($"Tried to release a texture ({resourceDesc.desc.name}) that was never created. Check that there is at least one pass writing to it first."); + if (!resourceDesc.imported) { if (m_RenderGraphDebug.clearRenderTargetsAtRelease) diff --git a/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs b/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs index 68dd42878ef..c540dbb85be 100644 --- a/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs +++ b/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs @@ -146,6 +146,7 @@ public Vector2Int GetScaledSize(Vector2Int refSize) } } +#if UNITY_2020_2_OR_NEWER /// /// Switch the render target to fast memory on platform that have it. /// @@ -160,10 +161,8 @@ public void SwitchToFastMemory(CommandBuffer cmd, bool copyContents = false ) { -#if UNITY_2020_2_OR_NEWER residencyFraction = Mathf.Clamp01(residencyFraction); cmd.SwitchIntoFastMemory(m_RT, flags, residencyFraction, copyContents); -#endif } /// @@ -187,9 +186,9 @@ public void CopyToFastMemory(CommandBuffer cmd, /// Whether the content of render target are copied or not when switching out fast memory. public void SwitchOutFastMemory(CommandBuffer cmd, bool copyContents = true) { -#if UNITY_2020_2_OR_NEWER cmd.SwitchOutOfFastMemory(m_RT, copyContents); -#endif } +#endif + } } diff --git a/com.unity.render-pipelines.core/Runtime/Textures/RTHandleSystem.cs b/com.unity.render-pipelines.core/Runtime/Textures/RTHandleSystem.cs index 6977801efaf..bceac713f0d 100644 --- a/com.unity.render-pipelines.core/Runtime/Textures/RTHandleSystem.cs +++ b/com.unity.render-pipelines.core/Runtime/Textures/RTHandleSystem.cs @@ -782,6 +782,23 @@ string name return rth; } + /// + /// Allocate a RTHandle from a regular RenderTexture. + /// + /// Input texture + /// A new RTHandle referencing the input texture. + public RTHandle Alloc(RenderTexture texture) + { + var rth = new RTHandle(this); + rth.SetRenderTexture(texture); + rth.m_EnableMSAA = false; + rth.m_EnableRandomWrite = false; + rth.useScaling = false; + rth.m_EnableHWDynamicScale = false; + rth.m_Name = ""; + return rth; + } + /// /// Allocate a RTHandle from a regular Texture. /// diff --git a/com.unity.render-pipelines.core/Runtime/Textures/RTHandles.cs b/com.unity.render-pipelines.core/Runtime/Textures/RTHandles.cs index eaeb4c2a483..e9d669e3aed 100644 --- a/com.unity.render-pipelines.core/Runtime/Textures/RTHandles.cs +++ b/com.unity.render-pipelines.core/Runtime/Textures/RTHandles.cs @@ -230,6 +230,16 @@ public static RTHandle Alloc(Texture tex) return s_DefaultInstance.Alloc(tex); } + /// + /// Allocate a RTHandle from a regular RenderTexture for the default RTHandle system. + /// + /// Input texture + /// A new RTHandle referencing the input texture. + public static RTHandle Alloc(RenderTexture tex) + { + return s_DefaultInstance.Alloc(tex); + } + /// /// Allocate a RTHandle from a regular render target identifier for the default RTHandle system. /// diff --git a/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs b/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs index 21a5d052928..f08a3d2a206 100644 --- a/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs +++ b/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs @@ -4,14 +4,6 @@ namespace UnityEngine.Rendering.HighDefinition { - [GenerateHLSL(PackingRules.Exact)] - public enum HDShadowFilteringQuality - { - Low = 0, - Medium = 1, - High = 2, - } - [GenerateHLSL(PackingRules.Exact)] public enum ProbeVolumesEvaluationModes { @@ -68,9 +60,6 @@ public enum ShaderOptions AreaLights = 1, - [System.Obsolete("Deferred shadow can now assume any value, so this field is not used anymore.")] - DeferredShadowFiltering = HDShadowFilteringQuality.Medium, - BarnDoor = 0 }; @@ -91,7 +80,5 @@ public class ShaderConfig public static ProbeVolumesEncodingModes s_ProbeVolumesEncodingMode = (ProbeVolumesEncodingModes)ShaderOptions.ProbeVolumesEncodingMode; public static int s_AreaLights = (int)ShaderOptions.AreaLights; public static int s_BarnDoor = (int)ShaderOptions.BarnDoor; - [System.Obsolete("Deferred shadow can now assume any value, so this field is not used anymore.")] - public static HDShadowFilteringQuality s_DeferredShadowFiltering = (HDShadowFilteringQuality)ShaderOptions.DeferredShadowFiltering; } } diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index b8beea7aecc..611bf063ab9 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -148,6 +148,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added support to combine RTSSS and RTGI (1248733). - Added IES Profile support for Point, Spot and Rectangular-Area lights - Added support for multiple mapping modes in AxF. +- Add support of lightlayers on indirect lighting controller +- Added compute shader stripping. ### Fixed - Fix when rescale probe all direction below zero (1219246) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Indirect-Lighting-Controller.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Indirect-Lighting-Controller.md index fe2646f9438..0688b528c12 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Indirect-Lighting-Controller.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Indirect-Lighting-Controller.md @@ -17,10 +17,11 @@ The **Indirect Lighting Controller** uses the [Volume](Volumes.html) framework, | Property | Description | | ------------------------------- | ------------------------------------------------------------ | -| **Indirect Diffuse Intensity** | A multiplier for baked and realtime Global Illumination lightmaps and Light Probes. HDRP multiplies the lightmap and Light Probe data by this value. | -| **Indirect Specular Intensity** | A multiplier for baked, realtime, and custom Reflection Probes. HDRP multiplies the Reflection Probe data by this value. | - - +| **Indirect Diffuse Lighting Multiplier** | A multiplier for lightmaps, Light Probes, Light Probe Volumes, Screen-Space Global Illumination, and [Ray-Traced Global Illumination](Ray-Traced-Global-Illumination.md). HDRP multiplies the light data from all of these by this value. | +| **Indirect Diffuse Lighting Layers** | Specifies the [Light Layers](Light-Layers.md) for indirect diffuse lighting. If you enable Light Layers, you can use them to decouple Meshes in your Scene from the above multiplier. | +| **Reflection Lighting Multiplier** | A multiplier for baked, realtime, custom [Reflection Probes](Reflection-Probe.md) and [Planar Probes](Planar-Reflection-Probe.md), [Screen-Space Reflection](Override-Screen-Space-Reflection.md), [Ray-Traced Reflection](Ray-Traced-Reflections.md), and Sky Reflection. HDRP multiplies the light data from all of these by this value. | +| **Reflection Lighting Layers** | LSpecifies the [Light Layers](Light-Layers.md) for reflection lighting. If you enable Light Layers, you can use them to decouple Meshes in your Scene from the above multiplier. | +| **Reflection Probe Intensity Multiplier** | A multiplier for baked, realtime, and custom [Reflection Probes](Reflection-Probe.md) and [Planar Probes](Planar-Reflection-Probe.md). HDRP multiplies the Reflection Probe data by this value. | ## Details diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md index e4e0480fa28..54f5a4e40be 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md @@ -37,6 +37,11 @@ HDRP now stores OnEnable and OnDemand shadows in a separate atlas and more API i The shader function `SampleShadow_PCSS` now requires you to pass in an additional float2 parameter which contains the shadow atlas resolution in x and the inverse of the atlas resolution in y. +## Shader config file + +From Unity 2020.2, due to the change of shadow map, the enum HDShadowFilteringQuality have been moved to HDShadowManager.cs and the variables ShaderConfig.s_DeferredShadowFiltering as well as the option ShaderOptions.DeferredShadowFiltering have been removed from the code as they have no impact anymore. + + ## Shader code From Unity 2020.2, HDRP uses a new structure to output information from the LightLoop. It now uses a custom LightLoop struct instead of the `float3 diffuseLighting`, `float3 specularLighting` pair. This is to allow HDRP to export more information from the LightLoop in the future without breaking the API. @@ -88,4 +93,4 @@ With: ``` protected override void Execute(CustomPassContext ctx) { ... } -``` \ No newline at end of file +``` diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index fe902196883..846edf391b5 100644 --- a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -19,12 +19,10 @@ public CommonShaderPreprocessor() { } protected override bool DoShadersStripper(HDRenderPipelineAsset hdrpAsset, Shader shader, ShaderSnippetData snippet, ShaderCompilerData inputData) { - // TODO: We need to perform compute shader stripping as soon as it is possible. Most egregious case would be the shadow filtering quality for Deferred.compute - // Strip every useless shadow configs var shadowInitParams = hdrpAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams; - foreach (var shadowVariant in m_ShadowVariants) + foreach (var shadowVariant in m_ShadowKeywords.ShadowVariants) { if (shadowVariant.Key != shadowInitParams.shadowFilteringQuality) if (inputData.shaderKeywordSet.IsEnabled(shadowVariant.Value)) @@ -136,6 +134,181 @@ protected override bool DoShadersStripper(HDRenderPipelineAsset hdrpAsset, Shade } } + class HDRPPreprocessComputeShaders : IPreprocessComputeShaders + { + struct ExportComputeShaderStrip : System.IDisposable + { + bool m_ExportLog; + string m_OutFile; + ComputeShader m_Shader; + string m_KernelName; + IList m_InputData; + HDRPPreprocessComputeShaders m_PreProcess; + + public ExportComputeShaderStrip( + bool exportLog, + string outFile, + ComputeShader shader, + string kernelName, + IList inputData, + HDRPPreprocessComputeShaders preProcess + ) + { + m_ExportLog = exportLog; + m_OutFile = outFile; + m_Shader = shader; + m_KernelName = kernelName; + m_InputData = inputData; + m_PreProcess = preProcess; + + if (m_ExportLog) + { + System.IO.File.AppendAllText( + m_OutFile, + $"{{ \"Compute shader\": \"{m_Shader.name}\", \"kernel\": \"{m_KernelName}\", \"variantIn\": {m_InputData.Count} }}\r\n" + ); + } + } + + public void Dispose() + { + if (m_ExportLog) + { + try + { + System.IO.File.AppendAllText( + m_OutFile, + $"{{ \"shader\": \"{m_Shader?.name}\", \"kernel\": \"{m_KernelName}\", \"variantOut\": \"{m_InputData.Count}\", \"totalVariantIn\": \"{m_PreProcess?.m_TotalVariantsInputCount}\", \"totalVariantOut\": \"{m_PreProcess?.m_TotalVariantsOutputCount}\" }}\r\n" + ); + } + catch (System.Exception e) + { + Debug.LogException(e); + } + } + } + } + + uint m_TotalVariantsInputCount; + uint m_TotalVariantsOutputCount; + + protected ShadowKeywords m_ShadowKeywords = new ShadowKeywords(); + protected ShaderKeyword m_EnableAlpha = new ShaderKeyword("ENABLE_ALPHA"); + protected ShaderKeyword m_MSAA = new ShaderKeyword("ENABLE_MSAA"); + + public int callbackOrder { get { return 0; } } + + void LogShaderVariants(ComputeShader shader, string kernelName, ShaderVariantLogLevel logLevel, uint prevVariantsCount, uint currVariantsCount) + { + // We cannot yet differentiate whether a compute shader is HDRP specific or not. + if (logLevel == ShaderVariantLogLevel.AllShaders || logLevel == ShaderVariantLogLevel.OnlyHDRPShaders) + { + float percentageCurrent = ((float)currVariantsCount / prevVariantsCount) * 100.0f; + float percentageTotal = ((float)m_TotalVariantsOutputCount / m_TotalVariantsInputCount) * 100.0f; + + string result = string.Format("STRIPPING: {0} (kernel: {1}) -" + + " Remaining shader variants = {2}/{3} = {4}% - Total = {5}/{6} = {7}%", + shader.name, kernelName, currVariantsCount, + prevVariantsCount, percentageCurrent, m_TotalVariantsOutputCount, m_TotalVariantsInputCount, + percentageTotal); + Debug.Log(result); + } + } + + // Modify this function to add more stripping clauses + internal bool StripShader(HDRenderPipelineAsset hdAsset, ComputeShader shader, string kernelName, ShaderCompilerData inputData) + { + // Strip every useless shadow configs + var shadowInitParams = hdAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams; + + foreach (var shadowVariant in m_ShadowKeywords.ShadowVariants) + { + if (shadowVariant.Key != shadowInitParams.shadowFilteringQuality) + { + if (inputData.shaderKeywordSet.IsEnabled(shadowVariant.Value)) + { + return true; + } + } + } + + if(inputData.shaderKeywordSet.IsEnabled(m_MSAA) && !hdAsset.currentPlatformRenderPipelineSettings.supportMSAA) + { + return true; + } + + if(inputData.shaderKeywordSet.IsEnabled(m_EnableAlpha) && !hdAsset.currentPlatformRenderPipelineSettings.supportsAlpha) + { + return true; + } + + return false; + } + + public void OnProcessComputeShader(ComputeShader shader, string kernelName, IList inputData) + { + if (HDRenderPipeline.currentAsset == null) + return; + + var exportLog = ShaderBuildPreprocessor.hdrpAssets.Count > 0 + && ShaderBuildPreprocessor.hdrpAssets.Any(hdrpAsset => hdrpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled); + + Stopwatch shaderStripingWatch = new Stopwatch(); + shaderStripingWatch.Start(); + + using (new ExportComputeShaderStrip(exportLog, "Temp/compute-shader-strip.json", shader, kernelName, inputData, this)) + { + var inputShaderVariantCount = inputData.Count; + var hdPipelineAssets = ShaderBuildPreprocessor.hdrpAssets; + + if (hdPipelineAssets.Count == 0) + return; + + uint preStrippingCount = (uint)inputData.Count; + + for (int i = 0; i < inputShaderVariantCount;) + { + ShaderCompilerData input = inputData[i]; + + bool removeInput = true; + foreach (var hdAsset in hdPipelineAssets) + { + if (!StripShader(hdAsset, shader, kernelName, input)) + { + removeInput = false; + break; + } + } + + if (removeInput) + inputData[i] = inputData[--inputShaderVariantCount]; + else + ++i; + } + + if (inputData is List inputDataList) + { + inputDataList.RemoveRange(inputShaderVariantCount, inputDataList.Count - inputShaderVariantCount); + } + else + { + for (int i = inputData.Count - 1; i >= inputShaderVariantCount; --i) + inputData.RemoveAt(i); + } + + foreach (var hdAsset in hdPipelineAssets) + { + if (hdAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) + { + m_TotalVariantsInputCount += preStrippingCount; + m_TotalVariantsOutputCount += (uint)inputData.Count; + LogShaderVariants(shader, kernelName, hdAsset.shaderVariantLogLevel, preStrippingCount, (uint)inputData.Count); + } + } + } + } + } + class HDRPreprocessShaders : IPreprocessShaders { // Track list of materials asking for specific preprocessor step diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/IndirectLightingControllerEditor.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/IndirectLightingControllerEditor.cs index b0319d491fa..d2a61a5e247 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/IndirectLightingControllerEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/IndirectLightingControllerEditor.cs @@ -1,4 +1,6 @@ +using UnityEngine; using UnityEngine.Rendering.HighDefinition; +using UnityEngine.Rendering; namespace UnityEditor.Rendering.HighDefinition { @@ -6,21 +8,40 @@ namespace UnityEditor.Rendering.HighDefinition [VolumeComponentEditor(typeof(IndirectLightingController))] class IndirectLightingControllerEditor : VolumeComponentEditor { - SerializedDataParameter m_IndirectDiffuseIntensity; - SerializedDataParameter m_IndirectSpecularIntensity; + SerializedDataParameter m_IndirectDiffuseLightingMultiplier; + SerializedDataParameter m_IndirectDiffuseLightingLayers; + + SerializedDataParameter m_ReflectionLightingMultiplier; + SerializedDataParameter m_ReflectionLightingLayers; + + SerializedDataParameter m_ReflectionProbeIntensityMultiplier; public override void OnEnable() { var o = new PropertyFetcher(serializedObject); - m_IndirectSpecularIntensity = Unpack(o.Find(x => x.indirectSpecularIntensity)); - m_IndirectDiffuseIntensity = Unpack(o.Find(x => x.indirectDiffuseIntensity)); + m_IndirectDiffuseLightingMultiplier = Unpack(o.Find(x => x.indirectDiffuseLightingMultiplier)); + m_IndirectDiffuseLightingLayers = Unpack(o.Find(x => x.indirectDiffuseLightingLayers)); + + m_ReflectionLightingMultiplier = Unpack(o.Find(x => x.reflectionLightingMultiplier)); + m_ReflectionLightingLayers = Unpack(o.Find(x => x.reflectionLightingLayers)); + + m_ReflectionProbeIntensityMultiplier = Unpack(o.Find(x => x.reflectionProbeIntensityMultiplier)); } public override void OnInspectorGUI() { - PropertyField(m_IndirectDiffuseIntensity, EditorGUIUtility.TrTextContent("Indirect Diffuse Intensity", "Sets the multiplier for baked diffuse lighting.")); - PropertyField(m_IndirectSpecularIntensity, EditorGUIUtility.TrTextContent("Indirect Specular Intensity", "Sets the multiplier for reflected specular lighting.")); + PropertyField(m_IndirectDiffuseLightingMultiplier, EditorGUIUtility.TrTextContent("Indirect Diffuse Lighting Multiplier", "Sets the multiplier for indirect diffuse lighting.\nIt affect Ambient Probe, Light Probes, Lightmaps, Light Probe Volumes, Screen Space Global Illumination, Raytrace Global Illumination.")); + GUI.enabled = HDUtils.hdrpSettings.supportLightLayers; + PropertyField(m_IndirectDiffuseLightingLayers, EditorGUIUtility.TrTextContent("Indirect Diffuse Lighting Layers", "Sets the light layer mask for indirect diffuse lighting. Only matching RenderingLayers on Mesh will get affected by the multiplier.")); + GUI.enabled = true; + + PropertyField(m_ReflectionLightingMultiplier, EditorGUIUtility.TrTextContent("Reflection Lighting Multiplier", "Sets the multiplier for reflected specular lighting.\nIt affect Sky Reflection, Reflection Probes, Planar Probes, Screen Space Reflection, Raytrace Reflection.")); + GUI.enabled = HDUtils.hdrpSettings.supportLightLayers; + PropertyField(m_ReflectionLightingLayers, EditorGUIUtility.TrTextContent("Reflection Lighting Layers", "Sets the light layer mask for reflected specular lighting. Only matching RenderingLayers on Mesh will get affected by the multiplier.")); + GUI.enabled = true; + + PropertyField(m_ReflectionProbeIntensityMultiplier, EditorGUIUtility.TrTextContent("Reflection/Planar Probe Intensity Multiplier", "Sets the intensity multiplier for Reflection/Planar Probes.")); } } } diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs b/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs index 295fa305453..c3051691685 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs @@ -7,6 +7,29 @@ namespace UnityEditor.Rendering.HighDefinition { + internal class ShadowKeywords + { + ShaderKeyword ShadowLow; + ShaderKeyword ShadowMedium; + ShaderKeyword ShadowHigh; + + public Dictionary ShadowVariants; + + public ShadowKeywords() + { + ShadowLow = new ShaderKeyword("SHADOW_LOW"); + ShadowMedium = new ShaderKeyword("SHADOW_MEDIUM"); + ShadowHigh = new ShaderKeyword("SHADOW_HIGH"); + + ShadowVariants = new Dictionary + { + {HDShadowFilteringQuality.Low, ShadowLow}, + {HDShadowFilteringQuality.Medium, ShadowMedium}, + {HDShadowFilteringQuality.High, ShadowHigh}, + }; + } + } + abstract class BaseShaderPreprocessor { // Common keyword list @@ -26,6 +49,7 @@ abstract class BaseShaderPreprocessor protected ShaderKeyword m_WriteNormalBuffer; protected ShaderKeyword m_WriteMSAADepth; protected ShaderKeyword m_SubsurfaceScattering; + protected ShadowKeywords m_ShadowKeywords; protected Dictionary m_ShadowVariants; @@ -48,19 +72,10 @@ public BaseShaderPreprocessor() m_Decals3RT = new ShaderKeyword("DECALS_3RT"); m_Decals4RT = new ShaderKeyword("DECALS_4RT"); m_LightLayers = new ShaderKeyword("LIGHT_LAYERS"); - m_ShadowLow = new ShaderKeyword("SHADOW_LOW"); - m_ShadowMedium = new ShaderKeyword("SHADOW_MEDIUM"); - m_ShadowHigh = new ShaderKeyword("SHADOW_HIGH"); m_WriteNormalBuffer = new ShaderKeyword("WRITE_NORMAL_BUFFER"); m_WriteMSAADepth = new ShaderKeyword("WRITE_MSAA_DEPTH"); m_SubsurfaceScattering = new ShaderKeyword("OUTPUT_SPLIT_LIGHTING"); - - m_ShadowVariants = new Dictionary - { - {HDShadowFilteringQuality.Low, m_ShadowLow}, - {HDShadowFilteringQuality.Medium, m_ShadowMedium}, - {HDShadowFilteringQuality.High, m_ShadowHigh}, - }; + m_ShadowKeywords = new ShadowKeywords(); } public bool ShadersStripper(HDRenderPipelineAsset hdrpAsset, Shader shader, ShaderSnippetData snippet, diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/ShaderPass.template b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/ShaderPass.template index 5332a6def6b..1154ec27653 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/ShaderPass.template +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/ShaderPass.template @@ -336,22 +336,6 @@ Pass $SurfaceDescription.Emission: builtinData.emissiveColor = surfaceDescription.Emission; - #ifndef SHADER_UNLIT - // TODO: need to implement for shader graph raytracing - /* - // Raytracing specific code to remove Emissive color from the pass to avoid double contribution - // To avoid to have double lighting (once from the light source and once from the light itself) - #if SHADERPASS == SHADERPASS_RAYTRACING_INDIRECT || SHADERPASS == SHADERPASS_RAYTRACING_GBUFFER - builtinData.emissiveColor *= _IncludeIndirectLighting; - #elif SHADERPASS == SHADERPASS_RAYTRACING_FORWARD || SHADERPASS == SHADERPASS_PATH_TRACING - if (rayCone.spreadAngle < 0.0) - { - builtinData.emissiveColor *= _IncludeIndirectLighting; - } - #endif - */ - #endif // SHADER_UNLIT - // Note this will not fully work on transparent surfaces (can check with _SURFACE_TYPE_TRANSPARENT define) // We will always overwrite vt feeback with the nearest. So behind transparent surfaces vt will not be resolved // This is a limitation of the current MRT approach. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/IndirectLightingController.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/IndirectLightingController.cs index 6ea09df9fd1..2710132d584 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/IndirectLightingController.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/IndirectLightingController.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; namespace UnityEngine.Rendering.HighDefinition { @@ -8,9 +9,54 @@ namespace UnityEngine.Rendering.HighDefinition [Serializable, VolumeComponentMenu("Lighting/Indirect Lighting Controller")] public class IndirectLightingController : VolumeComponent { - /// Indirect specular intensity multiplier, between 0 and 1 - public MinFloatParameter indirectSpecularIntensity = new MinFloatParameter(1.0f, 0.0f); - /// Indirect diffuse intensity multiplier, between 0 and 1 - public MinFloatParameter indirectDiffuseIntensity = new MinFloatParameter(1.0f, 0.0f); + [UnityEngine.Serialization.FormerlySerializedAs("indirectDiffuseIntensity")] + /// Indirect diffuse lighting multiplier, between 0 and 1 + public MinFloatParameter indirectDiffuseLightingMultiplier = new MinFloatParameter(1.0f, 0.0f); + /// Controls which layer will be affected by the indirect diffuse lighting multiplier + public LightLayerEnumParameter indirectDiffuseLightingLayers = new LightLayerEnumParameter(LightLayerEnum.LightLayerDefault); + + /// Reflection lighting multiplier, between 0 and 1 + public MinFloatParameter reflectionLightingMultiplier = new MinFloatParameter(1.0f, 0.0f); + /// Controls which layer will be affected by the reflection lighting multiplier + public LightLayerEnumParameter reflectionLightingLayers = new LightLayerEnumParameter(LightLayerEnum.LightLayerDefault); + + [UnityEngine.Serialization.FormerlySerializedAs("indirectSpecularIntensity")] + /// Reflection probe and Planar reflection intensity multiplier, between 0 and 1 + public MinFloatParameter reflectionProbeIntensityMultiplier = new MinFloatParameter(1.0f, 0.0f); + + /// + /// Returns a mask of reflection lighting layers as uint and handle the case of Everything as being 0xFF and not -1 + /// + /// + public uint GetReflectionLightingLayers() + { + int value = (int)reflectionLightingLayers.GetValue(); + return value < 0 ? (uint)LightLayerEnum.Everything : (uint)value; + } + + /// + /// Returns a mask of indirect diffuse lighting layers as uint and handle the case of Everything as being 0xFF and not -1 + /// + /// + public uint GetIndirectDiffuseLightingLayers() + { + int value = (int)indirectDiffuseLightingLayers.GetValue(); + return value < 0 ? (uint)LightLayerEnum.Everything : (uint)value; + } + + /// + /// Sky Ambient Mode volume parameter. + /// + [Serializable, DebuggerDisplay(k_DebuggerDisplay)] + public sealed class LightLayerEnumParameter : VolumeParameter + { + /// + /// Light Layer Enum parameterconstructor. + /// + /// Light Layer Enum parameter. + /// Initial override value. + public LightLayerEnumParameter(LightLayerEnum value, bool overrideState = false) + : base(value, overrideState) { } + } } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs index ee3e3364a06..950f7f75f05 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs @@ -1905,7 +1905,7 @@ internal bool GetEnvLightData(CommandBuffer cmd, HDCamera hdCamera, in Processed envLightData.lightLayers = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LightLayers) ? probe.lightLayersAsUInt : uint.MaxValue; envLightData.influenceShapeType = influence.envShape; envLightData.weight = processedProbe.weight; - envLightData.multiplier = probe.multiplier * m_indirectLightingController.indirectSpecularIntensity.value; + envLightData.multiplier = probe.multiplier * m_indirectLightingController.reflectionProbeIntensityMultiplier.value; envLightData.rangeCompressionFactorCompensation = Mathf.Max(probe.rangeCompressionFactor, 1e-6f); envLightData.influenceExtents = influence.extents; switch (influence.envShape) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl index d6783969846..a182d07ec53 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl @@ -502,8 +502,9 @@ void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BS ); // Apply control from the indirect lighting volume settings (Remember there is no emissive here at this step) - builtinDataProbeVolumes.bakeDiffuseLighting *= _IndirectLightingMultiplier.x; - builtinDataProbeVolumes.backBakeDiffuseLighting *= _IndirectLightingMultiplier.x; + float indirectDiffuseMultiplier = GetIndirectDiffuseMultiplier(builtinData.renderingLayers); + builtinDataProbeVolumes.bakeDiffuseLighting *= indirectDiffuseMultiplier; + builtinDataProbeVolumes.backBakeDiffuseLighting *= indirectDiffuseMultiplier; #ifdef MODIFY_BAKED_DIFFUSE_LIGHTING #ifdef DEBUG_DISPLAY @@ -538,7 +539,8 @@ void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BS BuiltinData builtInDataSSGI; ZERO_INITIALIZE(BuiltinData, builtInDataSSGI); builtInDataSSGI.bakeDiffuseLighting = LOAD_TEXTURE2D_X(_IndirectDiffuseTexture, posInput.positionSS).xyz * GetInverseCurrentExposureMultiplier(); - builtInDataSSGI.bakeDiffuseLighting *= _IndirectLightingMultiplier.x; + float indirectDiffuseMultiplier = GetIndirectDiffuseMultiplier(builtinData.renderingLayers); + builtInDataSSGI.bakeDiffuseLighting *= indirectDiffuseMultiplier; ModifyBakedDiffuseLighting(V, posInput, preLightData, bsdfData, builtInDataSSGI); builtinData.bakeDiffuseLighting += builtInDataSSGI.bakeDiffuseLighting; } @@ -546,6 +548,10 @@ void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BS ApplyDebugToLighting(context, builtinData, aggregateLighting); + // Note: We can't apply the IndirectDiffuseMultiplier here as with GBuffer, Emissive is part of the bakeDiffuseLighting. + // so IndirectDiffuseMultiplier is apply in PostInitBuiltinData or related location (like for probe volume) + aggregateLighting.indirect.specularReflected *= GetIndirectSpecularMultiplier(builtinData.renderingLayers); + // Also Apply indiret diffuse (GI) // PostEvaluateBSDF will perform any operation wanted by the material and sum everything into diffuseLighting and specularLighting PostEvaluateBSDF( context, V, posInput, preLightData, bsdfData, builtinData, aggregateLighting, lightLoopOutput); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs index c2a1babc366..18024aed0ee 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs @@ -117,8 +117,8 @@ float aspect uint m_EditorOnlyData; // Runtime Data - RenderTexture m_RealtimeTexture; - RenderTexture m_RealtimeDepthBuffer; + RTHandle m_RealtimeTexture; + RTHandle m_RealtimeDepthBuffer; RenderData m_RealtimeRenderData; bool m_WasRenderedSinceLastOnDemandRequest = true; @@ -186,14 +186,40 @@ public Texture customTexture /// public RenderTexture realtimeTexture { - get => m_RealtimeTexture; - set => m_RealtimeTexture = value; + get => m_RealtimeTexture != null ? m_RealtimeTexture : null; + set + { + if (m_RealtimeTexture != null) + m_RealtimeTexture.Release(); + m_RealtimeTexture = RTHandles.Alloc(value); + } } + /// + /// The allocated realtime depth texture. Can be null if the probe never rendered with the realtime mode. + /// + /// Most of the time, you do not need to set this value yourself. You can set this property in situations + /// where you want to manually assign data that differs from what Unity generates. + /// public RenderTexture realtimeDepthTexture + { + get => m_RealtimeDepthBuffer != null ? m_RealtimeDepthBuffer : null; + set + { + if (m_RealtimeDepthBuffer != null) + m_RealtimeDepthBuffer.Release(); + m_RealtimeDepthBuffer = RTHandles.Alloc(value); + } + } + + public RTHandle realtimeTextureRTH + { + get => m_RealtimeTexture; + } + + public RTHandle realtimeDepthTextureRTH { get => m_RealtimeDepthBuffer; - set => m_RealtimeDepthBuffer = value; } /// @@ -233,11 +259,17 @@ public Texture SetTexture(ProbeSettings.Mode targetMode, Texture texture) { case ProbeSettings.Mode.Baked: return m_BakedTexture = texture; case ProbeSettings.Mode.Custom: return m_CustomTexture = texture; - case ProbeSettings.Mode.Realtime: return m_RealtimeTexture = (RenderTexture)texture; + case ProbeSettings.Mode.Realtime: return realtimeTexture = (RenderTexture)texture; default: throw new ArgumentOutOfRangeException(); } } + /// + /// Set the depth texture for a specific target mode. + /// + /// The mode to update. + /// The texture to set. + /// The texture that was set. public Texture SetDepthTexture(ProbeSettings.Mode targetMode, Texture texture) { if (targetMode == ProbeSettings.Mode.Realtime && !(texture is RenderTexture)) @@ -247,7 +279,7 @@ public Texture SetDepthTexture(ProbeSettings.Mode targetMode, Texture texture) { case ProbeSettings.Mode.Baked: return m_BakedTexture = texture; case ProbeSettings.Mode.Custom: return m_CustomTexture = texture; - case ProbeSettings.Mode.Realtime: return m_RealtimeDepthBuffer = (RenderTexture)texture; + case ProbeSettings.Mode.Realtime: return realtimeDepthTexture = (RenderTexture)texture; default: throw new ArgumentOutOfRangeException(); } } @@ -270,10 +302,10 @@ public Texture SetDepthTexture(ProbeSettings.Mode targetMode, Texture texture) public RenderData renderData => GetRenderData(mode); /// /// Get the render data of a specific mode. - /// + /// /// Note: The HDProbe stores only one RenderData per mode, even for view dependent probes with multiple viewers. /// In that case, make sure that you have set the RenderData relative to the expected viewer before rendering. - /// Otherwise the data retrieved by this function will be wrong. + /// Otherwise the data retrieved by this function will be wrong. /// /// The mode to query /// The requested render data diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs index 1410120178f..797ae62e431 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs @@ -5,6 +5,16 @@ namespace UnityEngine.Rendering.HighDefinition { + /// + /// Shadow Filtering Quality + /// + public enum HDShadowFilteringQuality + { + Low = 0, + Medium = 1, + High = 2, + } + enum ShadowMapType { CascadedDirectional, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/BuiltinUtilities.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/BuiltinUtilities.hlsl index 92c820ce294..60ec640bba0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/BuiltinUtilities.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/BuiltinUtilities.hlsl @@ -113,8 +113,9 @@ void PostInitBuiltinData( float3 V, PositionInputs posInput, SurfaceData surfa // color in case of lit deferred for example and avoid material to have to deal with it // Note: We only apply indirect multiplier for Material pass mode, for lightloop mode, the multiplier will be apply in lightloop - builtinData.bakeDiffuseLighting *= _IndirectLightingMultiplier.x; - builtinData.backBakeDiffuseLighting *= _IndirectLightingMultiplier.x; + float multiplier = GetIndirectDiffuseMultiplier(builtinData.renderingLayers); + builtinData.bakeDiffuseLighting *= multiplier; + builtinData.backBakeDiffuseLighting *= multiplier; #endif #ifdef MODIFY_BAKED_DIFFUSE_LIGHTING diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/UnlitData.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/UnlitData.hlsl index 3803d36f4cc..033d51f0022 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/UnlitData.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/UnlitData.hlsl @@ -42,10 +42,12 @@ void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs p builtinData.emissiveColor = _EmissiveColor; #endif -#if SHADERPASS == SHADERPASS_RAYTRACING_INDIRECT || SHADERPASS == SHADERPASS_RAYTRACING_GBUFFER + // Note: The code below is used only with EmmissiveMesh generated from Area Light with the option in the UX - So this code don't need + // to be present for shader graph +#if SHADERPASS == SHADERPASS_RAYTRACING_INDIRECT || SHADERPASS == SHADERPASS_RAYTRACING_GBUFFER || SHADERPASS == SHADERPASS_RAYTRACING_FORWARD builtinData.emissiveColor *= _IncludeIndirectLighting; -#elif SHADERPASS == SHADERPASS_RAYTRACING_FORWARD || SHADERPASS == SHADERPASS_PATH_TRACING - if(rayCone.spreadAngle < 0.0) +#elif SHADERPASS == SHADERPASS_PATH_TRACING + if (rayCone.spreadAngle < 0.0) { builtinData.emissiveColor *= _IncludeIndirectLighting; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader index dddee9f8308..b88b6224d8d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader @@ -205,10 +205,10 @@ Shader "Hidden/HDRP/TemporalAA" CTYPE finalColor; #if PERCEPTUAL_SPACE_ONLY_END - finalColor.xyz = lerp(ReinhardToneMap(history), ReinhardToneMap(filteredColor), blendFactor); - finalColor = InverseReinhardToneMap(finalColor); + finalColor.xyz = lerp(ReinhardToneMap(history).xyz, ReinhardToneMap(filteredColor).xyz, blendFactor); + finalColor.xyz = InverseReinhardToneMap(finalColor).xyz; #else - finalColor.xyz = lerp(history, filteredColor, blendFactor); + finalColor.xyz = lerp(history.xyz, filteredColor.xyz, blendFactor); finalColor.xyz *= PerceptualInvWeight(finalColor); #endif diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntialiasing.hlsl b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntialiasing.hlsl index a55a9af46c5..0581bb2186e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntialiasing.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntialiasing.hlsl @@ -647,7 +647,7 @@ CTYPE DirectClipToAABB(CTYPE history, CTYPE minimum, CTYPE maximum) // This is actually `distance`, however the keyword is reserved CTYPE offset = history - center; - float3 v_unit = offset.xyz / extents; + float3 v_unit = offset.xyz / extents.xyz; float3 absUnit = abs(v_unit); float maxUnit = Max3(absUnit.x, absUnit.y, absUnit.z); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index ebaed2ee4da..04beb0c9320 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -333,17 +333,27 @@ void SetupGBufferTargets(RenderGraph renderGraph, HDCamera hdCamera, GBufferPass passData.gbufferRT[0] = builder.UseColorBuffer(sssBuffer, 0); passData.gbufferRT[1] = builder.UseColorBuffer(prepassOutput.normalBuffer, 1); +#if UNITY_2020_2_OR_NEWER FastMemoryDesc gbufferFastMemDesc; gbufferFastMemDesc.inFastMemory = true; gbufferFastMemDesc.residencyFraction = 1.0f; gbufferFastMemDesc.flags = FastMemoryFlags.SpillTop; +#endif // If we are in deferred mode and the SSR is enabled, we need to make sure that the second gbuffer is cleared given that we are using that information for clear coat selection bool clearGBuffer2 = clearGBuffer || hdCamera.IsSSREnabled(); passData.gbufferRT[2] = builder.UseColorBuffer(renderGraph.CreateTexture( - new TextureDesc(Vector2.one, true, true) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, clearBuffer = clearGBuffer2, clearColor = Color.clear, name = "GBuffer2", fastMemoryDesc = gbufferFastMemDesc }, HDShaderIDs._GBufferTexture[2]), 2); + new TextureDesc(Vector2.one, true, true) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, clearBuffer = clearGBuffer2, clearColor = Color.clear, name = "GBuffer2" +#if UNITY_2020_2_OR_NEWER + , fastMemoryDesc = gbufferFastMemDesc +#endif + }, HDShaderIDs._GBufferTexture[2]), 2); passData.gbufferRT[3] = builder.UseColorBuffer(renderGraph.CreateTexture( - new TextureDesc(Vector2.one, true, true) { colorFormat = Builtin.GetLightingBufferFormat(), clearBuffer = clearGBuffer, clearColor = Color.clear, name = "GBuffer3", fastMemoryDesc = gbufferFastMemDesc }, HDShaderIDs._GBufferTexture[3]), 3); + new TextureDesc(Vector2.one, true, true) { colorFormat = Builtin.GetLightingBufferFormat(), clearBuffer = clearGBuffer, clearColor = Color.clear, name = "GBuffer3" +#if UNITY_2020_2_OR_NEWER + , fastMemoryDesc = gbufferFastMemDesc +#endif + }, HDShaderIDs._GBufferTexture[3]), 3); prepassOutput.gbuffer.lightLayersTextureIndex = -1; int currentIndex = 4; @@ -417,6 +427,7 @@ class ResolvePrepassData public TextureHandle motionVectorBufferMSAA; public Material depthResolveMaterial; public int depthResolvePassIndex; + public bool needMotionVectors; } void ResolvePrepassBuffers(RenderGraph renderGraph, HDCamera hdCamera, ref PrepassOutput output) @@ -436,17 +447,21 @@ void ResolvePrepassBuffers(RenderGraph renderGraph, HDCamera hdCamera, ref Prepa TextureHandle depthValuesBuffer = renderGraph.CreateTexture( new TextureDesc(Vector2.one, true, true) { colorFormat = GraphicsFormat.R32G32B32A32_SFloat, name = "DepthValuesBuffer" }); + passData.needMotionVectors = hdCamera.frameSettings.IsEnabled(FrameSettingsField.MotionVectors); + passData.depthResolveMaterial = m_DepthResolveMaterial; passData.depthResolvePassIndex = SampleCountToPassIndex(m_MSAASamples); passData.depthBuffer = builder.UseDepthBuffer(CreateDepthBuffer(renderGraph, false), DepthAccess.Write); passData.depthValuesBuffer = builder.UseColorBuffer(depthValuesBuffer, 0); passData.normalBuffer = builder.UseColorBuffer(CreateNormalBuffer(renderGraph, false), 1); - passData.motionVectorsBuffer = builder.UseColorBuffer(CreateMotionVectorBuffer(renderGraph, false, false), 2); + if (passData.needMotionVectors) + passData.motionVectorsBuffer = builder.UseColorBuffer(CreateMotionVectorBuffer(renderGraph, false, false), 2); passData.normalBufferMSAA = builder.ReadTexture(output.normalBuffer); passData.depthAsColorBufferMSAA = builder.ReadTexture(output.depthAsColor); - passData.motionVectorBufferMSAA = builder.ReadTexture(output.motionVectorsBuffer); + if (passData.needMotionVectors) + passData.motionVectorBufferMSAA = builder.ReadTexture(output.motionVectorsBuffer); output.resolvedNormalBuffer = passData.normalBuffer; output.resolvedDepthBuffer = passData.depthBuffer; @@ -456,6 +471,11 @@ void ResolvePrepassBuffers(RenderGraph renderGraph, HDCamera hdCamera, ref Prepa builder.SetRenderFunc( (ResolvePrepassData data, RenderGraphContext context) => { + data.depthResolveMaterial.SetTexture(HDShaderIDs._NormalTextureMS, context.resources.GetTexture(data.normalBufferMSAA)); + data.depthResolveMaterial.SetTexture(HDShaderIDs._DepthTextureMS, context.resources.GetTexture(data.depthAsColorBufferMSAA)); + if (data.needMotionVectors) + data.depthResolveMaterial.SetTexture(HDShaderIDs._MotionVectorTextureMS, context.resources.GetTexture(data.motionVectorBufferMSAA)); + context.cmd.DrawProcedural(Matrix4x4.identity, data.depthResolveMaterial, data.depthResolvePassIndex, MeshTopology.Triangles, 3, 1); }); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 706f7af6222..fd432eb5872 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -237,6 +237,11 @@ void ExecuteWithRenderGraph( RenderRequest renderRequest, BlitFinalCameraTexture(m_RenderGraph, hdCamera, postProcessDest, backBuffer, prepassOutput.resolvedMotionVectorsBuffer, prepassOutput.resolvedNormalBuffer); + if (target.targetDepth != null) + { + BlitFinalCameraTexture(m_RenderGraph, hdCamera, prepassOutput.depthBuffer, m_RenderGraph.ImportTexture(target.targetDepth), prepassOutput.resolvedMotionVectorsBuffer, prepassOutput.resolvedNormalBuffer); + } + aovRequest.PushCameraTexture(m_RenderGraph, AOVBuffers.Output, hdCamera, colorBuffer, aovBuffers); } @@ -284,7 +289,7 @@ void BlitFinalCameraTexture(RenderGraph renderGraph, HDCamera hdCamera, TextureH passData.source = builder.ReadTexture(source); passData.destination = builder.WriteTexture(destination); - // TODO REMOVE: Dummy read to avoid early release before render graph is full implemented. + // TODO RENDERGRAPH REMOVE: Dummy read to avoid early release before render graph is full implemented. bool msaa = hdCamera.frameSettings.IsEnabled(FrameSettingsField.MSAA); if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.MotionVectors)) builder.ReadTexture(motionVectors); @@ -983,10 +988,13 @@ void RenderDistortion( RenderGraph renderGraph, TextureHandle CreateColorBuffer(RenderGraph renderGraph, HDCamera hdCamera, bool msaa) { + +#if UNITY_2020_2_OR_NEWER FastMemoryDesc colorFastMemDesc; colorFastMemDesc.inFastMemory = true; colorFastMemDesc.residencyFraction = 1.0f; colorFastMemDesc.flags = FastMemoryFlags.SpillTop; +#endif return renderGraph.CreateTexture( new TextureDesc(Vector2.one, true, true) @@ -997,8 +1005,10 @@ TextureHandle CreateColorBuffer(RenderGraph renderGraph, HDCamera hdCamera, bool enableMSAA = msaa, clearBuffer = NeedClearColorBuffer(hdCamera), clearColor = GetColorBufferClearColor(hdCamera), - name = msaa ? "CameraColorMSAA" : "CameraColor", - fastMemoryDesc = colorFastMemDesc + name = msaa ? "CameraColorMSAA" : "CameraColor" +#if UNITY_2020_2_OR_NEWER + , fastMemoryDesc = colorFastMemDesc +#endif }); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 8d456991f2d..58a8e2fdd1b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -646,6 +646,7 @@ void ValidateResources() #endif +#if UNITY_2020_2_OR_NEWER internal void SwitchRenderTargetsToFastMem(CommandBuffer cmd, HDCamera camera) { // Color and normal buffer will always be in fast memory @@ -667,7 +668,7 @@ internal void SwitchRenderTargetsToFastMem(CommandBuffer cmd, HDCamera camera) // Trying to fit the depth pyramid m_SharedRTManager.GetDepthTexture().SwitchToFastMemory(cmd, residencyFraction: 1.0f, FastMemoryFlags.SpillTop, false); } - +#endif /// /// Resets the reference size of the internal RTHandle System. /// This allows users to reduce the memory footprint of render textures after doing a super sampled rendering pass for example. @@ -1172,6 +1173,8 @@ void DisposeProbeCameraPool() #if UNITY_EDITOR } #endif + + CleanupRenderGraph(); } ConstantBuffer.ReleaseAll(); @@ -1246,7 +1249,12 @@ void UpdateShaderVariablesGlobalCB(HDCamera hdCamera, CommandBuffer cmd) ScreenSpaceRefraction ssRefraction = hdCamera.volumeStack.GetComponent(); m_ShaderVariablesGlobalCB._SSRefractionInvScreenWeightDistance = 1.0f / ssRefraction.screenFadeDistance.value; - m_ShaderVariablesGlobalCB._IndirectLightingMultiplier = new Vector4(hdCamera.volumeStack.GetComponent().indirectDiffuseIntensity.value, 0, 0, 0); + IndirectLightingController indirectLightingController = hdCamera.volumeStack.GetComponent(); + m_ShaderVariablesGlobalCB._IndirectDiffuseLightingMultiplier = indirectLightingController.indirectDiffuseLightingMultiplier.value; + m_ShaderVariablesGlobalCB._IndirectDiffuseLightingLayers = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LightLayers) ? indirectLightingController.GetIndirectDiffuseLightingLayers() : uint.MaxValue; + m_ShaderVariablesGlobalCB._ReflectionLightingMultiplier = indirectLightingController.reflectionLightingMultiplier.value; + m_ShaderVariablesGlobalCB._ReflectionLightingLayers = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LightLayers) ? indirectLightingController.GetReflectionLightingLayers() : uint.MaxValue; + m_ShaderVariablesGlobalCB._OffScreenRendering = 0; m_ShaderVariablesGlobalCB._OffScreenDownsampleFactor = 1; m_ShaderVariablesGlobalCB._ReplaceDiffuseForIndirect = hdCamera.frameSettings.IsEnabled(FrameSettingsField.ReplaceDiffuseForIndirect) ? 1.0f : 0.0f; @@ -1423,8 +1431,8 @@ public struct Target { public RenderTargetIdentifier id; public CubemapFace face; - public RenderTexture copyToTarget; - public RenderTexture targetDepth; + public RTHandle copyToTarget; + public RTHandle targetDepth; } public HDCamera hdCamera; public bool clearCameraSettings; @@ -1693,7 +1701,7 @@ void AddVisibleProbeVisibleIndexIfUpdateIsRequired(HDProbe probe, int visibleInI // NOTE: If the probe was rendered on the very first frame, we could have some data that was used and it wasn't in a fully initialized state, which is fine on PC, but on console // might lead to NaNs due to lack of complete initialization. To circumvent this, we force the probe to render again only if it was rendered on the first frame. Note that the problem // doesn't apply if probe is enable any frame other than the very first. Also note that we are likely to be re-rendering the probe anyway due to the issue on sky ambient probe - // (see m_SkyManager.HasSetValidAmbientProbe in this function). + // (see m_SkyManager.HasSetValidAmbientProbe in this function). if (m_FrameCount > 1) probe.SetIsRendered(m_FrameCount); @@ -1817,18 +1825,18 @@ ref List renderDatas { case ProbeSettings.ProbeType.ReflectionProbe: int desiredProbeSize = (int)((HDRenderPipeline)RenderPipelineManager.currentPipeline).currentPlatformRenderPipelineSettings.lightLoopSettings.reflectionCubemapSize; - if (visibleProbe.realtimeTexture == null || visibleProbe.realtimeTexture.width != desiredProbeSize) + if (visibleProbe.realtimeTextureRTH == null || visibleProbe.realtimeTextureRTH.rt.width != desiredProbeSize) { visibleProbe.SetTexture(ProbeSettings.Mode.Realtime, HDRenderUtilities.CreateReflectionProbeRenderTarget(desiredProbeSize)); } break; case ProbeSettings.ProbeType.PlanarProbe: int desiredPlanarProbeSize = (int)visibleProbe.resolution; - if (visibleProbe.realtimeTexture == null || visibleProbe.realtimeTexture.width != desiredPlanarProbeSize) + if (visibleProbe.realtimeTextureRTH == null || visibleProbe.realtimeTextureRTH.rt.width != desiredPlanarProbeSize) { visibleProbe.SetTexture(ProbeSettings.Mode.Realtime, HDRenderUtilities.CreatePlanarProbeRenderTarget(desiredPlanarProbeSize)); } - if (visibleProbe.realtimeDepthTexture == null || visibleProbe.realtimeDepthTexture.width != desiredPlanarProbeSize) + if (visibleProbe.realtimeDepthTextureRTH == null || visibleProbe.realtimeDepthTextureRTH.rt.width != desiredPlanarProbeSize) { visibleProbe.SetDepthTexture(ProbeSettings.Mode.Realtime, HDRenderUtilities.CreatePlanarProbeDepthRenderTarget(desiredPlanarProbeSize)); } @@ -1953,7 +1961,7 @@ ref _cullingResults var face = (CubemapFace)j; request.target = new RenderRequest.Target { - copyToTarget = visibleProbe.realtimeTexture, + copyToTarget = visibleProbe.realtimeTextureRTH, face = face }; } @@ -1961,8 +1969,8 @@ ref _cullingResults { request.target = new RenderRequest.Target { - id = visibleProbe.realtimeTexture, - targetDepth = visibleProbe.realtimeDepthTexture, + id = visibleProbe.realtimeTextureRTH, + targetDepth = visibleProbe.realtimeDepthTextureRTH, face = CubemapFace.Unknown }; } @@ -2150,7 +2158,7 @@ ref _cullingResults // Render XR mirror view once all render requests have been completed if (i == 0 && renderRequest.hdCamera.camera.cameraType == CameraType.Game && renderRequest.hdCamera.camera.targetTexture == null) - { + { if (HDUtils.TryGetAdditionalCameraDataOrDefault(renderRequest.hdCamera.camera).xrRendering) { m_XRSystem.RenderMirrorView(cmd); @@ -2206,7 +2214,9 @@ AOVRequestData aovRequest // Render graph deals with Fast memory support in an automatic way. if(!m_EnableRenderGraph) { +#if UNITY_2020_2_OR_NEWER SwitchRenderTargetsToFastMem(cmd, hdCamera); +#endif } if (m_RayTracingSupported) @@ -4855,6 +4865,7 @@ static void ResolveColorPickerDebug(in DebugParameters parameters, HDUtils.DrawFullScreen(cmd, parameters.colorPickerMaterial, output); } + static void RenderExposureDebug(in DebugParameters parameters, RTHandle inputColorBuffer, RTHandle postprocessedColorBuffer, diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/IndirectDiffuse/RaytracingIndirectDiffuse.compute b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/IndirectDiffuse/RaytracingIndirectDiffuse.compute index 17f82f8cf1e..c09b4abf0f6 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/IndirectDiffuse/RaytracingIndirectDiffuse.compute +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/IndirectDiffuse/RaytracingIndirectDiffuse.compute @@ -238,4 +238,4 @@ void INDIRECT_DIFFUSE_INTEGRATION_UPSCALE(uint3 dispatchThreadId : SV_DispatchTh _UpscaledIndirectDiffuseTextureRW[COORD_TEXTURE2D_X(targetCoord)] = float4(resultSum.xyz / resultSum.w, 1.0); } #endif -} \ No newline at end of file +} diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl index 70ab6596b4f..373797bb73d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl @@ -279,6 +279,17 @@ float GetInversePreviousExposureMultiplier() return rcp(exposure + (exposure == 0.0)); // zero-div guard } +// Helper function for indirect control volume +float GetIndirectDiffuseMultiplier(uint renderingLayers) +{ + return (_IndirectDiffuseLightingLayers & renderingLayers) ? _IndirectDiffuseLightingMultiplier : 1.0f; +} + +float GetIndirectSpecularMultiplier(uint renderingLayers) +{ + return (_ReflectionLightingLayers & renderingLayers) ? _ReflectionLightingMultiplier : 1.0f; +} + // Functions to clamp UVs to use when RTHandle system is used. float2 ClampAndScaleUV(float2 UV, float2 texelSize, float numberOfTexels) diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs index d0737949fcb..11c4a407f0e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs @@ -23,6 +23,7 @@ enum ConstantRegister // All data is aligned on Vector4 size, arrays elements included. // - Shader side structure will be padded for anything not aligned to Vector4. Add padding accordingly. // - Base element size for array should be 4 components of 4 bytes (Vector4 or Vector4Int basically) otherwise the array will be interlaced with padding on shader side. + // - In Metal the float3 and float4 are both actually sized and aligned to 16 bytes, whereas for Vulkan/SPIR-V, the alignment is the same. Do not use Vector3! // Try to keep data grouped by access and rendering system as much as possible (fog params or light params together for example). // => Don't move a float parameter away from where it belongs for filling a hole. Add padding in this case. [GenerateHLSL(needAccessors = false, generateCBuffer = true, constantRegister = (int)ConstantRegister.Global)] @@ -177,7 +178,11 @@ unsafe struct ShaderVariablesGlobal public float _ReplaceDiffuseForIndirect; public Vector4 _AmbientOcclusionParam; // xyz occlusion color, w directLightStrenght - public Vector4 _IndirectLightingMultiplier; // .x indirect diffuse multiplier (use with indirect lighting volume controler) + + public float _IndirectDiffuseLightingMultiplier; + public uint _IndirectDiffuseLightingLayers; + public float _ReflectionLightingMultiplier; + public uint _ReflectionLightingLayers; public float _MicroShadowOpacity; public uint _EnableProbeVolumes; diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl index 9cb82542b2d..ebe3ecad8b0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl @@ -94,7 +94,10 @@ GLOBAL_CBUFFER_START(ShaderVariablesGlobal, b0) float _ContactShadowOpacity; float _ReplaceDiffuseForIndirect; float4 _AmbientOcclusionParam; - float4 _IndirectLightingMultiplier; + float _IndirectDiffuseLightingMultiplier; + uint _IndirectDiffuseLightingLayers; + float _ReflectionLightingMultiplier; + uint _ReflectionLightingLayers; float _MicroShadowOpacity; uint _EnableProbeVolumes; uint _ProbeVolumeCount; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader index 96c0c2e12ad..5742b81060a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader @@ -74,7 +74,7 @@ Shader "Hidden/HDRP/Sky/PbrSky" // TODO: Not sure it's possible to precompute cam rel pos since variables // in the two constant buffers may be set at a different frequency? - const float3 O = _WorldSpaceCameraPos1 - _PlanetCenterPosition; + const float3 O = _WorldSpaceCameraPos1 - _PlanetCenterPosition.xyz; const float3 V = GetSkyViewDirWS(input.positionCS.xy); bool renderSunDisk = _RenderSunDisk != 0; @@ -181,7 +181,7 @@ Shader "Hidden/HDRP/Sky/PbrSky" radiance += _GroundEmissionMultiplier * ts.rgb; } - float3 albedo = _GroundAlbedo; + float3 albedo = _GroundAlbedo.xyz; if (_HasGroundAlbedoTexture) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDRenderUtilities.cs b/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDRenderUtilities.cs index c6c19aaaa1e..d4ed3874de2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDRenderUtilities.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDRenderUtilities.cs @@ -365,6 +365,11 @@ public static RenderTexture CreatePlanarProbeRenderTarget(int planarSize) }; } + /// + /// Create the depth texture used as target for a realtime planar reflection probe. + /// + /// The size of the texture + /// The texture used as planar reflection probe target public static RenderTexture CreatePlanarProbeDepthRenderTarget(int planarSize) { return new RenderTexture(planarSize, planarSize, 1, GraphicsFormat.R32_SFloat) diff --git a/com.unity.render-pipelines.high-definition/package.json b/com.unity.render-pipelines.high-definition/package.json index f24f2f07a6f..3c7d1fbc6b3 100644 --- a/com.unity.render-pipelines.high-definition/package.json +++ b/com.unity.render-pipelines.high-definition/package.json @@ -3,7 +3,7 @@ "description": "The High Definition Render Pipeline (HDRP) is a high-fidelity Scriptable Render Pipeline built by Unity to target modern (Compute Shader compatible) platforms. HDRP utilizes Physically-Based Lighting techniques, linear lighting, HDR lighting, and a configurable hybrid Tile/Cluster deferred/Forward lighting architecture and gives you the tools you need to create games, technical demos, animations, and more to a high graphical standard.", "version": "10.0.0-preview.1", "unity": "2020.2", - "unityRelease": "0a14", + "unityRelease": "0a15", "displayName": "High Definition RP", "dependencies": { "com.unity.render-pipelines.core": "10.0.0-preview.1", diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs index 094e27a628a..db677ae9feb 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_GraphicTestRunner.cs @@ -58,6 +58,14 @@ public IEnumerator Run(GraphicsTestCase testCase) } } + if (HDRenderPipeline.enableRenderGraphTests) + { + if (!settings.renderGraphCompatible) + { + Assert.Ignore("Test scene is not compatible with Render Graph and will be skipped."); + } + } + if (settings.doBeforeTest != null) { settings.doBeforeTest.Invoke(); diff --git a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs index fd673a19472..bd2fa578af2 100644 --- a/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs +++ b/com.unity.testing.hdrp/TestRunner/HDRP_TestSettings.cs @@ -23,6 +23,7 @@ public class HDRP_TestSettings : GraphicsTestSettings [UnityEngine.Range(1.0f, 10.0f)] public float xrThresholdMultiplier = 1.0f; + public bool renderGraphCompatible = true; public bool checkMemoryAllocation = true;